Mercurial > vim
annotate src/memline.c @ 25314:7e620652bd13 v8.2.3194
patch 8.2.3194: Vim9: argument types are not checked at compile time
Commit: https://github.com/vim/vim/commit/cd9172077bc8c0aafddf2e5367cc0ae2c00c8ff7
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Wed Jul 21 19:09:09 2021 +0200
patch 8.2.3194: Vim9: argument types are not checked at compile time
Problem: Vim9: argument types are not checked at compile time.
Solution: Add several more type checks, simplify some. (Yegappan
Lakshmanan, closes #8598)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 21 Jul 2021 19:15:04 +0200 |
parents | a37cf57980f9 |
children | 1919361a53da |
rev | line source |
---|---|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
7 | 2 * |
3 * VIM - Vi IMproved by Bram Moolenaar | |
4 * | |
5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
6 * Do ":help credits" in Vim to see a list of people who contributed. | |
7 * See README.txt for an overview of the Vim source code. | |
8 */ | |
9 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
10 // for debugging |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
11 // #define CHECK(c, s) do { if (c) emsg((s)); } while (0) |
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
12 #define CHECK(c, s) do { /**/ } while (0) |
7 | 13 |
14 /* | |
15 * memline.c: Contains the functions for appending, deleting and changing the | |
625 | 16 * text lines. The memfile functions are used to store the information in |
17 * blocks of memory, backed up by a file. The structure of the information is | |
18 * a tree. The root of the tree is a pointer block. The leaves of the tree | |
19 * are data blocks. In between may be several layers of pointer blocks, | |
20 * forming branches. | |
7 | 21 * |
22 * Three types of blocks are used: | |
23 * - Block nr 0 contains information for recovery | |
24 * - Pointer blocks contain list of pointers to other blocks. | |
25 * - Data blocks contain the actual text. | |
26 * | |
27 * Block nr 0 contains the block0 structure (see below). | |
28 * | |
29 * Block nr 1 is the first pointer block. It is the root of the tree. | |
30 * Other pointer blocks are branches. | |
31 * | |
32 * If a line is too big to fit in a single page, the block containing that | |
33 * line is made big enough to hold the line. It may span several pages. | |
34 * Otherwise all blocks are one page. | |
35 * | |
36 * A data block that was filled when starting to edit a file and was not | |
37 * changed since then, can have a negative block number. This means that it | |
38 * has not yet been assigned a place in the file. When recovering, the lines | |
39 * in this data block can be read from the original file. When the block is | |
40 * changed (lines appended/deleted/changed) or when it is flushed it gets a | |
41 * positive number. Use mf_trans_del() to get the new number, before calling | |
42 * mf_get(). | |
43 */ | |
44 | |
45 #include "vim.h" | |
46 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
47 #ifndef UNIX // it's in os_unix.h for Unix |
7 | 48 # include <time.h> |
49 #endif | |
50 | |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
51 // for randombytes_buf |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
52 #ifdef FEAT_SODIUM |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
53 # include <sodium.h> |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
54 #endif |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
55 |
1030 | 56 #if defined(SASC) || defined(__amigaos4__) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
57 # include <proto/dos.h> // for Open() and Close() |
7 | 58 #endif |
59 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
60 typedef struct block0 ZERO_BL; // contents of the first block |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
61 typedef struct pointer_block PTR_BL; // contents of a pointer block |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
62 typedef struct data_block DATA_BL; // contents of a data block |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
63 typedef struct pointer_entry PTR_EN; // block/line-count pair |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
64 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
65 #define DATA_ID (('d' << 8) + 'a') // data block id |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
66 #define PTR_ID (('p' << 8) + 't') // pointer block id |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
67 #define BLOCK0_ID0 'b' // block 0 id 0 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
68 #define BLOCK0_ID1 '0' // block 0 id 1 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
69 #define BLOCK0_ID1_C0 'c' // block 0 id 1 'cm' 0 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
70 #define BLOCK0_ID1_C1 'C' // block 0 id 1 'cm' 1 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
71 #define BLOCK0_ID1_C2 'd' // block 0 id 1 'cm' 2 |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
72 #define BLOCK0_ID1_C3 'S' // block 0 id 1 'cm' 3 - but not actually used |
6122 | 73 |
74 #if defined(FEAT_CRYPT) | |
75 static int id1_codes[] = { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
76 BLOCK0_ID1_C0, // CRYPT_M_ZIP |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
77 BLOCK0_ID1_C1, // CRYPT_M_BF |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
78 BLOCK0_ID1_C2, // CRYPT_M_BF2 |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
79 BLOCK0_ID1_C3, // CRYPT_M_SOD - Unused! |
6122 | 80 }; |
81 #endif | |
7 | 82 |
83 /* | |
84 * pointer to a block, used in a pointer block | |
85 */ | |
86 struct pointer_entry | |
87 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
88 blocknr_T pe_bnum; // block number |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
89 linenr_T pe_line_count; // number of lines in this branch |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
90 linenr_T pe_old_lnum; // lnum for this block (for recovery) |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
91 int pe_page_count; // number of pages in block pe_bnum |
7 | 92 }; |
93 | |
94 /* | |
95 * A pointer block contains a list of branches in the tree. | |
96 */ | |
97 struct pointer_block | |
98 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
99 short_u pb_id; // ID for pointer block: PTR_ID |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
100 short_u pb_count; // number of pointers in this block |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
101 short_u pb_count_max; // maximum value for pb_count |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
102 PTR_EN pb_pointer[1]; // list of pointers to blocks (actually longer) |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
103 // followed by empty space until end of page |
7 | 104 }; |
105 | |
106 /* | |
107 * A data block is a leaf in the tree. | |
108 * | |
109 * The text of the lines is at the end of the block. The text of the first line | |
110 * in the block is put at the end, the text of the second line in front of it, | |
111 * etc. Thus the order of the lines is the opposite of the line number. | |
112 */ | |
113 struct data_block | |
114 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
115 short_u db_id; // ID for data block: DATA_ID |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
116 unsigned db_free; // free space available |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
117 unsigned db_txt_start; // byte where text starts |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
118 unsigned db_txt_end; // byte just after data block |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
119 linenr_T db_line_count; // number of lines in this block |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
120 unsigned db_index[1]; // index for start of line (actually bigger) |
19195
2ef19eed524a
patch 8.2.0156: various typos in source files and tests
Bram Moolenaar <Bram@vim.org>
parents:
19133
diff
changeset
|
121 // followed by empty space up to db_txt_start |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
122 // followed by the text in the lines until |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
123 // end of page |
7 | 124 }; |
125 | |
126 /* | |
127 * The low bits of db_index hold the actual index. The topmost bit is | |
128 * used for the global command to be able to mark a line. | |
129 * This method is not clean, but otherwise there would be at least one extra | |
130 * byte used for each line. | |
131 * The mark has to be in this place to keep it with the correct line when other | |
132 * lines are inserted or deleted. | |
133 */ | |
134 #define DB_MARKED ((unsigned)1 << ((sizeof(unsigned) * 8) - 1)) | |
135 #define DB_INDEX_MASK (~DB_MARKED) | |
136 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
137 #define INDEX_SIZE (sizeof(unsigned)) // size of one db_index entry |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
138 #define HEADER_SIZE (sizeof(DATA_BL) - INDEX_SIZE) // size of data block header |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
139 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
140 #define B0_FNAME_SIZE_ORG 900 // what it was in older versions |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
141 #define B0_FNAME_SIZE_NOCRYPT 898 // 2 bytes used for other things |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
142 #define B0_FNAME_SIZE_CRYPT 890 // 10 bytes used for other things |
39 | 143 #define B0_UNAME_SIZE 40 |
144 #define B0_HNAME_SIZE 40 | |
7 | 145 /* |
146 * Restrict the numbers to 32 bits, otherwise most compilers will complain. | |
147 * This won't detect a 64 bit machine that only swaps a byte in the top 32 | |
148 * bits, but that is crazy anyway. | |
149 */ | |
150 #define B0_MAGIC_LONG 0x30313233L | |
151 #define B0_MAGIC_INT 0x20212223L | |
152 #define B0_MAGIC_SHORT 0x10111213L | |
153 #define B0_MAGIC_CHAR 0x55 | |
154 | |
155 /* | |
156 * Block zero holds all info about the swap file. | |
157 * | |
158 * NOTE: DEFINITION OF BLOCK 0 SHOULD NOT CHANGE! It would make all existing | |
159 * swap files unusable! | |
160 * | |
161 * If size of block0 changes anyway, adjust MIN_SWAP_PAGE_SIZE in vim.h!! | |
162 * | |
1228 | 163 * This block is built up of single bytes, to make it portable across |
7 | 164 * different machines. b0_magic_* is used to check the byte order and size of |
165 * variables, because the rest of the swap file is not portable. | |
166 */ | |
167 struct block0 | |
168 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
169 char_u b0_id[2]; // id for block 0: BLOCK0_ID0 and BLOCK0_ID1, |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
170 // BLOCK0_ID1_C0, BLOCK0_ID1_C1, etc. |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
171 char_u b0_version[10]; // Vim version string |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
172 char_u b0_page_size[4];// number of bytes per page |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
173 char_u b0_mtime[4]; // last modification time of file |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
174 char_u b0_ino[4]; // inode of b0_fname |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
175 char_u b0_pid[4]; // process id of creator (or 0) |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
176 char_u b0_uname[B0_UNAME_SIZE]; // name of user (uid if no name) |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
177 char_u b0_hname[B0_HNAME_SIZE]; // host name (if it has a name) |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
178 char_u b0_fname[B0_FNAME_SIZE_ORG]; // name of file being edited |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
179 long b0_magic_long; // check for byte order of long |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
180 int b0_magic_int; // check for byte order of int |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
181 short b0_magic_short; // check for byte order of short |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
182 char_u b0_magic_char; // check for last char |
7 | 183 }; |
39 | 184 |
185 /* | |
625 | 186 * Note: b0_dirty and b0_flags are put at the end of the file name. For very |
39 | 187 * long file names in older versions of Vim they are invalid. |
188 * The 'fileencoding' comes before b0_flags, with a NUL in front. But only | |
189 * when there is room, for very long file names it's omitted. | |
190 */ | |
191 #define B0_DIRTY 0x55 | |
2267 | 192 #define b0_dirty b0_fname[B0_FNAME_SIZE_ORG - 1] |
39 | 193 |
194 /* | |
195 * The b0_flags field is new in Vim 7.0. | |
196 */ | |
2267 | 197 #define b0_flags b0_fname[B0_FNAME_SIZE_ORG - 2] |
198 | |
199 /* | |
200 * Crypt seed goes here, 8 bytes. New in Vim 7.3. | |
201 * Without encryption these bytes may be used for 'fenc'. | |
202 */ | |
203 #define b0_seed b0_fname[B0_FNAME_SIZE_ORG - 2 - MF_SEED_LEN] | |
39 | 204 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
205 // The lowest two bits contain the fileformat. Zero means it's not set |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
206 // (compatible with Vim 6.x), otherwise it's EOL_UNIX + 1, EOL_DOS + 1 or |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
207 // EOL_MAC + 1. |
39 | 208 #define B0_FF_MASK 3 |
209 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
210 // Swap file is in directory of edited file. Used to find the file from |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
211 // different mount points. |
39 | 212 #define B0_SAME_DIR 4 |
213 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
214 // The 'fileencoding' is at the end of b0_fname[], with a NUL in front of it. |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
215 // When empty there is only the NUL. |
39 | 216 #define B0_HAS_FENC 8 |
7 | 217 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
218 #define STACK_INCR 5 // nr of entries added to ml_stack at a time |
7 | 219 |
220 /* | |
221 * The line number where the first mark may be is remembered. | |
222 * If it is 0 there are no marks at all. | |
223 * (always used for the current buffer only, no buffer change possible while | |
224 * executing a global command). | |
225 */ | |
226 static linenr_T lowest_marked = 0; | |
227 | |
228 /* | |
229 * arguments for ml_find_line() | |
230 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
231 #define ML_DELETE 0x11 // delete line |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
232 #define ML_INSERT 0x12 // insert line |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
233 #define ML_FIND 0x13 // just find the line |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
234 #define ML_FLUSH 0x02 // flush locked block |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
235 #define ML_SIMPLE(x) (x & 0x10) // DEL, INS or FIND |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
236 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
237 // argument for ml_upd_block0() |
2267 | 238 typedef enum { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
239 UB_FNAME = 0 // update timestamp and filename |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
240 , UB_SAME_DIR // update the B0_SAME_DIR flag |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
241 , UB_CRYPT // update crypt key |
2267 | 242 } upd_block0_T; |
243 | |
244 #ifdef FEAT_CRYPT | |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
245 static void ml_set_b0_crypt(buf_T *buf, ZERO_BL *b0p); |
2267 | 246 #endif |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
247 static void ml_upd_block0(buf_T *buf, upd_block0_T what); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
248 static void set_b0_fname(ZERO_BL *, buf_T *buf); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
249 static void set_b0_dir_flag(ZERO_BL *b0p, buf_T *buf); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
250 static void add_b0_fenc(ZERO_BL *b0p, buf_T *buf); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
251 static time_t swapfile_info(char_u *); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
252 static int recov_file_names(char_u **, char_u *, int prepend_dot); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
253 static char_u *findswapname(buf_T *, char_u **, char_u *); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
254 static void ml_flush_line(buf_T *); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
255 static bhdr_T *ml_new_data(memfile_T *, int, int); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
256 static bhdr_T *ml_new_ptr(memfile_T *); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
257 static bhdr_T *ml_find_line(buf_T *, linenr_T, int); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
258 static int ml_add_stack(buf_T *); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
259 static void ml_lineadd(buf_T *, int); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
260 static int b0_magic_wrong(ZERO_BL *); |
7 | 261 #ifdef CHECK_INODE |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
262 static int fnamecmp_ino(char_u *, char_u *, long); |
7 | 263 #endif |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
264 static void long_to_char(long, char_u *); |
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
265 static long char_to_long(char_u *); |
2267 | 266 #ifdef FEAT_CRYPT |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
267 static cryptstate_T *ml_crypt_prepare(memfile_T *mfp, off_T offset, int reading); |
2267 | 268 #endif |
7 | 269 #ifdef FEAT_BYTEOFF |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
270 static void ml_updatechunk(buf_T *buf, long line, long len, int updtype); |
7 | 271 #endif |
272 | |
273 /* | |
625 | 274 * Open a new memline for "buf". |
7 | 275 * |
625 | 276 * Return FAIL for failure, OK otherwise. |
7 | 277 */ |
278 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
279 ml_open(buf_T *buf) |
7 | 280 { |
281 memfile_T *mfp; | |
282 bhdr_T *hp = NULL; | |
283 ZERO_BL *b0p; | |
284 PTR_BL *pp; | |
285 DATA_BL *dp; | |
286 | |
625 | 287 /* |
288 * init fields in memline struct | |
289 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
290 buf->b_ml.ml_stack_size = 0; // no stack yet |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
291 buf->b_ml.ml_stack = NULL; // no stack yet |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
292 buf->b_ml.ml_stack_top = 0; // nothing in the stack |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
293 buf->b_ml.ml_locked = NULL; // no cached block |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
294 buf->b_ml.ml_line_lnum = 0; // no cached line |
7 | 295 #ifdef FEAT_BYTEOFF |
625 | 296 buf->b_ml.ml_chunksize = NULL; |
7 | 297 #endif |
298 | |
22699
e82579016863
patch 8.2.1898: command modifier parsing always uses global cmdmod
Bram Moolenaar <Bram@vim.org>
parents:
22242
diff
changeset
|
299 if (cmdmod.cmod_flags & CMOD_NOSWAPFILE) |
5737 | 300 buf->b_p_swf = FALSE; |
301 | |
625 | 302 /* |
303 * When 'updatecount' is non-zero swap file may be opened later. | |
304 */ | |
305 if (p_uc && buf->b_p_swf) | |
306 buf->b_may_swap = TRUE; | |
7 | 307 else |
625 | 308 buf->b_may_swap = FALSE; |
309 | |
310 /* | |
311 * Open the memfile. No swap file is created yet. | |
312 */ | |
7 | 313 mfp = mf_open(NULL, 0); |
314 if (mfp == NULL) | |
315 goto error; | |
316 | |
625 | 317 buf->b_ml.ml_mfp = mfp; |
2267 | 318 #ifdef FEAT_CRYPT |
319 mfp->mf_buffer = buf; | |
320 #endif | |
625 | 321 buf->b_ml.ml_flags = ML_EMPTY; |
322 buf->b_ml.ml_line_count = 1; | |
13 | 323 #ifdef FEAT_LINEBREAK |
324 curwin->w_nrwidth_line_count = 0; | |
325 #endif | |
7 | 326 |
327 /* | |
328 * fill block0 struct and write page 0 | |
329 */ | |
330 if ((hp = mf_new(mfp, FALSE, 1)) == NULL) | |
331 goto error; | |
332 if (hp->bh_bnum != 0) | |
333 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
334 iemsg(_("E298: Didn't get block nr 0?")); |
7 | 335 goto error; |
336 } | |
337 b0p = (ZERO_BL *)(hp->bh_data); | |
338 | |
339 b0p->b0_id[0] = BLOCK0_ID0; | |
340 b0p->b0_id[1] = BLOCK0_ID1; | |
341 b0p->b0_magic_long = (long)B0_MAGIC_LONG; | |
342 b0p->b0_magic_int = (int)B0_MAGIC_INT; | |
343 b0p->b0_magic_short = (short)B0_MAGIC_SHORT; | |
344 b0p->b0_magic_char = B0_MAGIC_CHAR; | |
14011
8631b54ae2a2
patch 8.1.0023: gcc 8.1 warns for use of strncpy()
Christian Brabandt <cb@256bit.org>
parents:
13896
diff
changeset
|
345 mch_memmove(b0p->b0_version, "VIM ", 4); |
7 | 346 STRNCPY(b0p->b0_version + 4, Version, 6); |
347 long_to_char((long)mfp->mf_page_size, b0p->b0_page_size); | |
625 | 348 |
800 | 349 #ifdef FEAT_SPELL |
350 if (!buf->b_spell) | |
351 #endif | |
625 | 352 { |
353 b0p->b0_dirty = buf->b_changed ? B0_DIRTY : 0; | |
354 b0p->b0_flags = get_fileformat(buf) + 1; | |
355 set_b0_fname(b0p, buf); | |
356 (void)get_user_name(b0p->b0_uname, B0_UNAME_SIZE); | |
357 b0p->b0_uname[B0_UNAME_SIZE - 1] = NUL; | |
358 mch_get_host_name(b0p->b0_hname, B0_HNAME_SIZE); | |
359 b0p->b0_hname[B0_HNAME_SIZE - 1] = NUL; | |
360 long_to_char(mch_get_pid(), b0p->b0_pid); | |
2267 | 361 #ifdef FEAT_CRYPT |
6122 | 362 ml_set_b0_crypt(buf, b0p); |
2267 | 363 #endif |
625 | 364 } |
7 | 365 |
366 /* | |
367 * Always sync block number 0 to disk, so we can check the file name in | |
2267 | 368 * the swap file in findswapname(). Don't do this for a help files or |
369 * a spell buffer though. | |
7 | 370 * Only works when there's a swapfile, otherwise it's done when the file |
371 * is created. | |
372 */ | |
373 mf_put(mfp, hp, TRUE, FALSE); | |
625 | 374 if (!buf->b_help && !B_SPELL(buf)) |
7 | 375 (void)mf_sync(mfp, 0); |
376 | |
625 | 377 /* |
378 * Fill in root pointer block and write page 1. | |
379 */ | |
7 | 380 if ((hp = ml_new_ptr(mfp)) == NULL) |
381 goto error; | |
382 if (hp->bh_bnum != 1) | |
383 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
384 iemsg(_("E298: Didn't get block nr 1?")); |
7 | 385 goto error; |
386 } | |
387 pp = (PTR_BL *)(hp->bh_data); | |
388 pp->pb_count = 1; | |
389 pp->pb_pointer[0].pe_bnum = 2; | |
390 pp->pb_pointer[0].pe_page_count = 1; | |
391 pp->pb_pointer[0].pe_old_lnum = 1; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
392 pp->pb_pointer[0].pe_line_count = 1; // line count after insertion |
7 | 393 mf_put(mfp, hp, TRUE, FALSE); |
394 | |
625 | 395 /* |
396 * Allocate first data block and create an empty line 1. | |
397 */ | |
7 | 398 if ((hp = ml_new_data(mfp, FALSE, 1)) == NULL) |
399 goto error; | |
400 if (hp->bh_bnum != 2) | |
401 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
402 iemsg(_("E298: Didn't get block nr 2?")); |
7 | 403 goto error; |
404 } | |
405 | |
406 dp = (DATA_BL *)(hp->bh_data); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
407 dp->db_index[0] = --dp->db_txt_start; // at end of block |
7 | 408 dp->db_free -= 1 + INDEX_SIZE; |
409 dp->db_line_count = 1; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
410 *((char_u *)dp + dp->db_txt_start) = NUL; // empty line |
7 | 411 |
412 return OK; | |
413 | |
414 error: | |
415 if (mfp != NULL) | |
416 { | |
417 if (hp) | |
418 mf_put(mfp, hp, FALSE, FALSE); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
419 mf_close(mfp, TRUE); // will also free(mfp->mf_fname) |
7 | 420 } |
625 | 421 buf->b_ml.ml_mfp = NULL; |
7 | 422 return FAIL; |
423 } | |
424 | |
2267 | 425 #if defined(FEAT_CRYPT) || defined(PROTO) |
426 /* | |
6130 | 427 * Prepare encryption for "buf" for the current key and method. |
428 */ | |
429 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
430 ml_set_mfp_crypt(buf_T *buf) |
6130 | 431 { |
432 if (*buf->b_p_key != NUL) | |
433 { | |
434 int method_nr = crypt_get_method_nr(buf); | |
435 | |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
436 if (method_nr > CRYPT_M_ZIP && method_nr < CRYPT_M_SOD) |
6130 | 437 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
438 // Generate a seed and store it in the memfile. |
6130 | 439 sha2_seed(buf->b_ml.ml_mfp->mf_seed, MF_SEED_LEN, NULL, 0); |
440 } | |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
441 #ifdef FEAT_SODIUM |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
442 else if (method_nr == CRYPT_M_SOD) |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
443 randombytes_buf(buf->b_ml.ml_mfp->mf_seed, MF_SEED_LEN); |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
444 #endif |
6130 | 445 } |
446 } | |
447 | |
448 /* | |
2267 | 449 * Prepare encryption for "buf" with block 0 "b0p". |
450 */ | |
451 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
452 ml_set_b0_crypt(buf_T *buf, ZERO_BL *b0p) |
2267 | 453 { |
454 if (*buf->b_p_key == NUL) | |
455 b0p->b0_id[1] = BLOCK0_ID1; | |
456 else | |
457 { | |
6122 | 458 int method_nr = crypt_get_method_nr(buf); |
459 | |
460 b0p->b0_id[1] = id1_codes[method_nr]; | |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
461 if (method_nr > CRYPT_M_ZIP && method_nr < CRYPT_M_SOD) |
2267 | 462 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
463 // Generate a seed and store it in block 0 and in the memfile. |
2267 | 464 sha2_seed(&b0p->b0_seed, MF_SEED_LEN, NULL, 0); |
465 mch_memmove(buf->b_ml.ml_mfp->mf_seed, &b0p->b0_seed, MF_SEED_LEN); | |
466 } | |
467 } | |
468 } | |
469 | |
470 /* | |
471 * Called after the crypt key or 'cryptmethod' was changed for "buf". | |
472 * Will apply this to the swapfile. | |
473 * "old_key" is the previous key. It is equal to buf->b_p_key when | |
474 * 'cryptmethod' is changed. | |
2360
d8e4b27cef80
Change 'cryptmethod' from a number to a string option. Make it global-local.
Bram Moolenaar <bram@vim.org>
parents:
2283
diff
changeset
|
475 * "old_cm" is the previous 'cryptmethod'. It is equal to the current |
d8e4b27cef80
Change 'cryptmethod' from a number to a string option. Make it global-local.
Bram Moolenaar <bram@vim.org>
parents:
2283
diff
changeset
|
476 * 'cryptmethod' when 'key' is changed. |
2267 | 477 */ |
478 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
479 ml_set_crypt_key( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
480 buf_T *buf, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
481 char_u *old_key, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
482 char_u *old_cm) |
2267 | 483 { |
484 memfile_T *mfp = buf->b_ml.ml_mfp; | |
485 bhdr_T *hp; | |
486 int page_count; | |
487 int idx; | |
488 long error; | |
489 infoptr_T *ip; | |
490 PTR_BL *pp; | |
491 DATA_BL *dp; | |
492 blocknr_T bnum; | |
493 int top; | |
6817 | 494 int old_method; |
2267 | 495 |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
496 if (mfp == NULL || mfp->mf_fd < 0) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
497 return; // no memfile yet, nothing to do |
6817 | 498 old_method = crypt_method_nr_from_name(old_cm); |
499 | |
24990
85d1e82ed134
patch 8.2.3032: build problems with MSVC, other crypt issues with libsodium
Bram Moolenaar <Bram@vim.org>
parents:
24970
diff
changeset
|
500 // Swapfile encryption not supported by XChaCha20 |
85d1e82ed134
patch 8.2.3032: build problems with MSVC, other crypt issues with libsodium
Bram Moolenaar <Bram@vim.org>
parents:
24970
diff
changeset
|
501 if (crypt_get_method_nr(buf) == CRYPT_M_SOD && *buf->b_p_key != NUL) |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
502 { |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
503 // close the swapfile |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
504 mf_close_file(buf, TRUE); |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
505 buf->b_p_swf = FALSE; |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
506 return; |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
507 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
508 // First make sure the swapfile is in a consistent state, using the old |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
509 // key and method. |
6817 | 510 { |
511 char_u *new_key = buf->b_p_key; | |
512 char_u *new_buf_cm = buf->b_p_cm; | |
513 | |
514 buf->b_p_key = old_key; | |
515 buf->b_p_cm = old_cm; | |
516 ml_preserve(buf, FALSE); | |
517 buf->b_p_key = new_key; | |
518 buf->b_p_cm = new_buf_cm; | |
519 } | |
2267 | 520 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
521 // Set the key, method and seed to be used for reading, these must be the |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
522 // old values. |
2267 | 523 mfp->mf_old_key = old_key; |
6817 | 524 mfp->mf_old_cm = old_method; |
525 if (old_method > 0 && *old_key != NUL) | |
2267 | 526 mch_memmove(mfp->mf_old_seed, mfp->mf_seed, MF_SEED_LEN); |
527 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
528 // Update block 0 with the crypt flag and may set a new seed. |
2267 | 529 ml_upd_block0(buf, UB_CRYPT); |
530 | |
531 if (mfp->mf_infile_count > 2) | |
532 { | |
533 /* | |
534 * Need to read back all data blocks from disk, decrypt them with the | |
535 * old key/method and mark them to be written. The algorithm is | |
536 * similar to what happens in ml_recover(), but we skip negative block | |
537 * numbers. | |
538 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
539 ml_flush_line(buf); // flush buffered line |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
540 (void)ml_find_line(buf, (linenr_T)0, ML_FLUSH); // flush locked block |
2267 | 541 |
542 hp = NULL; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
543 bnum = 1; // start with block 1 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
544 page_count = 1; // which is 1 page |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
545 idx = 0; // start with first index in block 1 |
2267 | 546 error = 0; |
547 buf->b_ml.ml_stack_top = 0; | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12975
diff
changeset
|
548 VIM_CLEAR(buf->b_ml.ml_stack); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
549 buf->b_ml.ml_stack_size = 0; // no stack yet |
2267 | 550 |
551 for ( ; !got_int; line_breakcheck()) | |
552 { | |
553 if (hp != NULL) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
554 mf_put(mfp, hp, FALSE, FALSE); // release previous block |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
555 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
556 // get the block (pointer or data) |
2267 | 557 if ((hp = mf_get(mfp, (blocknr_T)bnum, page_count)) == NULL) |
558 { | |
559 if (bnum == 1) | |
560 break; | |
561 ++error; | |
562 } | |
563 else | |
564 { | |
565 pp = (PTR_BL *)(hp->bh_data); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
566 if (pp->pb_id == PTR_ID) // it is a pointer block |
2267 | 567 { |
568 if (pp->pb_count == 0) | |
569 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
570 // empty block? |
2267 | 571 ++error; |
572 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
573 else if (idx < (int)pp->pb_count) // go a block deeper |
2267 | 574 { |
575 if (pp->pb_pointer[idx].pe_bnum < 0) | |
576 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
577 // Skip data block with negative block number. |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
578 // Should not happen, because of the ml_preserve() |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
579 // above. Get same block again for next index. |
15353
21580db06cf3
patch 8.1.0684: warnings from 64-bit compiler
Bram Moolenaar <Bram@vim.org>
parents:
15294
diff
changeset
|
580 ++idx; |
2267 | 581 continue; |
582 } | |
583 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
584 // going one block deeper in the tree, new entry in |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
585 // stack |
2267 | 586 if ((top = ml_add_stack(buf)) < 0) |
587 { | |
588 ++error; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
589 break; // out of memory |
2267 | 590 } |
591 ip = &(buf->b_ml.ml_stack[top]); | |
592 ip->ip_bnum = bnum; | |
593 ip->ip_index = idx; | |
594 | |
595 bnum = pp->pb_pointer[idx].pe_bnum; | |
596 page_count = pp->pb_pointer[idx].pe_page_count; | |
6817 | 597 idx = 0; |
2267 | 598 continue; |
599 } | |
600 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
601 else // not a pointer block |
2267 | 602 { |
603 dp = (DATA_BL *)(hp->bh_data); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
604 if (dp->db_id != DATA_ID) // block id wrong |
2267 | 605 ++error; |
606 else | |
607 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
608 // It is a data block, need to write it back to disk. |
2267 | 609 mf_put(mfp, hp, TRUE, FALSE); |
610 hp = NULL; | |
611 } | |
612 } | |
613 } | |
614 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
615 if (buf->b_ml.ml_stack_top == 0) // finished |
2267 | 616 break; |
617 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
618 // go one block up in the tree |
2267 | 619 ip = &(buf->b_ml.ml_stack[--(buf->b_ml.ml_stack_top)]); |
620 bnum = ip->ip_bnum; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
621 idx = ip->ip_index + 1; // go to next index |
2267 | 622 page_count = 1; |
623 } | |
6817 | 624 if (hp != NULL) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
625 mf_put(mfp, hp, FALSE, FALSE); // release previous block |
2657 | 626 |
627 if (error > 0) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
628 emsg(_("E843: Error while updating swap file crypt")); |
2267 | 629 } |
630 | |
631 mfp->mf_old_key = NULL; | |
632 } | |
633 #endif | |
634 | |
7 | 635 /* |
636 * ml_setname() is called when the file name of "buf" has been changed. | |
637 * It may rename the swap file. | |
638 */ | |
639 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
640 ml_setname(buf_T *buf) |
7 | 641 { |
642 int success = FALSE; | |
643 memfile_T *mfp; | |
644 char_u *fname; | |
645 char_u *dirp; | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
646 #if defined(MSWIN) |
7 | 647 char_u *p; |
648 #endif | |
649 | |
650 mfp = buf->b_ml.ml_mfp; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
651 if (mfp->mf_fd < 0) // there is no swap file yet |
7 | 652 { |
653 /* | |
654 * When 'updatecount' is 0 and 'noswapfile' there is no swap file. | |
655 * For help files we will make a swap file now. | |
656 */ | |
22699
e82579016863
patch 8.2.1898: command modifier parsing always uses global cmdmod
Bram Moolenaar <Bram@vim.org>
parents:
22242
diff
changeset
|
657 if (p_uc != 0 && (cmdmod.cmod_flags & CMOD_NOSWAPFILE) == 0) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
658 ml_open_file(buf); // create a swap file |
7 | 659 return; |
660 } | |
661 | |
662 /* | |
663 * Try all directories in the 'directory' option. | |
664 */ | |
665 dirp = p_dir; | |
666 for (;;) | |
667 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
668 if (*dirp == NUL) // tried all directories, fail |
7 | 669 break; |
43 | 670 fname = findswapname(buf, &dirp, mfp->mf_fname); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
671 // alloc's fname |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
672 if (dirp == NULL) // out of memory |
3158 | 673 break; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
674 if (fname == NULL) // no file name found for this dir |
7 | 675 continue; |
676 | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
677 #if defined(MSWIN) |
7 | 678 /* |
679 * Set full pathname for swap file now, because a ":!cd dir" may | |
680 * change directory without us knowing it. | |
681 */ | |
682 p = FullName_save(fname, FALSE); | |
683 vim_free(fname); | |
684 fname = p; | |
685 if (fname == NULL) | |
686 continue; | |
687 #endif | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
688 // if the file name is the same we don't have to do anything |
7 | 689 if (fnamecmp(fname, mfp->mf_fname) == 0) |
690 { | |
691 vim_free(fname); | |
692 success = TRUE; | |
693 break; | |
694 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
695 // need to close the swap file before renaming |
7 | 696 if (mfp->mf_fd >= 0) |
697 { | |
698 close(mfp->mf_fd); | |
699 mfp->mf_fd = -1; | |
700 } | |
701 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
702 // try to rename the swap file |
7 | 703 if (vim_rename(mfp->mf_fname, fname) == 0) |
704 { | |
705 success = TRUE; | |
706 vim_free(mfp->mf_fname); | |
707 mfp->mf_fname = fname; | |
708 vim_free(mfp->mf_ffname); | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
709 #if defined(MSWIN) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
710 mfp->mf_ffname = NULL; // mf_fname is full pathname already |
7 | 711 #else |
712 mf_set_ffname(mfp); | |
713 #endif | |
2267 | 714 ml_upd_block0(buf, UB_SAME_DIR); |
7 | 715 break; |
716 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
717 vim_free(fname); // this fname didn't work, try another |
7 | 718 } |
719 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
720 if (mfp->mf_fd == -1) // need to (re)open the swap file |
7 | 721 { |
722 mfp->mf_fd = mch_open((char *)mfp->mf_fname, O_RDWR | O_EXTRA, 0); | |
723 if (mfp->mf_fd < 0) | |
724 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
725 // could not (re)open the swap file, what can we do???? |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
726 emsg(_("E301: Oops, lost the swap file!!!")); |
7 | 727 return; |
728 } | |
2003 | 729 #ifdef HAVE_FD_CLOEXEC |
730 { | |
731 int fdflags = fcntl(mfp->mf_fd, F_GETFD); | |
732 if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) | |
7961
a7e58c6e4e9a
commit https://github.com/vim/vim/commit/fbc4b4db3a9690906a96e16724350a6241cf32a5
Christian Brabandt <cb@256bit.org>
parents:
7881
diff
changeset
|
733 (void)fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC); |
2003 | 734 } |
735 #endif | |
7 | 736 } |
737 if (!success) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
738 emsg(_("E302: Could not rename swap file")); |
7 | 739 } |
740 | |
741 /* | |
742 * Open a file for the memfile for all buffers that are not readonly or have | |
743 * been modified. | |
744 * Used when 'updatecount' changes from zero to non-zero. | |
745 */ | |
746 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
747 ml_open_files(void) |
7 | 748 { |
749 buf_T *buf; | |
750 | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
751 FOR_ALL_BUFFERS(buf) |
7 | 752 if (!buf->b_p_ro || buf->b_changed) |
753 ml_open_file(buf); | |
754 } | |
755 | |
756 /* | |
757 * Open a swap file for an existing memfile, if there is no swap file yet. | |
758 * If we are unable to find a file name, mf_fname will be NULL | |
759 * and the memfile will be in memory only (no recovery possible). | |
760 */ | |
761 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
762 ml_open_file(buf_T *buf) |
7 | 763 { |
764 memfile_T *mfp; | |
765 char_u *fname; | |
766 char_u *dirp; | |
767 | |
768 mfp = buf->b_ml.ml_mfp; | |
22699
e82579016863
patch 8.2.1898: command modifier parsing always uses global cmdmod
Bram Moolenaar <Bram@vim.org>
parents:
22242
diff
changeset
|
769 if (mfp == NULL || mfp->mf_fd >= 0 || !buf->b_p_swf |
e82579016863
patch 8.2.1898: command modifier parsing always uses global cmdmod
Bram Moolenaar <Bram@vim.org>
parents:
22242
diff
changeset
|
770 || (cmdmod.cmod_flags & CMOD_NOSWAPFILE)) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
771 return; // nothing to do |
7 | 772 |
748 | 773 #ifdef FEAT_SPELL |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
774 // For a spell buffer use a temp file name. |
625 | 775 if (buf->b_spell) |
776 { | |
6721 | 777 fname = vim_tempname('s', FALSE); |
625 | 778 if (fname != NULL) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
779 (void)mf_open_file(mfp, fname); // consumes fname! |
625 | 780 buf->b_may_swap = FALSE; |
781 return; | |
782 } | |
783 #endif | |
784 | |
7 | 785 /* |
786 * Try all directories in 'directory' option. | |
787 */ | |
788 dirp = p_dir; | |
789 for (;;) | |
790 { | |
791 if (*dirp == NUL) | |
792 break; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
793 // There is a small chance that between choosing the swap file name |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
794 // and creating it, another Vim creates the file. In that case the |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
795 // creation will fail and we will use another directory. |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
796 fname = findswapname(buf, &dirp, NULL); // allocates fname |
3158 | 797 if (dirp == NULL) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
798 break; // out of memory |
7 | 799 if (fname == NULL) |
800 continue; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
801 if (mf_open_file(mfp, fname) == OK) // consumes fname! |
7 | 802 { |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
803 #if defined(MSWIN) |
7 | 804 /* |
805 * set full pathname for swap file now, because a ":!cd dir" may | |
806 * change directory without us knowing it. | |
807 */ | |
808 mf_fullname(mfp); | |
809 #endif | |
2267 | 810 ml_upd_block0(buf, UB_SAME_DIR); |
39 | 811 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
812 // Flush block zero, so others can read it |
7 | 813 if (mf_sync(mfp, MFS_ZERO) == OK) |
630 | 814 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
815 // Mark all blocks that should be in the swapfile as dirty. |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
816 // Needed for when the 'swapfile' option was reset, so that |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
817 // the swap file was deleted, and then on again. |
630 | 818 mf_set_dirty(mfp); |
7 | 819 break; |
630 | 820 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
821 // Writing block 0 failed: close the file and try another dir |
7 | 822 mf_close_file(buf, FALSE); |
823 } | |
824 } | |
825 | |
18372
11394af51615
patch 8.1.2180: Error E303 is not useful when 'directory' is empty
Bram Moolenaar <Bram@vim.org>
parents:
18139
diff
changeset
|
826 if (*p_dir != NUL && mfp->mf_fname == NULL) |
7 | 827 { |
18372
11394af51615
patch 8.1.2180: Error E303 is not useful when 'directory' is empty
Bram Moolenaar <Bram@vim.org>
parents:
18139
diff
changeset
|
828 need_wait_return = TRUE; // call wait_return later |
7 | 829 ++no_wait_return; |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
830 (void)semsg(_("E303: Unable to open swap file for \"%s\", recovery impossible"), |
3839 | 831 buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname); |
7 | 832 --no_wait_return; |
833 } | |
834 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
835 // don't try to open a swap file again |
7 | 836 buf->b_may_swap = FALSE; |
837 } | |
838 | |
839 /* | |
840 * If still need to create a swap file, and starting to edit a not-readonly | |
841 * file, or reading into an existing buffer, create a swap file now. | |
842 */ | |
843 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
844 check_need_swap( |
14593
b6b2f7d69c7f
patch 8.1.0310: file info msg not always suppressed with 'F' in 'shortmess'
Christian Brabandt <cb@256bit.org>
parents:
14579
diff
changeset
|
845 int newfile) // reading file into new buffer |
7 | 846 { |
14593
b6b2f7d69c7f
patch 8.1.0310: file info msg not always suppressed with 'F' in 'shortmess'
Christian Brabandt <cb@256bit.org>
parents:
14579
diff
changeset
|
847 int old_msg_silent = msg_silent; // might be reset by an E325 message |
b6b2f7d69c7f
patch 8.1.0310: file info msg not always suppressed with 'F' in 'shortmess'
Christian Brabandt <cb@256bit.org>
parents:
14579
diff
changeset
|
848 |
7 | 849 if (curbuf->b_may_swap && (!curbuf->b_p_ro || !newfile)) |
850 ml_open_file(curbuf); | |
14593
b6b2f7d69c7f
patch 8.1.0310: file info msg not always suppressed with 'F' in 'shortmess'
Christian Brabandt <cb@256bit.org>
parents:
14579
diff
changeset
|
851 msg_silent = old_msg_silent; |
7 | 852 } |
853 | |
854 /* | |
855 * Close memline for buffer 'buf'. | |
856 * If 'del_file' is TRUE, delete the swap file | |
857 */ | |
858 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
859 ml_close(buf_T *buf, int del_file) |
7 | 860 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
861 if (buf->b_ml.ml_mfp == NULL) // not open |
7 | 862 return; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
863 mf_close(buf->b_ml.ml_mfp, del_file); // close the .swp file |
7 | 864 if (buf->b_ml.ml_line_lnum != 0 && (buf->b_ml.ml_flags & ML_LINE_DIRTY)) |
865 vim_free(buf->b_ml.ml_line_ptr); | |
866 vim_free(buf->b_ml.ml_stack); | |
867 #ifdef FEAT_BYTEOFF | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12975
diff
changeset
|
868 VIM_CLEAR(buf->b_ml.ml_chunksize); |
7 | 869 #endif |
870 buf->b_ml.ml_mfp = NULL; | |
871 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
872 // Reset the "recovered" flag, give the ATTENTION prompt the next time |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
873 // this buffer is loaded. |
7 | 874 buf->b_flags &= ~BF_RECOVERED; |
875 } | |
876 | |
877 /* | |
878 * Close all existing memlines and memfiles. | |
879 * Only used when exiting. | |
880 * When 'del_file' is TRUE, delete the memfiles. | |
165 | 881 * But don't delete files that were ":preserve"d when we are POSIX compatible. |
7 | 882 */ |
883 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
884 ml_close_all(int del_file) |
7 | 885 { |
886 buf_T *buf; | |
887 | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
888 FOR_ALL_BUFFERS(buf) |
165 | 889 ml_close(buf, del_file && ((buf->b_flags & BF_PRESERVED) == 0 |
890 || vim_strchr(p_cpo, CPO_PRESERVE) == NULL)); | |
5519 | 891 #ifdef FEAT_SPELL |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
892 spell_delete_wordlist(); // delete the internal wordlist |
5519 | 893 #endif |
7 | 894 #ifdef TEMPDIRNAMES |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
895 vim_deltempdir(); // delete created temp directory |
7 | 896 #endif |
897 } | |
898 | |
899 /* | |
900 * Close all memfiles for not modified buffers. | |
901 * Only use just before exiting! | |
902 */ | |
903 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
904 ml_close_notmod(void) |
7 | 905 { |
906 buf_T *buf; | |
907 | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
908 FOR_ALL_BUFFERS(buf) |
7 | 909 if (!bufIsChanged(buf)) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
910 ml_close(buf, TRUE); // close all not-modified buffers |
7 | 911 } |
912 | |
913 /* | |
914 * Update the timestamp in the .swp file. | |
915 * Used when the file has been written. | |
916 */ | |
917 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
918 ml_timestamp(buf_T *buf) |
7 | 919 { |
2267 | 920 ml_upd_block0(buf, UB_FNAME); |
921 } | |
922 | |
923 /* | |
924 * Return FAIL when the ID of "b0p" is wrong. | |
925 */ | |
926 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
927 ml_check_b0_id(ZERO_BL *b0p) |
2267 | 928 { |
929 if (b0p->b0_id[0] != BLOCK0_ID0 | |
930 || (b0p->b0_id[1] != BLOCK0_ID1 | |
931 && b0p->b0_id[1] != BLOCK0_ID1_C0 | |
6122 | 932 && b0p->b0_id[1] != BLOCK0_ID1_C1 |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
933 && b0p->b0_id[1] != BLOCK0_ID1_C2 |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
934 && b0p->b0_id[1] != BLOCK0_ID1_C3) |
2267 | 935 ) |
936 return FAIL; | |
937 return OK; | |
39 | 938 } |
939 | |
940 /* | |
941 * Update the timestamp or the B0_SAME_DIR flag of the .swp file. | |
942 */ | |
943 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
944 ml_upd_block0(buf_T *buf, upd_block0_T what) |
39 | 945 { |
7 | 946 memfile_T *mfp; |
947 bhdr_T *hp; | |
948 ZERO_BL *b0p; | |
949 | |
950 mfp = buf->b_ml.ml_mfp; | |
6130 | 951 if (mfp == NULL) |
7 | 952 return; |
6130 | 953 hp = mf_get(mfp, (blocknr_T)0, 1); |
954 if (hp == NULL) | |
955 { | |
956 #ifdef FEAT_CRYPT | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
957 // Possibly update the seed in the memfile before there is a block0. |
6130 | 958 if (what == UB_CRYPT) |
959 ml_set_mfp_crypt(buf); | |
960 #endif | |
961 return; | |
962 } | |
963 | |
7 | 964 b0p = (ZERO_BL *)(hp->bh_data); |
2267 | 965 if (ml_check_b0_id(b0p) == FAIL) |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
966 iemsg(_("E304: ml_upd_block0(): Didn't get block 0??")); |
7 | 967 else |
39 | 968 { |
2267 | 969 if (what == UB_FNAME) |
39 | 970 set_b0_fname(b0p, buf); |
2267 | 971 #ifdef FEAT_CRYPT |
972 else if (what == UB_CRYPT) | |
973 ml_set_b0_crypt(buf, b0p); | |
974 #endif | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
975 else // what == UB_SAME_DIR |
39 | 976 set_b0_dir_flag(b0p, buf); |
977 } | |
7 | 978 mf_put(mfp, hp, TRUE, FALSE); |
979 } | |
980 | |
981 /* | |
982 * Write file name and timestamp into block 0 of a swap file. | |
983 * Also set buf->b_mtime. | |
984 * Don't use NameBuff[]!!! | |
985 */ | |
986 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
987 set_b0_fname(ZERO_BL *b0p, buf_T *buf) |
7 | 988 { |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
989 stat_T st; |
7 | 990 |
991 if (buf->b_ffname == NULL) | |
992 b0p->b0_fname[0] = NUL; | |
993 else | |
994 { | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
995 #if defined(MSWIN) || defined(AMIGA) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
996 // Systems that cannot translate "~user" back into a path: copy the |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
997 // file name unmodified. Do use slashes instead of backslashes for |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
998 // portability. |
2267 | 999 vim_strncpy(b0p->b0_fname, buf->b_ffname, B0_FNAME_SIZE_CRYPT - 1); |
39 | 1000 # ifdef BACKSLASH_IN_FILENAME |
1001 forward_slash(b0p->b0_fname); | |
1002 # endif | |
7 | 1003 #else |
1004 size_t flen, ulen; | |
1005 char_u uname[B0_UNAME_SIZE]; | |
1006 | |
1007 /* | |
1008 * For a file under the home directory of the current user, we try to | |
1009 * replace the home directory path with "~user". This helps when | |
1010 * editing the same file on different machines over a network. | |
1011 * First replace home dir path with "~/" with home_replace(). | |
1012 * Then insert the user name to get "~user/". | |
1013 */ | |
2267 | 1014 home_replace(NULL, buf->b_ffname, b0p->b0_fname, |
1015 B0_FNAME_SIZE_CRYPT, TRUE); | |
7 | 1016 if (b0p->b0_fname[0] == '~') |
1017 { | |
1018 flen = STRLEN(b0p->b0_fname); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1019 // If there is no user name or it is too long, don't use "~/" |
7 | 1020 if (get_user_name(uname, B0_UNAME_SIZE) == FAIL |
2267 | 1021 || (ulen = STRLEN(uname)) + flen > B0_FNAME_SIZE_CRYPT - 1) |
1022 vim_strncpy(b0p->b0_fname, buf->b_ffname, | |
1023 B0_FNAME_SIZE_CRYPT - 1); | |
7 | 1024 else |
1025 { | |
1026 mch_memmove(b0p->b0_fname + ulen + 1, b0p->b0_fname + 1, flen); | |
1027 mch_memmove(b0p->b0_fname + 1, uname, ulen); | |
1028 } | |
1029 } | |
1030 #endif | |
1031 if (mch_stat((char *)buf->b_ffname, &st) >= 0) | |
1032 { | |
1033 long_to_char((long)st.st_mtime, b0p->b0_mtime); | |
1034 #ifdef CHECK_INODE | |
1035 long_to_char((long)st.st_ino, b0p->b0_ino); | |
1036 #endif | |
1037 buf_store_time(buf, &st, buf->b_ffname); | |
1038 buf->b_mtime_read = buf->b_mtime; | |
1039 } | |
1040 else | |
1041 { | |
1042 long_to_char(0L, b0p->b0_mtime); | |
1043 #ifdef CHECK_INODE | |
1044 long_to_char(0L, b0p->b0_ino); | |
1045 #endif | |
1046 buf->b_mtime = 0; | |
1047 buf->b_mtime_read = 0; | |
1048 buf->b_orig_size = 0; | |
1049 buf->b_orig_mode = 0; | |
1050 } | |
1051 } | |
39 | 1052 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1053 // Also add the 'fileencoding' if there is room. |
39 | 1054 add_b0_fenc(b0p, curbuf); |
7 | 1055 } |
1056 | |
1057 /* | |
39 | 1058 * Update the B0_SAME_DIR flag of the swap file. It's set if the file and the |
1059 * swapfile for "buf" are in the same directory. | |
1060 * This is fail safe: if we are not sure the directories are equal the flag is | |
1061 * not set. | |
1062 */ | |
1063 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1064 set_b0_dir_flag(ZERO_BL *b0p, buf_T *buf) |
39 | 1065 { |
1066 if (same_directory(buf->b_ml.ml_mfp->mf_fname, buf->b_ffname)) | |
1067 b0p->b0_flags |= B0_SAME_DIR; | |
1068 else | |
1069 b0p->b0_flags &= ~B0_SAME_DIR; | |
1070 } | |
1071 | |
1072 /* | |
1073 * When there is room, add the 'fileencoding' to block zero. | |
1074 */ | |
1075 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1076 add_b0_fenc( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1077 ZERO_BL *b0p, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1078 buf_T *buf) |
39 | 1079 { |
1080 int n; | |
2267 | 1081 int size = B0_FNAME_SIZE_NOCRYPT; |
1082 | |
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1083 #ifdef FEAT_CRYPT |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1084 // Without encryption use the same offset as in Vim 7.2 to be compatible. |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1085 // With encryption it's OK to move elsewhere, the swap file is not |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1086 // compatible anyway. |
2267 | 1087 if (*buf->b_p_key != NUL) |
1088 size = B0_FNAME_SIZE_CRYPT; | |
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1089 #endif |
39 | 1090 |
835 | 1091 n = (int)STRLEN(buf->b_p_fenc); |
2267 | 1092 if ((int)STRLEN(b0p->b0_fname) + n + 1 > size) |
39 | 1093 b0p->b0_flags &= ~B0_HAS_FENC; |
1094 else | |
1095 { | |
2267 | 1096 mch_memmove((char *)b0p->b0_fname + size - n, |
39 | 1097 (char *)buf->b_p_fenc, (size_t)n); |
2267 | 1098 *(b0p->b0_fname + size - n - 1) = NUL; |
39 | 1099 b0p->b0_flags |= B0_HAS_FENC; |
1100 } | |
1101 } | |
1102 | |
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1103 #if defined(HAVE_SYS_SYSINFO_H) && defined(HAVE_SYSINFO_UPTIME) |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1104 # include <sys/sysinfo.h> |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1105 #endif |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1106 |
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1107 #if defined(UNIX) || defined(MSWIN) |
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1108 /* |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1109 * Return TRUE if the process with number "b0p->b0_pid" is still running. |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1110 * "swap_fname" is the name of the swap file, if it's from before a reboot then |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1111 * the result is FALSE; |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1112 */ |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1113 static int |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1114 swapfile_process_running(ZERO_BL *b0p, char_u *swap_fname UNUSED) |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1115 { |
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1116 # ifdef HAVE_SYSINFO_UPTIME |
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1117 stat_T st; |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1118 struct sysinfo sinfo; |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1119 |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1120 // If the system rebooted after when the swap file was written then the |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1121 // process can't be running now. |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1122 if (mch_stat((char *)swap_fname, &st) != -1 |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1123 && sysinfo(&sinfo) == 0 |
24093
5dfee9b1eabe
patch 8.2.2588: build failure with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
24089
diff
changeset
|
1124 && st.st_mtime < time(NULL) - ( |
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1125 # ifdef FEAT_EVAL |
24093
5dfee9b1eabe
patch 8.2.2588: build failure with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
24089
diff
changeset
|
1126 override_sysinfo_uptime >= 0 ? override_sysinfo_uptime : |
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1127 # endif |
24093
5dfee9b1eabe
patch 8.2.2588: build failure with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
24089
diff
changeset
|
1128 sinfo.uptime)) |
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1129 return FALSE; |
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1130 # endif |
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1131 return mch_process_running(char_to_long(b0p->b0_pid)); |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1132 } |
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1133 #endif |
39 | 1134 |
1135 /* | |
2267 | 1136 * Try to recover curbuf from the .swp file. |
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1137 * If "checkext" is TRUE, check the extension and detect whether it is |
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1138 * a swap file. |
7 | 1139 */ |
1140 void | |
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1141 ml_recover(int checkext) |
7 | 1142 { |
1143 buf_T *buf = NULL; | |
1144 memfile_T *mfp = NULL; | |
1145 char_u *fname; | |
2267 | 1146 char_u *fname_used = NULL; |
7 | 1147 bhdr_T *hp = NULL; |
1148 ZERO_BL *b0p; | |
39 | 1149 int b0_ff; |
1150 char_u *b0_fenc = NULL; | |
2267 | 1151 #ifdef FEAT_CRYPT |
1152 int b0_cm = -1; | |
1153 #endif | |
7 | 1154 PTR_BL *pp; |
1155 DATA_BL *dp; | |
1156 infoptr_T *ip; | |
1157 blocknr_T bnum; | |
1158 int page_count; | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
1159 stat_T org_stat, swp_stat; |
7 | 1160 int len; |
1161 int directly; | |
1162 linenr_T lnum; | |
1163 char_u *p; | |
1164 int i; | |
1165 long error; | |
1166 int cannot_open; | |
1167 linenr_T line_count; | |
1168 int has_error; | |
1169 int idx; | |
1170 int top; | |
1171 int txt_start; | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
1172 off_T size; |
7 | 1173 int called_from_main; |
1174 int serious_error = TRUE; | |
1175 long mtime; | |
1176 int attr; | |
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1177 int orig_file_status = NOTDONE; |
7 | 1178 |
1179 recoverymode = TRUE; | |
1180 called_from_main = (curbuf->b_ml.ml_mfp == NULL); | |
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1181 attr = HL_ATTR(HLF_E); |
1975 | 1182 |
1183 /* | |
12975
e311187347c1
patch 8.0.1363: recovering does not work when swap file ends in .stz
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1184 * If the file name ends in ".s[a-w][a-z]" we assume this is the swap file. |
1975 | 1185 * Otherwise a search is done to find the swap file(s). |
1186 */ | |
7 | 1187 fname = curbuf->b_fname; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1188 if (fname == NULL) // When there is no file name |
7 | 1189 fname = (char_u *)""; |
1190 len = (int)STRLEN(fname); | |
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1191 if (checkext && len >= 4 && |
2823 | 1192 #if defined(VMS) |
10889
5780bd3a5a7e
patch 8.0.0334: can't access b:changedtick from a dict reference
Christian Brabandt <cb@256bit.org>
parents:
10575
diff
changeset
|
1193 STRNICMP(fname + len - 4, "_s", 2) |
7 | 1194 #else |
10889
5780bd3a5a7e
patch 8.0.0334: can't access b:changedtick from a dict reference
Christian Brabandt <cb@256bit.org>
parents:
10575
diff
changeset
|
1195 STRNICMP(fname + len - 4, ".s", 2) |
7 | 1196 #endif |
10889
5780bd3a5a7e
patch 8.0.0334: can't access b:changedtick from a dict reference
Christian Brabandt <cb@256bit.org>
parents:
10575
diff
changeset
|
1197 == 0 |
12975
e311187347c1
patch 8.0.1363: recovering does not work when swap file ends in .stz
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1198 && vim_strchr((char_u *)"abcdefghijklmnopqrstuvw", |
e311187347c1
patch 8.0.1363: recovering does not work when swap file ends in .stz
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1199 TOLOWER_ASC(fname[len - 2])) != NULL |
1975 | 1200 && ASCII_ISALPHA(fname[len - 1])) |
7 | 1201 { |
1202 directly = TRUE; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1203 fname_used = vim_strsave(fname); // make a copy for mf_open() |
7 | 1204 } |
1205 else | |
1206 { | |
1207 directly = FALSE; | |
1208 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1209 // count the number of matching swap files |
2267 | 1210 len = recover_names(fname, FALSE, 0, NULL); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1211 if (len == 0) // no swap files found |
7 | 1212 { |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1213 semsg(_("E305: No swap file found for %s"), fname); |
7 | 1214 goto theend; |
1215 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1216 if (len == 1) // one swap file found, use it |
7 | 1217 i = 1; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1218 else // several swap files found, choose |
7 | 1219 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1220 // list the names of the swap files |
2267 | 1221 (void)recover_names(fname, TRUE, 0, NULL); |
7 | 1222 msg_putchar('\n'); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1223 msg_puts(_("Enter number of swap file to use (0 to quit): ")); |
374 | 1224 i = get_number(FALSE, NULL); |
7 | 1225 if (i < 1 || i > len) |
1226 goto theend; | |
1227 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1228 // get the swap file name that will be used |
2267 | 1229 (void)recover_names(fname, FALSE, i, &fname_used); |
7 | 1230 } |
2267 | 1231 if (fname_used == NULL) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1232 goto theend; // out of memory |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1233 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1234 // When called from main() still need to initialize storage structure |
625 | 1235 if (called_from_main && ml_open(curbuf) == FAIL) |
7 | 1236 getout(1); |
1237 | |
2267 | 1238 /* |
1239 * Allocate a buffer structure for the swap file that is used for recovery. | |
2407
6bc102a4bff8
Fix memory access to 'cryptmethod' during recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2394
diff
changeset
|
1240 * Only the memline and crypt information in it are really used. |
2267 | 1241 */ |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16786
diff
changeset
|
1242 buf = ALLOC_ONE(buf_T); |
7 | 1243 if (buf == NULL) |
1244 goto theend; | |
2267 | 1245 |
1246 /* | |
1247 * init fields in memline struct | |
1248 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1249 buf->b_ml.ml_stack_size = 0; // no stack yet |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1250 buf->b_ml.ml_stack = NULL; // no stack yet |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1251 buf->b_ml.ml_stack_top = 0; // nothing in the stack |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1252 buf->b_ml.ml_line_lnum = 0; // no cached line |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1253 buf->b_ml.ml_locked = NULL; // no locked block |
7 | 1254 buf->b_ml.ml_flags = 0; |
2408
9e2e63af1641
Better fix for memory access in recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2407
diff
changeset
|
1255 #ifdef FEAT_CRYPT |
9e2e63af1641
Better fix for memory access in recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2407
diff
changeset
|
1256 buf->b_p_key = empty_option; |
9e2e63af1641
Better fix for memory access in recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2407
diff
changeset
|
1257 buf->b_p_cm = empty_option; |
9e2e63af1641
Better fix for memory access in recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2407
diff
changeset
|
1258 #endif |
7 | 1259 |
2267 | 1260 /* |
1261 * open the memfile from the old swap file | |
1262 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1263 p = vim_strsave(fname_used); // save "fname_used" for the message: |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1264 // mf_open() will consume "fname_used"! |
2267 | 1265 mfp = mf_open(fname_used, O_RDONLY); |
1266 fname_used = p; | |
7 | 1267 if (mfp == NULL || mfp->mf_fd < 0) |
1268 { | |
2267 | 1269 if (fname_used != NULL) |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1270 semsg(_("E306: Cannot open %s"), fname_used); |
7 | 1271 goto theend; |
1272 } | |
1273 buf->b_ml.ml_mfp = mfp; | |
2267 | 1274 #ifdef FEAT_CRYPT |
1275 mfp->mf_buffer = buf; | |
1276 #endif | |
7 | 1277 |
1278 /* | |
1279 * The page size set in mf_open() might be different from the page size | |
1280 * used in the swap file, we must get it from block 0. But to read block | |
1281 * 0 we need a page size. Use the minimal size for block 0 here, it will | |
1282 * be set to the real value below. | |
1283 */ | |
1284 mfp->mf_page_size = MIN_SWAP_PAGE_SIZE; | |
1285 | |
2267 | 1286 /* |
1287 * try to read block 0 | |
1288 */ | |
7 | 1289 if ((hp = mf_get(mfp, (blocknr_T)0, 1)) == NULL) |
1290 { | |
1291 msg_start(); | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1292 msg_puts_attr(_("Unable to read block 0 from "), attr | MSG_HIST); |
7 | 1293 msg_outtrans_attr(mfp->mf_fname, attr | MSG_HIST); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1294 msg_puts_attr(_("\nMaybe no changes were made or Vim did not update the swap file."), |
7 | 1295 attr | MSG_HIST); |
1296 msg_end(); | |
1297 goto theend; | |
1298 } | |
1299 b0p = (ZERO_BL *)(hp->bh_data); | |
1300 if (STRNCMP(b0p->b0_version, "VIM 3.0", 7) == 0) | |
1301 { | |
1302 msg_start(); | |
1303 msg_outtrans_attr(mfp->mf_fname, MSG_HIST); | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1304 msg_puts_attr(_(" cannot be used with this version of Vim.\n"), |
7 | 1305 MSG_HIST); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1306 msg_puts_attr(_("Use Vim version 3.0.\n"), MSG_HIST); |
7 | 1307 msg_end(); |
1308 goto theend; | |
1309 } | |
2267 | 1310 if (ml_check_b0_id(b0p) == FAIL) |
7 | 1311 { |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1312 semsg(_("E307: %s does not look like a Vim swap file"), mfp->mf_fname); |
7 | 1313 goto theend; |
1314 } | |
1315 if (b0_magic_wrong(b0p)) | |
1316 { | |
1317 msg_start(); | |
1318 msg_outtrans_attr(mfp->mf_fname, attr | MSG_HIST); | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
1319 #if defined(MSWIN) |
7 | 1320 if (STRNCMP(b0p->b0_hname, "PC ", 3) == 0) |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1321 msg_puts_attr(_(" cannot be used with this version of Vim.\n"), |
7 | 1322 attr | MSG_HIST); |
1323 else | |
1324 #endif | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1325 msg_puts_attr(_(" cannot be used on this computer.\n"), |
7 | 1326 attr | MSG_HIST); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1327 msg_puts_attr(_("The file was created on "), attr | MSG_HIST); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1328 // avoid going past the end of a corrupted hostname |
7 | 1329 b0p->b0_fname[0] = NUL; |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1330 msg_puts_attr((char *)b0p->b0_hname, attr | MSG_HIST); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1331 msg_puts_attr(_(",\nor the file has been damaged."), attr | MSG_HIST); |
7 | 1332 msg_end(); |
1333 goto theend; | |
1334 } | |
1105 | 1335 |
2267 | 1336 #ifdef FEAT_CRYPT |
24768
7334bf933510
patch 8.2.2922: computing array length is done in various ways
Bram Moolenaar <Bram@vim.org>
parents:
24703
diff
changeset
|
1337 for (i = 0; i < (int)ARRAY_LENGTH(id1_codes); ++i) |
6122 | 1338 if (id1_codes[i] == b0p->b0_id[1]) |
1339 b0_cm = i; | |
1340 if (b0_cm > 0) | |
2267 | 1341 mch_memmove(mfp->mf_seed, &b0p->b0_seed, MF_SEED_LEN); |
6122 | 1342 crypt_set_cm_option(buf, b0_cm < 0 ? 0 : b0_cm); |
2267 | 1343 #else |
1344 if (b0p->b0_id[1] != BLOCK0_ID1) | |
1345 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1346 semsg(_("E833: %s is encrypted and this version of Vim does not support encryption"), mfp->mf_fname); |
2267 | 1347 goto theend; |
1348 } | |
1349 #endif | |
1350 | |
7 | 1351 /* |
1352 * If we guessed the wrong page size, we have to recalculate the | |
1353 * highest block number in the file. | |
1354 */ | |
1355 if (mfp->mf_page_size != (unsigned)char_to_long(b0p->b0_page_size)) | |
1356 { | |
1105 | 1357 unsigned previous_page_size = mfp->mf_page_size; |
1358 | |
7 | 1359 mf_new_page_size(mfp, (unsigned)char_to_long(b0p->b0_page_size)); |
1105 | 1360 if (mfp->mf_page_size < previous_page_size) |
1361 { | |
1362 msg_start(); | |
1363 msg_outtrans_attr(mfp->mf_fname, attr | MSG_HIST); | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1364 msg_puts_attr(_(" has been damaged (page size is smaller than minimum value).\n"), |
1105 | 1365 attr | MSG_HIST); |
1366 msg_end(); | |
1367 goto theend; | |
1368 } | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
1369 if ((size = vim_lseek(mfp->mf_fd, (off_T)0L, SEEK_END)) <= 0) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1370 mfp->mf_blocknr_max = 0; // no file or empty file |
7 | 1371 else |
1372 mfp->mf_blocknr_max = (blocknr_T)(size / mfp->mf_page_size); | |
1373 mfp->mf_infile_count = mfp->mf_blocknr_max; | |
1105 | 1374 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1375 // need to reallocate the memory used to store the data |
1105 | 1376 p = alloc(mfp->mf_page_size); |
1377 if (p == NULL) | |
1378 goto theend; | |
1379 mch_memmove(p, hp->bh_data, previous_page_size); | |
1380 vim_free(hp->bh_data); | |
1381 hp->bh_data = p; | |
1382 b0p = (ZERO_BL *)(hp->bh_data); | |
7 | 1383 } |
1384 | |
2267 | 1385 /* |
1386 * If .swp file name given directly, use name from swap file for buffer. | |
1387 */ | |
7 | 1388 if (directly) |
1389 { | |
1390 expand_env(b0p->b0_fname, NameBuff, MAXPATHL); | |
1391 if (setfname(curbuf, NameBuff, NULL, TRUE) == FAIL) | |
1392 goto theend; | |
1393 } | |
1394 | |
1395 home_replace(NULL, mfp->mf_fname, NameBuff, MAXPATHL, TRUE); | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1396 smsg(_("Using swap file \"%s\""), NameBuff); |
7 | 1397 |
1398 if (buf_spname(curbuf) != NULL) | |
3839 | 1399 vim_strncpy(NameBuff, buf_spname(curbuf), MAXPATHL - 1); |
7 | 1400 else |
1401 home_replace(NULL, curbuf->b_ffname, NameBuff, MAXPATHL, TRUE); | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1402 smsg(_("Original file \"%s\""), NameBuff); |
7 | 1403 msg_putchar('\n'); |
1404 | |
2267 | 1405 /* |
1406 * check date of swap file and original file | |
1407 */ | |
7 | 1408 mtime = char_to_long(b0p->b0_mtime); |
1409 if (curbuf->b_ffname != NULL | |
1410 && mch_stat((char *)curbuf->b_ffname, &org_stat) != -1 | |
1411 && ((mch_stat((char *)mfp->mf_fname, &swp_stat) != -1 | |
1412 && org_stat.st_mtime > swp_stat.st_mtime) | |
1413 || org_stat.st_mtime != mtime)) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1414 emsg(_("E308: Warning: Original file may have been changed")); |
7 | 1415 out_flush(); |
39 | 1416 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1417 // Get the 'fileformat' and 'fileencoding' from block zero. |
39 | 1418 b0_ff = (b0p->b0_flags & B0_FF_MASK); |
1419 if (b0p->b0_flags & B0_HAS_FENC) | |
1420 { | |
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2267
diff
changeset
|
1421 int fnsize = B0_FNAME_SIZE_NOCRYPT; |
2267 | 1422 |
1423 #ifdef FEAT_CRYPT | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1424 // Use the same size as in add_b0_fenc(). |
2267 | 1425 if (b0p->b0_id[1] != BLOCK0_ID1) |
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2267
diff
changeset
|
1426 fnsize = B0_FNAME_SIZE_CRYPT; |
2267 | 1427 #endif |
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2267
diff
changeset
|
1428 for (p = b0p->b0_fname + fnsize; p > b0p->b0_fname && p[-1] != NUL; --p) |
39 | 1429 ; |
20830
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20599
diff
changeset
|
1430 b0_fenc = vim_strnsave(p, b0p->b0_fname + fnsize - p); |
39 | 1431 } |
1432 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1433 mf_put(mfp, hp, FALSE, FALSE); // release block 0 |
7 | 1434 hp = NULL; |
1435 | |
1436 /* | |
1437 * Now that we are sure that the file is going to be recovered, clear the | |
1438 * contents of the current buffer. | |
1439 */ | |
1440 while (!(curbuf->b_ml.ml_flags & ML_EMPTY)) | |
20599
d571231175b4
patch 8.2.0853: ml_delete() often called with FALSE argument
Bram Moolenaar <Bram@vim.org>
parents:
20583
diff
changeset
|
1441 ml_delete((linenr_T)1); |
7 | 1442 |
1443 /* | |
1444 * Try reading the original file to obtain the values of 'fileformat', | |
1445 * 'fileencoding', etc. Ignore errors. The text itself is not used. | |
2267 | 1446 * When the file is encrypted the user is asked to enter the key. |
7 | 1447 */ |
1448 if (curbuf->b_ffname != NULL) | |
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1449 orig_file_status = readfile(curbuf->b_ffname, NULL, (linenr_T)0, |
7 | 1450 (linenr_T)0, (linenr_T)MAXLNUM, NULL, READ_NEW); |
1451 | |
2267 | 1452 #ifdef FEAT_CRYPT |
1453 if (b0_cm >= 0) | |
1454 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1455 // Need to ask the user for the crypt key. If this fails we continue |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1456 // without a key, will probably get garbage text. |
2267 | 1457 if (*curbuf->b_p_key != NUL) |
1458 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1459 smsg(_("Swap file is encrypted: \"%s\""), fname_used); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1460 msg_puts(_("\nIf you entered a new crypt key but did not write the text file,")); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1461 msg_puts(_("\nenter the new crypt key.")); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1462 msg_puts(_("\nIf you wrote the text file after changing the crypt key press enter")); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1463 msg_puts(_("\nto use the same key for text file and swap file")); |
2267 | 1464 } |
1465 else | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1466 smsg(_(need_key_msg), fname_used); |
6122 | 1467 buf->b_p_key = crypt_get_key(FALSE, FALSE); |
2267 | 1468 if (buf->b_p_key == NULL) |
1469 buf->b_p_key = curbuf->b_p_key; | |
1470 else if (*buf->b_p_key == NUL) | |
1471 { | |
1472 vim_free(buf->b_p_key); | |
1473 buf->b_p_key = curbuf->b_p_key; | |
1474 } | |
1475 if (buf->b_p_key == NULL) | |
1476 buf->b_p_key = empty_option; | |
2165
733f0dc510c3
Undo changes that are meant for the Vim 7.3 branch.
Bram Moolenaar <bram@vim.org>
parents:
2162
diff
changeset
|
1477 } |
2267 | 1478 #endif |
7 | 1479 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1480 // Use the 'fileformat' and 'fileencoding' as stored in the swap file. |
39 | 1481 if (b0_ff != 0) |
1482 set_fileformat(b0_ff - 1, OPT_LOCAL); | |
1483 if (b0_fenc != NULL) | |
1484 { | |
1485 set_option_value((char_u *)"fenc", 0L, b0_fenc, OPT_LOCAL); | |
1486 vim_free(b0_fenc); | |
1487 } | |
16996
d5e1e09a829f
patch 8.1.1498: ":write" increments b:changedtick even though nothing changed
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
1488 unchanged(curbuf, TRUE, TRUE); |
39 | 1489 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1490 bnum = 1; // start with block 1 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1491 page_count = 1; // which is 1 page |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1492 lnum = 0; // append after line 0 in curbuf |
7 | 1493 line_count = 0; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1494 idx = 0; // start with first index in block 1 |
7 | 1495 error = 0; |
1496 buf->b_ml.ml_stack_top = 0; | |
1497 buf->b_ml.ml_stack = NULL; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1498 buf->b_ml.ml_stack_size = 0; // no stack yet |
7 | 1499 |
1500 if (curbuf->b_ffname == NULL) | |
1501 cannot_open = TRUE; | |
1502 else | |
1503 cannot_open = FALSE; | |
1504 | |
1505 serious_error = FALSE; | |
1506 for ( ; !got_int; line_breakcheck()) | |
1507 { | |
1508 if (hp != NULL) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1509 mf_put(mfp, hp, FALSE, FALSE); // release previous block |
7 | 1510 |
1511 /* | |
1512 * get block | |
1513 */ | |
1514 if ((hp = mf_get(mfp, (blocknr_T)bnum, page_count)) == NULL) | |
1515 { | |
1516 if (bnum == 1) | |
1517 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1518 semsg(_("E309: Unable to read block 1 from %s"), mfp->mf_fname); |
7 | 1519 goto theend; |
1520 } | |
1521 ++error; | |
1522 ml_append(lnum++, (char_u *)_("???MANY LINES MISSING"), | |
1523 (colnr_T)0, TRUE); | |
1524 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1525 else // there is a block |
7 | 1526 { |
1527 pp = (PTR_BL *)(hp->bh_data); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1528 if (pp->pb_id == PTR_ID) // it is a pointer block |
7 | 1529 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1530 // check line count when using pointer block first time |
7 | 1531 if (idx == 0 && line_count != 0) |
1532 { | |
1533 for (i = 0; i < (int)pp->pb_count; ++i) | |
1534 line_count -= pp->pb_pointer[i].pe_line_count; | |
1535 if (line_count != 0) | |
1536 { | |
1537 ++error; | |
1538 ml_append(lnum++, (char_u *)_("???LINE COUNT WRONG"), | |
1539 (colnr_T)0, TRUE); | |
1540 } | |
1541 } | |
1542 | |
1543 if (pp->pb_count == 0) | |
1544 { | |
1545 ml_append(lnum++, (char_u *)_("???EMPTY BLOCK"), | |
1546 (colnr_T)0, TRUE); | |
1547 ++error; | |
1548 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1549 else if (idx < (int)pp->pb_count) // go a block deeper |
7 | 1550 { |
1551 if (pp->pb_pointer[idx].pe_bnum < 0) | |
1552 { | |
1553 /* | |
1554 * Data block with negative block number. | |
1555 * Try to read lines from the original file. | |
1556 * This is slow, but it works. | |
1557 */ | |
1558 if (!cannot_open) | |
1559 { | |
1560 line_count = pp->pb_pointer[idx].pe_line_count; | |
1561 if (readfile(curbuf->b_ffname, NULL, lnum, | |
1562 pp->pb_pointer[idx].pe_old_lnum - 1, | |
10575
01a5f64a7a20
patch 8.0.0177: BufEnter autocommand not fired for a directory
Christian Brabandt <cb@256bit.org>
parents:
10359
diff
changeset
|
1563 line_count, NULL, 0) != OK) |
7 | 1564 cannot_open = TRUE; |
1565 else | |
1566 lnum += line_count; | |
1567 } | |
1568 if (cannot_open) | |
1569 { | |
1570 ++error; | |
1571 ml_append(lnum++, (char_u *)_("???LINES MISSING"), | |
1572 (colnr_T)0, TRUE); | |
1573 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1574 ++idx; // get same block again for next index |
7 | 1575 continue; |
1576 } | |
1577 | |
1578 /* | |
1579 * going one block deeper in the tree | |
1580 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1581 if ((top = ml_add_stack(buf)) < 0) // new entry in stack |
7 | 1582 { |
1583 ++error; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1584 break; // out of memory |
7 | 1585 } |
1586 ip = &(buf->b_ml.ml_stack[top]); | |
1587 ip->ip_bnum = bnum; | |
1588 ip->ip_index = idx; | |
1589 | |
1590 bnum = pp->pb_pointer[idx].pe_bnum; | |
1591 line_count = pp->pb_pointer[idx].pe_line_count; | |
1592 page_count = pp->pb_pointer[idx].pe_page_count; | |
2885 | 1593 idx = 0; |
7 | 1594 continue; |
1595 } | |
1596 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1597 else // not a pointer block |
7 | 1598 { |
1599 dp = (DATA_BL *)(hp->bh_data); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1600 if (dp->db_id != DATA_ID) // block id wrong |
7 | 1601 { |
1602 if (bnum == 1) | |
1603 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1604 semsg(_("E310: Block 1 ID wrong (%s not a .swp file?)"), |
7 | 1605 mfp->mf_fname); |
1606 goto theend; | |
1607 } | |
1608 ++error; | |
1609 ml_append(lnum++, (char_u *)_("???BLOCK MISSING"), | |
1610 (colnr_T)0, TRUE); | |
1611 } | |
1612 else | |
1613 { | |
1614 /* | |
1615 * it is a data block | |
1616 * Append all the lines in this block | |
1617 */ | |
1618 has_error = FALSE; | |
1619 /* | |
1620 * check length of block | |
1621 * if wrong, use length in pointer block | |
1622 */ | |
1623 if (page_count * mfp->mf_page_size != dp->db_txt_end) | |
1624 { | |
1625 ml_append(lnum++, (char_u *)_("??? from here until ???END lines may be messed up"), | |
1626 (colnr_T)0, TRUE); | |
1627 ++error; | |
1628 has_error = TRUE; | |
1629 dp->db_txt_end = page_count * mfp->mf_page_size; | |
1630 } | |
1631 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1632 // make sure there is a NUL at the end of the block |
7 | 1633 *((char_u *)dp + dp->db_txt_end - 1) = NUL; |
1634 | |
1635 /* | |
1636 * check number of lines in block | |
1637 * if wrong, use count in data block | |
1638 */ | |
1639 if (line_count != dp->db_line_count) | |
1640 { | |
1641 ml_append(lnum++, (char_u *)_("??? from here until ???END lines may have been inserted/deleted"), | |
1642 (colnr_T)0, TRUE); | |
1643 ++error; | |
1644 has_error = TRUE; | |
1645 } | |
1646 | |
1647 for (i = 0; i < dp->db_line_count; ++i) | |
1648 { | |
1649 txt_start = (dp->db_index[i] & DB_INDEX_MASK); | |
1978 | 1650 if (txt_start <= (int)HEADER_SIZE |
7 | 1651 || txt_start >= (int)dp->db_txt_end) |
1652 { | |
1653 p = (char_u *)"???"; | |
1654 ++error; | |
1655 } | |
1656 else | |
1657 p = (char_u *)dp + txt_start; | |
1658 ml_append(lnum++, p, (colnr_T)0, TRUE); | |
1659 } | |
1660 if (has_error) | |
1978 | 1661 ml_append(lnum++, (char_u *)_("???END"), |
1662 (colnr_T)0, TRUE); | |
7 | 1663 } |
1664 } | |
1665 } | |
1666 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1667 if (buf->b_ml.ml_stack_top == 0) // finished |
7 | 1668 break; |
1669 | |
1670 /* | |
1671 * go one block up in the tree | |
1672 */ | |
1673 ip = &(buf->b_ml.ml_stack[--(buf->b_ml.ml_stack_top)]); | |
1674 bnum = ip->ip_bnum; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1675 idx = ip->ip_index + 1; // go to next index |
7 | 1676 page_count = 1; |
1677 } | |
1678 | |
1679 /* | |
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1680 * Compare the buffer contents with the original file. When they differ |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1681 * set the 'modified' flag. |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1682 * Lines 1 - lnum are the new contents. |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1683 * Lines lnum + 1 to ml_line_count are the original contents. |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1684 * Line ml_line_count + 1 in the dummy empty line. |
7 | 1685 */ |
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1686 if (orig_file_status != OK || curbuf->b_ml.ml_line_count != lnum * 2 + 1) |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1687 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1688 // Recovering an empty file results in two lines and the first line is |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1689 // empty. Don't set the modified flag then. |
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1690 if (!(curbuf->b_ml.ml_line_count == 2 && *ml_get(1) == NUL)) |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1691 { |
16632
30de89c1d090
patch 8.1.1318: code for text changes is in a "misc" file
Bram Moolenaar <Bram@vim.org>
parents:
16621
diff
changeset
|
1692 changed_internal(); |
10952
835604f3c37a
patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents:
10896
diff
changeset
|
1693 ++CHANGEDTICK(curbuf); |
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1694 } |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1695 } |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1696 else |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1697 { |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1698 for (idx = 1; idx <= lnum; ++idx) |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1699 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1700 // Need to copy one line, fetching the other one may flush it. |
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1701 p = vim_strsave(ml_get(idx)); |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1702 i = STRCMP(p, ml_get(idx + lnum)); |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1703 vim_free(p); |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1704 if (i != 0) |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1705 { |
16632
30de89c1d090
patch 8.1.1318: code for text changes is in a "misc" file
Bram Moolenaar <Bram@vim.org>
parents:
16621
diff
changeset
|
1706 changed_internal(); |
10952
835604f3c37a
patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents:
10896
diff
changeset
|
1707 ++CHANGEDTICK(curbuf); |
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1708 break; |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1709 } |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1710 } |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1711 } |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1712 |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1713 /* |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1714 * Delete the lines from the original file and the dummy line from the |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1715 * empty buffer. These will now be after the last line in the buffer. |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1716 */ |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1717 while (curbuf->b_ml.ml_line_count > lnum |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1718 && !(curbuf->b_ml.ml_flags & ML_EMPTY)) |
20599
d571231175b4
patch 8.2.0853: ml_delete() often called with FALSE argument
Bram Moolenaar <Bram@vim.org>
parents:
20583
diff
changeset
|
1719 ml_delete(curbuf->b_ml.ml_line_count); |
7 | 1720 curbuf->b_flags |= BF_RECOVERED; |
24856
a81b883576d6
patch 8.2.2966: ml_get errors after recovering a file
Bram Moolenaar <Bram@vim.org>
parents:
24768
diff
changeset
|
1721 check_cursor(); |
7 | 1722 |
1723 recoverymode = FALSE; | |
1724 if (got_int) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1725 emsg(_("E311: Recovery Interrupted")); |
7 | 1726 else if (error) |
1727 { | |
1728 ++no_wait_return; | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1729 msg(">>>>>>>>>>>>>"); |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1730 emsg(_("E312: Errors detected while recovering; look for lines starting with ???")); |
7 | 1731 --no_wait_return; |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1732 msg(_("See \":help E312\" for more information.")); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1733 msg(">>>>>>>>>>>>>"); |
7 | 1734 } |
1735 else | |
1736 { | |
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1737 if (curbuf->b_changed) |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1738 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1739 msg(_("Recovery completed. You should check if everything is OK.")); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1740 msg_puts(_("\n(You might want to write out this file under another name\n")); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1741 msg_puts(_("and run diff with the original file to check for changes)")); |
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1742 } |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1743 else |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1744 msg(_("Recovery completed. Buffer contents equals file contents.")); |
22846
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1745 msg_puts(_("\nYou may want to delete the .swp file now.")); |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1746 #if defined(UNIX) || defined(MSWIN) |
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1747 if (swapfile_process_running(b0p, fname_used)) |
22846
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1748 { |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1749 // Warn there could be an active Vim on the same file, the user may |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1750 // want to kill it. |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1751 msg_puts(_("\nNote: process STILL RUNNING: ")); |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1752 msg_outnum(char_to_long(b0p->b0_pid)); |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1753 } |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1754 #endif |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1755 msg_puts("\n\n"); |
7 | 1756 cmdline_row = msg_row; |
1757 } | |
2267 | 1758 #ifdef FEAT_CRYPT |
1759 if (*buf->b_p_key != NUL && STRCMP(curbuf->b_p_key, buf->b_p_key) != 0) | |
1760 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1761 msg_puts(_("Using crypt key from swap file for the text file.\n")); |
2267 | 1762 set_option_value((char_u *)"key", 0L, buf->b_p_key, OPT_LOCAL); |
1763 } | |
1764 #endif | |
7 | 1765 redraw_curbuf_later(NOT_VALID); |
1766 | |
1767 theend: | |
2267 | 1768 vim_free(fname_used); |
7 | 1769 recoverymode = FALSE; |
1770 if (mfp != NULL) | |
1771 { | |
1772 if (hp != NULL) | |
1773 mf_put(mfp, hp, FALSE, FALSE); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1774 mf_close(mfp, FALSE); // will also vim_free(mfp->mf_fname) |
7 | 1775 } |
1053 | 1776 if (buf != NULL) |
1777 { | |
2267 | 1778 #ifdef FEAT_CRYPT |
1779 if (buf->b_p_key != curbuf->b_p_key) | |
1780 free_string_option(buf->b_p_key); | |
2407
6bc102a4bff8
Fix memory access to 'cryptmethod' during recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2394
diff
changeset
|
1781 free_string_option(buf->b_p_cm); |
2267 | 1782 #endif |
1053 | 1783 vim_free(buf->b_ml.ml_stack); |
1784 vim_free(buf); | |
1785 } | |
7 | 1786 if (serious_error && called_from_main) |
1787 ml_close(curbuf, TRUE); | |
1788 else | |
1789 { | |
1790 apply_autocmds(EVENT_BUFREADPOST, NULL, curbuf->b_fname, FALSE, curbuf); | |
1791 apply_autocmds(EVENT_BUFWINENTER, NULL, curbuf->b_fname, FALSE, curbuf); | |
1792 } | |
1793 return; | |
1794 } | |
1795 | |
1796 /* | |
1797 * Find the names of swap files in current directory and the directory given | |
1798 * with the 'directory' option. | |
1799 * | |
1800 * Used to: | |
1801 * - list the swap files for "vim -r" | |
1802 * - count the number of swap files when recovering | |
1803 * - list the swap files when recovering | |
1804 * - find the name of the n'th swap file when recovering | |
1805 */ | |
1806 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1807 recover_names( |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1808 char_u *fname, // base for swap file name |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1809 int list, // when TRUE, list the swap file names |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1810 int nr, // when non-zero, return nr'th swap file name |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1811 char_u **fname_out) // result when "nr" > 0 |
7 | 1812 { |
1813 int num_names; | |
1814 char_u *(names[6]); | |
1815 char_u *tail; | |
1816 char_u *p; | |
1817 int num_files; | |
1818 int file_count = 0; | |
1819 char_u **files; | |
1820 int i; | |
1821 char_u *dirp; | |
1822 char_u *dir_name; | |
2175 | 1823 char_u *fname_res = NULL; |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1824 #ifdef HAVE_READLINK |
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1825 char_u fname_buf[MAXPATHL]; |
2175 | 1826 #endif |
1827 | |
1828 if (fname != NULL) | |
1829 { | |
1830 #ifdef HAVE_READLINK | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1831 // Expand symlink in the file name, because the swap file is created |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1832 // with the actual file instead of with the symlink. |
2267 | 1833 if (resolve_symlink(fname, fname_buf) == OK) |
1834 fname_res = fname_buf; | |
1835 else | |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1836 #endif |
2267 | 1837 fname_res = fname; |
2175 | 1838 } |
7 | 1839 |
1840 if (list) | |
1841 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1842 // use msg() to start the scrolling properly |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1843 msg(_("Swap files found:")); |
7 | 1844 msg_putchar('\n'); |
1845 } | |
1846 | |
1847 /* | |
1848 * Do the loop for every directory in 'directory'. | |
1849 * First allocate some memory to put the directory name in. | |
1850 */ | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1851 dir_name = alloc(STRLEN(p_dir) + 1); |
7 | 1852 dirp = p_dir; |
1853 while (dir_name != NULL && *dirp) | |
1854 { | |
1855 /* | |
1856 * Isolate a directory name from *dirp and put it in dir_name (we know | |
1857 * it is large enough, so use 31000 for length). | |
1858 * Advance dirp to next directory name. | |
1859 */ | |
1860 (void)copy_option_part(&dirp, dir_name, 31000, ","); | |
1861 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1862 if (dir_name[0] == '.' && dir_name[1] == NUL) // check current dir |
7 | 1863 { |
2267 | 1864 if (fname == NULL) |
7 | 1865 { |
1866 #ifdef VMS | |
1867 names[0] = vim_strsave((char_u *)"*_sw%"); | |
1868 #else | |
1869 names[0] = vim_strsave((char_u *)"*.sw?"); | |
1870 #endif | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
1871 #if defined(UNIX) || defined(MSWIN) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1872 // For Unix names starting with a dot are special. MS-Windows |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1873 // supports this too, on some file systems. |
7 | 1874 names[1] = vim_strsave((char_u *)".*.sw?"); |
1875 names[2] = vim_strsave((char_u *)".sw?"); | |
1876 num_names = 3; | |
1877 #else | |
1878 # ifdef VMS | |
1879 names[1] = vim_strsave((char_u *)".*_sw%"); | |
1880 num_names = 2; | |
1881 # else | |
1882 num_names = 1; | |
1883 # endif | |
1884 #endif | |
1885 } | |
1886 else | |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1887 num_names = recov_file_names(names, fname_res, TRUE); |
7 | 1888 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1889 else // check directory dir_name |
7 | 1890 { |
2267 | 1891 if (fname == NULL) |
7 | 1892 { |
1893 #ifdef VMS | |
1894 names[0] = concat_fnames(dir_name, (char_u *)"*_sw%", TRUE); | |
1895 #else | |
1896 names[0] = concat_fnames(dir_name, (char_u *)"*.sw?", TRUE); | |
1897 #endif | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
1898 #if defined(UNIX) || defined(MSWIN) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1899 // For Unix names starting with a dot are special. MS-Windows |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1900 // supports this too, on some file systems. |
7 | 1901 names[1] = concat_fnames(dir_name, (char_u *)".*.sw?", TRUE); |
1902 names[2] = concat_fnames(dir_name, (char_u *)".sw?", TRUE); | |
1903 num_names = 3; | |
1904 #else | |
1905 # ifdef VMS | |
1906 names[1] = concat_fnames(dir_name, (char_u *)".*_sw%", TRUE); | |
1907 num_names = 2; | |
1908 # else | |
1909 num_names = 1; | |
1910 # endif | |
1911 #endif | |
1912 } | |
1913 else | |
1914 { | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
1915 #if defined(UNIX) || defined(MSWIN) |
10996
2f041b367cd9
patch 8.0.0387: compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1916 int len = (int)STRLEN(dir_name); |
10896
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
1917 |
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
1918 p = dir_name + len; |
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
1919 if (after_pathsep(dir_name, p) && len > 1 && p[-1] == p[-2]) |
7 | 1920 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1921 // Ends with '//', Use Full path for swap name |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1922 tail = make_percent_swname(dir_name, fname_res); |
7 | 1923 } |
1924 else | |
1925 #endif | |
1926 { | |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1927 tail = gettail(fname_res); |
7 | 1928 tail = concat_fnames(dir_name, tail, TRUE); |
1929 } | |
1930 if (tail == NULL) | |
1931 num_names = 0; | |
1932 else | |
1933 { | |
1934 num_names = recov_file_names(names, tail, FALSE); | |
1935 vim_free(tail); | |
1936 } | |
1937 } | |
1938 } | |
1939 | |
16684
1c2d9f67d98f
patch 8.1.1344: Coverity complains about possibly using a NULL pointer
Bram Moolenaar <Bram@vim.org>
parents:
16666
diff
changeset
|
1940 // check for out-of-memory |
7 | 1941 for (i = 0; i < num_names; ++i) |
1942 { | |
1943 if (names[i] == NULL) | |
1944 { | |
1945 for (i = 0; i < num_names; ++i) | |
1946 vim_free(names[i]); | |
1947 num_names = 0; | |
1948 } | |
1949 } | |
1950 if (num_names == 0) | |
1951 num_files = 0; | |
1952 else if (expand_wildcards(num_names, names, &num_files, &files, | |
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1953 EW_NOTENV|EW_KEEPALL|EW_FILE|EW_SILENT) == FAIL) |
7 | 1954 num_files = 0; |
1955 | |
1956 /* | |
1957 * When no swap file found, wildcard expansion might have failed (e.g. | |
1958 * not able to execute the shell). | |
1959 * Try finding a swap file by simply adding ".swp" to the file name. | |
1960 */ | |
2267 | 1961 if (*dirp == NUL && file_count + num_files == 0 && fname != NULL) |
7 | 1962 { |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
1963 stat_T st; |
7 | 1964 char_u *swapname; |
1965 | |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1966 swapname = modname(fname_res, |
2823 | 1967 #if defined(VMS) |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1968 (char_u *)"_swp", FALSE |
7 | 1969 #else |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1970 (char_u *)".swp", TRUE |
7 | 1971 #endif |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1972 ); |
7 | 1973 if (swapname != NULL) |
1974 { | |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16786
diff
changeset
|
1975 if (mch_stat((char *)swapname, &st) != -1) // It exists! |
7 | 1976 { |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16786
diff
changeset
|
1977 files = ALLOC_ONE(char_u *); |
7 | 1978 if (files != NULL) |
1979 { | |
1980 files[0] = swapname; | |
1981 swapname = NULL; | |
1982 num_files = 1; | |
1983 } | |
1984 } | |
1985 vim_free(swapname); | |
1986 } | |
1987 } | |
1988 | |
1989 /* | |
1990 * remove swapfile name of the current buffer, it must be ignored | |
1991 */ | |
1992 if (curbuf->b_ml.ml_mfp != NULL | |
1993 && (p = curbuf->b_ml.ml_mfp->mf_fname) != NULL) | |
1994 { | |
1995 for (i = 0; i < num_files; ++i) | |
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1996 // Do not expand wildcards, on windows would try to expand |
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1997 // "%tmp%" in "%tmp%file". |
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1998 if (fullpathcmp(p, files[i], TRUE, FALSE) & FPC_SAME) |
7 | 1999 { |
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
2000 // Remove the name from files[i]. Move further entries |
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
2001 // down. When the array becomes empty free it here, since |
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
2002 // FreeWild() won't be called below. |
7 | 2003 vim_free(files[i]); |
1855 | 2004 if (--num_files == 0) |
2005 vim_free(files); | |
2006 else | |
2007 for ( ; i < num_files; ++i) | |
2008 files[i] = files[i + 1]; | |
7 | 2009 } |
2010 } | |
838 | 2011 if (nr > 0) |
7 | 2012 { |
2013 file_count += num_files; | |
2014 if (nr <= file_count) | |
2015 { | |
2267 | 2016 *fname_out = vim_strsave( |
2017 files[nr - 1 + num_files - file_count]); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2018 dirp = (char_u *)""; // stop searching |
7 | 2019 } |
2020 } | |
2021 else if (list) | |
2022 { | |
2023 if (dir_name[0] == '.' && dir_name[1] == NUL) | |
2024 { | |
2267 | 2025 if (fname == NULL) |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2026 msg_puts(_(" In current directory:\n")); |
7 | 2027 else |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2028 msg_puts(_(" Using specified name:\n")); |
7 | 2029 } |
2030 else | |
2031 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2032 msg_puts(_(" In directory ")); |
7 | 2033 msg_home_replace(dir_name); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2034 msg_puts(":\n"); |
7 | 2035 } |
2036 | |
2037 if (num_files) | |
2038 { | |
2039 for (i = 0; i < num_files; ++i) | |
2040 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2041 // print the swap file name |
7 | 2042 msg_outnum((long)++file_count); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2043 msg_puts(". "); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2044 msg_puts((char *)gettail(files[i])); |
7 | 2045 msg_putchar('\n'); |
2046 (void)swapfile_info(files[i]); | |
2047 } | |
2048 } | |
2049 else | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2050 msg_puts(_(" -- none --\n")); |
7 | 2051 out_flush(); |
2052 } | |
2053 else | |
2054 file_count += num_files; | |
2055 | |
2056 for (i = 0; i < num_names; ++i) | |
2057 vim_free(names[i]); | |
838 | 2058 if (num_files > 0) |
2059 FreeWild(num_files, files); | |
7 | 2060 } |
2061 vim_free(dir_name); | |
2062 return file_count; | |
2063 } | |
2064 | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2065 #if defined(UNIX) || defined(MSWIN) || defined(PROTO) |
7 | 2066 /* |
14475
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2067 * Need _very_ long file names. |
7 | 2068 * Append the full path to name with path separators made into percent |
2069 * signs, to dir. An unnamed buffer is handled as "" (<currentdir>/"") | |
2070 */ | |
14475
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2071 char_u * |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2072 make_percent_swname(char_u *dir, char_u *name) |
7 | 2073 { |
14475
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2074 char_u *d = NULL, *s, *f; |
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2075 |
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2076 f = fix_fname(name != NULL ? name : (char_u *)""); |
7 | 2077 if (f != NULL) |
2078 { | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
2079 s = alloc(STRLEN(f) + 1); |
7 | 2080 if (s != NULL) |
2081 { | |
39 | 2082 STRCPY(s, f); |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10996
diff
changeset
|
2083 for (d = s; *d != NUL; MB_PTR_ADV(d)) |
39 | 2084 if (vim_ispathsep(*d)) |
2085 *d = '%'; | |
7 | 2086 d = concat_fnames(dir, s, TRUE); |
2087 vim_free(s); | |
2088 } | |
2089 vim_free(f); | |
2090 } | |
2091 return d; | |
2092 } | |
2093 #endif | |
2094 | |
16455
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
2095 #if (defined(UNIX) || defined(VMS) || defined(MSWIN)) \ |
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
2096 && (defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)) |
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
2097 # define HAVE_PROCESS_STILL_RUNNING |
7 | 2098 static int process_still_running; |
2099 #endif | |
2100 | |
14601
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2101 #if defined(FEAT_EVAL) || defined(PROTO) |
7 | 2102 /* |
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2103 * Return information found in swapfile "fname" in dictionary "d". |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2104 * This is used by the swapinfo() function. |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2105 */ |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2106 void |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2107 get_b0_dict(char_u *fname, dict_T *d) |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2108 { |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2109 int fd; |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2110 struct block0 b0; |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2111 |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2112 if ((fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0)) >= 0) |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2113 { |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2114 if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0)) |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2115 { |
14601
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2116 if (ml_check_b0_id(&b0) == FAIL) |
15267
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2117 dict_add_string(d, "error", (char_u *)"Not a swap file"); |
14601
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2118 else if (b0_magic_wrong(&b0)) |
15267
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2119 dict_add_string(d, "error", (char_u *)"Magic number mismatch"); |
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2120 else |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2121 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2122 // we have swap information |
15267
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2123 dict_add_string_len(d, "version", b0.b0_version, 10); |
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2124 dict_add_string_len(d, "user", b0.b0_uname, B0_UNAME_SIZE); |
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2125 dict_add_string_len(d, "host", b0.b0_hname, B0_HNAME_SIZE); |
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2126 dict_add_string_len(d, "fname", b0.b0_fname, B0_FNAME_SIZE_ORG); |
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2127 |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2128 dict_add_number(d, "pid", char_to_long(b0.b0_pid)); |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2129 dict_add_number(d, "mtime", char_to_long(b0.b0_mtime)); |
14601
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2130 dict_add_number(d, "dirty", b0.b0_dirty ? 1 : 0); |
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2131 # ifdef CHECK_INODE |
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2132 dict_add_number(d, "inode", char_to_long(b0.b0_ino)); |
14601
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2133 # endif |
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2134 } |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2135 } |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2136 else |
15267
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2137 dict_add_string(d, "error", (char_u *)"Cannot read file"); |
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2138 close(fd); |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2139 } |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2140 else |
15267
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2141 dict_add_string(d, "error", (char_u *)"Cannot open file"); |
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2142 } |
14601
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2143 #endif |
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2144 |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2145 /* |
580 | 2146 * Give information about an existing swap file. |
7 | 2147 * Returns timestamp (0 when unknown). |
2148 */ | |
2149 static time_t | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2150 swapfile_info(char_u *fname) |
7 | 2151 { |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
2152 stat_T st; |
7 | 2153 int fd; |
2154 struct block0 b0; | |
2155 #ifdef UNIX | |
2156 char_u uname[B0_UNAME_SIZE]; | |
2157 #endif | |
2158 | |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2159 // print the swap file date |
7 | 2160 if (mch_stat((char *)fname, &st) != -1) |
2161 { | |
2162 #ifdef UNIX | |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2163 // print name of owner of the file |
7 | 2164 if (mch_get_uname(st.st_uid, uname, B0_UNAME_SIZE) == OK) |
2165 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2166 msg_puts(_(" owned by: ")); |
7 | 2167 msg_outtrans(uname); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2168 msg_puts(_(" dated: ")); |
7 | 2169 } |
2170 else | |
2171 #endif | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2172 msg_puts(_(" dated: ")); |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2173 msg_puts(get_ctime(st.st_mtime, TRUE)); |
7 | 2174 } |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2175 else |
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2176 st.st_mtime = 0; |
7 | 2177 |
2178 /* | |
2179 * print the original file name | |
2180 */ | |
2181 fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0); | |
2182 if (fd >= 0) | |
2183 { | |
2664 | 2184 if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0)) |
7 | 2185 { |
2186 if (STRNCMP(b0.b0_version, "VIM 3.0", 7) == 0) | |
2187 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2188 msg_puts(_(" [from Vim version 3.0]")); |
7 | 2189 } |
2267 | 2190 else if (ml_check_b0_id(&b0) == FAIL) |
7 | 2191 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2192 msg_puts(_(" [does not look like a Vim swap file]")); |
7 | 2193 } |
2194 else | |
2195 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2196 msg_puts(_(" file name: ")); |
7 | 2197 if (b0.b0_fname[0] == NUL) |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2198 msg_puts(_("[No Name]")); |
7 | 2199 else |
2200 msg_outtrans(b0.b0_fname); | |
2201 | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2202 msg_puts(_("\n modified: ")); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2203 msg_puts(b0.b0_dirty ? _("YES") : _("no")); |
7 | 2204 |
2205 if (*(b0.b0_uname) != NUL) | |
2206 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2207 msg_puts(_("\n user name: ")); |
7 | 2208 msg_outtrans(b0.b0_uname); |
2209 } | |
2210 | |
2211 if (*(b0.b0_hname) != NUL) | |
2212 { | |
2213 if (*(b0.b0_uname) != NUL) | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2214 msg_puts(_(" host name: ")); |
7 | 2215 else |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2216 msg_puts(_("\n host name: ")); |
7 | 2217 msg_outtrans(b0.b0_hname); |
2218 } | |
2219 | |
2220 if (char_to_long(b0.b0_pid) != 0L) | |
2221 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2222 msg_puts(_("\n process ID: ")); |
7 | 2223 msg_outnum(char_to_long(b0.b0_pid)); |
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2224 #if defined(UNIX) || defined(MSWIN) |
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
2225 if (swapfile_process_running(&b0, fname)) |
7 | 2226 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2227 msg_puts(_(" (STILL RUNNING)")); |
16455
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
2228 # ifdef HAVE_PROCESS_STILL_RUNNING |
7 | 2229 process_still_running = TRUE; |
2230 # endif | |
2231 } | |
2232 #endif | |
2233 } | |
2234 | |
2235 if (b0_magic_wrong(&b0)) | |
2236 { | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
2237 #if defined(MSWIN) |
7 | 2238 if (STRNCMP(b0.b0_hname, "PC ", 3) == 0) |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2239 msg_puts(_("\n [not usable with this version of Vim]")); |
7 | 2240 else |
2241 #endif | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2242 msg_puts(_("\n [not usable on this computer]")); |
7 | 2243 } |
2244 } | |
2245 } | |
2246 else | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2247 msg_puts(_(" [cannot be read]")); |
7 | 2248 close(fd); |
2249 } | |
2250 else | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2251 msg_puts(_(" [cannot be opened]")); |
7 | 2252 msg_putchar('\n'); |
2253 | |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2254 return st.st_mtime; |
7 | 2255 } |
2256 | |
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2257 /* |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2258 * Return TRUE if the swap file looks OK and there are no changes, thus it can |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2259 * be safely deleted. |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2260 */ |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2261 static time_t |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2262 swapfile_unchanged(char_u *fname) |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2263 { |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2264 stat_T st; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2265 int fd; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2266 struct block0 b0; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2267 int ret = TRUE; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2268 |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2269 // must be able to stat the swap file |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2270 if (mch_stat((char *)fname, &st) == -1) |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2271 return FALSE; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2272 |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2273 // must be able to read the first block |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2274 fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0); |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2275 if (fd < 0) |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2276 return FALSE; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2277 if (read_eintr(fd, &b0, sizeof(b0)) != sizeof(b0)) |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2278 { |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2279 close(fd); |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2280 return FALSE; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2281 } |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2282 |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2283 // the ID and magic number must be correct |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2284 if (ml_check_b0_id(&b0) == FAIL|| b0_magic_wrong(&b0)) |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2285 ret = FALSE; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2286 |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2287 // must be unchanged |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2288 if (b0.b0_dirty) |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2289 ret = FALSE; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2290 |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2291 #if defined(UNIX) || defined(MSWIN) |
22846
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2292 // Host name must be known and must equal the current host name, otherwise |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2293 // comparing pid is meaningless. |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2294 if (*(b0.b0_hname) == NUL) |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2295 { |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2296 ret = FALSE; |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2297 } |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2298 else |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2299 { |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2300 char_u hostname[B0_HNAME_SIZE]; |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2301 |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2302 mch_get_host_name(hostname, B0_HNAME_SIZE); |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2303 hostname[B0_HNAME_SIZE - 1] = NUL; |
22959
4cce4a5d3fd3
patch 8.2.2026: Coverity warns for possibly using not NUL terminated string
Bram Moolenaar <Bram@vim.org>
parents:
22846
diff
changeset
|
2304 b0.b0_hname[B0_HNAME_SIZE - 1] = NUL; // in case of corruption |
22846
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2305 if (STRICMP(b0.b0_hname, hostname) != 0) |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2306 ret = FALSE; |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2307 } |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2308 |
18498
9e6d5a4abb1c
patch 8.1.2243: typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
18459
diff
changeset
|
2309 // process must be known and not be running |
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
2310 if (char_to_long(b0.b0_pid) == 0L || swapfile_process_running(&b0, fname)) |
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2311 ret = FALSE; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2312 #endif |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2313 |
22846
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2314 // We do not check the user, it should be irrelevant for whether the swap |
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
2315 // file is still useful. |
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2316 |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2317 close(fd); |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2318 return ret; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2319 } |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2320 |
7 | 2321 static int |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2322 recov_file_names(char_u **names, char_u *path, int prepend_dot) |
7 | 2323 { |
2324 int num_names; | |
2325 | |
2326 /* | |
2327 * (Win32 and Win64) never short names, but do prepend a dot. | |
2328 * (Not MS-DOS or Win32 or Win64) maybe short name, maybe not: Try both. | |
2329 * Only use the short name if it is different. | |
2330 */ | |
2331 char_u *p; | |
2332 int i; | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2333 # ifndef MSWIN |
7 | 2334 int shortname = curbuf->b_shortname; |
2335 | |
2336 curbuf->b_shortname = FALSE; | |
2337 # endif | |
2338 | |
2339 num_names = 0; | |
2340 | |
2341 /* | |
2342 * May also add the file name with a dot prepended, for swap file in same | |
2343 * dir as original file. | |
2344 */ | |
2345 if (prepend_dot) | |
2346 { | |
2347 names[num_names] = modname(path, (char_u *)".sw?", TRUE); | |
2348 if (names[num_names] == NULL) | |
2349 goto end; | |
2350 ++num_names; | |
2351 } | |
2352 | |
2353 /* | |
2354 * Form the normal swap file name pattern by appending ".sw?". | |
2355 */ | |
2356 #ifdef VMS | |
2357 names[num_names] = concat_fnames(path, (char_u *)"_sw%", FALSE); | |
2358 #else | |
2359 names[num_names] = concat_fnames(path, (char_u *)".sw?", FALSE); | |
2360 #endif | |
2361 if (names[num_names] == NULL) | |
2362 goto end; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2363 if (num_names >= 1) // check if we have the same name twice |
7 | 2364 { |
2365 p = names[num_names - 1]; | |
2366 i = (int)STRLEN(names[num_names - 1]) - (int)STRLEN(names[num_names]); | |
2367 if (i > 0) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2368 p += i; // file name has been expanded to full path |
7 | 2369 |
2370 if (STRCMP(p, names[num_names]) != 0) | |
2371 ++num_names; | |
2372 else | |
2373 vim_free(names[num_names]); | |
2374 } | |
2375 else | |
2376 ++num_names; | |
2377 | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2378 # ifndef MSWIN |
7 | 2379 /* |
2380 * Also try with 'shortname' set, in case the file is on a DOS filesystem. | |
2381 */ | |
2382 curbuf->b_shortname = TRUE; | |
2383 #ifdef VMS | |
2384 names[num_names] = modname(path, (char_u *)"_sw%", FALSE); | |
2385 #else | |
2386 names[num_names] = modname(path, (char_u *)".sw?", FALSE); | |
2387 #endif | |
2388 if (names[num_names] == NULL) | |
2389 goto end; | |
2390 | |
2391 /* | |
2392 * Remove the one from 'shortname', if it's the same as with 'noshortname'. | |
2393 */ | |
2394 p = names[num_names]; | |
2395 i = STRLEN(names[num_names]) - STRLEN(names[num_names - 1]); | |
2396 if (i > 0) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2397 p += i; // file name has been expanded to full path |
7 | 2398 if (STRCMP(names[num_names - 1], p) == 0) |
2399 vim_free(names[num_names]); | |
2400 else | |
2401 ++num_names; | |
2402 # endif | |
2403 | |
2404 end: | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2405 # ifndef MSWIN |
7 | 2406 curbuf->b_shortname = shortname; |
2407 # endif | |
2408 | |
2409 return num_names; | |
2410 } | |
2411 | |
2412 /* | |
2413 * sync all memlines | |
2414 * | |
2415 * If 'check_file' is TRUE, check if original file exists and was not changed. | |
2416 * If 'check_char' is TRUE, stop syncing when character becomes available, but | |
2417 * always sync at least one block. | |
2418 */ | |
2419 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2420 ml_sync_all(int check_file, int check_char) |
7 | 2421 { |
2422 buf_T *buf; | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
2423 stat_T st; |
7 | 2424 |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
2425 FOR_ALL_BUFFERS(buf) |
7 | 2426 { |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
2427 if (buf->b_ml.ml_mfp == NULL |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
2428 || buf->b_ml.ml_mfp->mf_fname == NULL |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
2429 || buf->b_ml.ml_mfp->mf_fd < 0) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2430 continue; // no file |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2431 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2432 ml_flush_line(buf); // flush buffered line |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2433 // flush locked block |
7 | 2434 (void)ml_find_line(buf, (linenr_T)0, ML_FLUSH); |
2435 if (bufIsChanged(buf) && check_file && mf_need_trans(buf->b_ml.ml_mfp) | |
2436 && buf->b_ffname != NULL) | |
2437 { | |
2438 /* | |
2439 * If the original file does not exist anymore or has been changed | |
2440 * call ml_preserve() to get rid of all negative numbered blocks. | |
2441 */ | |
2442 if (mch_stat((char *)buf->b_ffname, &st) == -1 | |
2443 || st.st_mtime != buf->b_mtime_read | |
2241
60da25e3aab7
Correct use of long instead of off_t for file size. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2240
diff
changeset
|
2444 || st.st_size != buf->b_orig_size) |
7 | 2445 { |
2446 ml_preserve(buf, FALSE); | |
2447 did_check_timestamps = FALSE; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2448 need_check_timestamps = TRUE; // give message later |
7 | 2449 } |
2450 } | |
2451 if (buf->b_ml.ml_mfp->mf_dirty) | |
2452 { | |
2453 (void)mf_sync(buf->b_ml.ml_mfp, (check_char ? MFS_STOP : 0) | |
2454 | (bufIsChanged(buf) ? MFS_FLUSH : 0)); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2455 if (check_char && ui_char_avail()) // character available now |
7 | 2456 break; |
2457 } | |
2458 } | |
2459 } | |
2460 | |
2461 /* | |
2462 * sync one buffer, including negative blocks | |
2463 * | |
2464 * after this all the blocks are in the swap file | |
2465 * | |
2466 * Used for the :preserve command and when the original file has been | |
2467 * changed or deleted. | |
2468 * | |
2469 * when message is TRUE the success of preserving is reported | |
2470 */ | |
2471 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2472 ml_preserve(buf_T *buf, int message) |
7 | 2473 { |
2474 bhdr_T *hp; | |
2475 linenr_T lnum; | |
2476 memfile_T *mfp = buf->b_ml.ml_mfp; | |
2477 int status; | |
2478 int got_int_save = got_int; | |
2479 | |
2480 if (mfp == NULL || mfp->mf_fname == NULL) | |
2481 { | |
2482 if (message) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
2483 emsg(_("E313: Cannot preserve, there is no swap file")); |
7 | 2484 return; |
2485 } | |
2486 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2487 // We only want to stop when interrupted here, not when interrupted |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2488 // before. |
7 | 2489 got_int = FALSE; |
2490 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2491 ml_flush_line(buf); // flush buffered line |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2492 (void)ml_find_line(buf, (linenr_T)0, ML_FLUSH); // flush locked block |
7 | 2493 status = mf_sync(mfp, MFS_ALL | MFS_FLUSH); |
2494 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2495 // stack is invalid after mf_sync(.., MFS_ALL) |
7 | 2496 buf->b_ml.ml_stack_top = 0; |
2497 | |
2498 /* | |
2499 * Some of the data blocks may have been changed from negative to | |
2500 * positive block number. In that case the pointer blocks need to be | |
2501 * updated. | |
2502 * | |
2503 * We don't know in which pointer block the references are, so we visit | |
2504 * all data blocks until there are no more translations to be done (or | |
2505 * we hit the end of the file, which can only happen in case a write fails, | |
2506 * e.g. when file system if full). | |
2507 * ml_find_line() does the work by translating the negative block numbers | |
2508 * when getting the first line of each data block. | |
2509 */ | |
2510 if (mf_need_trans(mfp) && !got_int) | |
2511 { | |
2512 lnum = 1; | |
2513 while (mf_need_trans(mfp) && lnum <= buf->b_ml.ml_line_count) | |
2514 { | |
2515 hp = ml_find_line(buf, lnum, ML_FIND); | |
2516 if (hp == NULL) | |
2517 { | |
2518 status = FAIL; | |
2519 goto theend; | |
2520 } | |
2521 CHECK(buf->b_ml.ml_locked_low != lnum, "low != lnum"); | |
2522 lnum = buf->b_ml.ml_locked_high + 1; | |
2523 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2524 (void)ml_find_line(buf, (linenr_T)0, ML_FLUSH); // flush locked block |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2525 // sync the updated pointer blocks |
7 | 2526 if (mf_sync(mfp, MFS_ALL | MFS_FLUSH) == FAIL) |
2527 status = FAIL; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2528 buf->b_ml.ml_stack_top = 0; // stack is invalid now |
7 | 2529 } |
2530 theend: | |
2531 got_int |= got_int_save; | |
2532 | |
2533 if (message) | |
2534 { | |
2535 if (status == OK) | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2536 msg(_("File preserved")); |
7 | 2537 else |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
2538 emsg(_("E314: Preserve failed")); |
7 | 2539 } |
2540 } | |
2541 | |
2542 /* | |
2543 * NOTE: The pointer returned by the ml_get_*() functions only remains valid | |
2544 * until the next call! | |
2545 * line1 = ml_get(1); | |
2546 * line2 = ml_get(2); // line1 is now invalid! | |
2547 * Make a copy of the line if necessary. | |
2548 */ | |
2549 /* | |
2657 | 2550 * Return a pointer to a (read-only copy of a) line. |
7 | 2551 * |
2552 * On failure an error message is given and IObuff is returned (to avoid | |
2553 * having to check for error everywhere). | |
2554 */ | |
2555 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2556 ml_get(linenr_T lnum) |
7 | 2557 { |
2558 return ml_get_buf(curbuf, lnum, FALSE); | |
2559 } | |
2560 | |
2561 /* | |
2657 | 2562 * Return pointer to position "pos". |
7 | 2563 */ |
2564 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2565 ml_get_pos(pos_T *pos) |
7 | 2566 { |
2567 return (ml_get_buf(curbuf, pos->lnum, FALSE) + pos->col); | |
2568 } | |
2569 | |
2570 /* | |
2657 | 2571 * Return pointer to cursor line. |
7 | 2572 */ |
2573 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2574 ml_get_curline(void) |
7 | 2575 { |
2576 return ml_get_buf(curbuf, curwin->w_cursor.lnum, FALSE); | |
2577 } | |
2578 | |
2579 /* | |
2657 | 2580 * Return pointer to cursor position. |
7 | 2581 */ |
2582 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2583 ml_get_cursor(void) |
7 | 2584 { |
2585 return (ml_get_buf(curbuf, curwin->w_cursor.lnum, FALSE) + | |
2586 curwin->w_cursor.col); | |
2587 } | |
2588 | |
2589 /* | |
2657 | 2590 * Return a pointer to a line in a specific buffer |
7 | 2591 * |
2592 * "will_change": if TRUE mark the buffer dirty (chars in the line will be | |
2593 * changed) | |
2594 */ | |
2595 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2596 ml_get_buf( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2597 buf_T *buf, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2598 linenr_T lnum, |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2599 int will_change) // line will be changed |
7 | 2600 { |
1068 | 2601 bhdr_T *hp; |
2602 DATA_BL *dp; | |
2603 static int recursive = 0; | |
7 | 2604 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2605 if (lnum > buf->b_ml.ml_line_count) // invalid line number |
7 | 2606 { |
1068 | 2607 if (recursive == 0) |
2608 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2609 // Avoid giving this message for a recursive call, may happen when |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2610 // the GUI redraws part of the text. |
1068 | 2611 ++recursive; |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
2612 siemsg(_("E315: ml_get: invalid lnum: %ld"), lnum); |
1068 | 2613 --recursive; |
2614 } | |
7 | 2615 errorret: |
2616 STRCPY(IObuff, "???"); | |
16786
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2617 buf->b_ml.ml_line_len = 4; |
7 | 2618 return IObuff; |
2619 } | |
16786
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2620 if (lnum <= 0) // pretend line 0 is line 1 |
7 | 2621 lnum = 1; |
2622 | |
16786
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2623 if (buf->b_ml.ml_mfp == NULL) // there are no lines |
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2624 { |
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2625 buf->b_ml.ml_line_len = 1; |
7 | 2626 return (char_u *)""; |
16786
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2627 } |
7 | 2628 |
2108
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2629 /* |
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2630 * See if it is the same line as requested last time. |
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2631 * Otherwise may need to flush last used line. |
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2632 * Don't use the last used line when 'swapfile' is reset, need to load all |
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2633 * blocks. |
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2634 */ |
1066 | 2635 if (buf->b_ml.ml_line_lnum != lnum || mf_dont_release) |
7 | 2636 { |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2637 unsigned start, end; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2638 colnr_T len; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2639 int idx; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2640 |
7 | 2641 ml_flush_line(buf); |
2642 | |
2643 /* | |
2644 * Find the data block containing the line. | |
2645 * This also fills the stack with the blocks from the root to the data | |
2646 * block and releases any locked block. | |
2647 */ | |
2648 if ((hp = ml_find_line(buf, lnum, ML_FIND)) == NULL) | |
2649 { | |
1068 | 2650 if (recursive == 0) |
2651 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2652 // Avoid giving this message for a recursive call, may happen |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2653 // when the GUI redraws part of the text. |
1068 | 2654 ++recursive; |
18459
5c0437acebb7
patch 8.1.2223: cannot see what buffer an ml_get error is for
Bram Moolenaar <Bram@vim.org>
parents:
18372
diff
changeset
|
2655 get_trans_bufname(buf); |
5c0437acebb7
patch 8.1.2223: cannot see what buffer an ml_get error is for
Bram Moolenaar <Bram@vim.org>
parents:
18372
diff
changeset
|
2656 shorten_dir(NameBuff); |
5c0437acebb7
patch 8.1.2223: cannot see what buffer an ml_get error is for
Bram Moolenaar <Bram@vim.org>
parents:
18372
diff
changeset
|
2657 siemsg(_("E316: ml_get: cannot find line %ld in buffer %d %s"), |
5c0437acebb7
patch 8.1.2223: cannot see what buffer an ml_get error is for
Bram Moolenaar <Bram@vim.org>
parents:
18372
diff
changeset
|
2658 lnum, buf->b_fnum, NameBuff); |
1068 | 2659 --recursive; |
2660 } | |
7 | 2661 goto errorret; |
2662 } | |
2663 | |
2664 dp = (DATA_BL *)(hp->bh_data); | |
2665 | |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2666 idx = lnum - buf->b_ml.ml_locked_low; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2667 start = ((dp->db_index[idx]) & DB_INDEX_MASK); |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2668 // The text ends where the previous line starts. The first line ends |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2669 // at the end of the block. |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2670 if (idx == 0) |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2671 end = dp->db_txt_end; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2672 else |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2673 end = ((dp->db_index[idx - 1]) & DB_INDEX_MASK); |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2674 len = end - start; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2675 |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2676 buf->b_ml.ml_line_ptr = (char_u *)dp + start; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2677 buf->b_ml.ml_line_len = len; |
7 | 2678 buf->b_ml.ml_line_lnum = lnum; |
2679 buf->b_ml.ml_flags &= ~ML_LINE_DIRTY; | |
2680 } | |
2681 if (will_change) | |
2682 buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS); | |
2683 | |
2684 return buf->b_ml.ml_line_ptr; | |
2685 } | |
2686 | |
2687 /* | |
2688 * Check if a line that was just obtained by a call to ml_get | |
2689 * is in allocated memory. | |
2690 */ | |
2691 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2692 ml_line_alloced(void) |
7 | 2693 { |
2694 return (curbuf->b_ml.ml_flags & ML_LINE_DIRTY); | |
2695 } | |
2696 | |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2697 #ifdef FEAT_PROP_POPUP |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2698 /* |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2699 * Add text properties that continue from the previous line. |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2700 */ |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2701 static void |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2702 add_text_props_for_append( |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2703 buf_T *buf, |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2704 linenr_T lnum, |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2705 char_u **line, |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2706 int *len, |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2707 char_u **tofree) |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2708 { |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2709 int round; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2710 int new_prop_count = 0; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2711 int count; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2712 int n; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2713 char_u *props; |
17974
9fb236d0f386
patch 8.1.1983: compiler nags for uninitialized variable and unused function
Bram Moolenaar <Bram@vim.org>
parents:
17632
diff
changeset
|
2714 int new_len = 0; // init for gcc |
22242
f7871f02ddcd
patch 8.2.1670: a couple of gcc compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
21915
diff
changeset
|
2715 char_u *new_line = NULL; |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2716 textprop_T prop; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2717 |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2718 // Make two rounds: |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2719 // 1. calculate the extra space needed |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2720 // 2. allocate the space and fill it |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2721 for (round = 1; round <= 2; ++round) |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2722 { |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2723 if (round == 2) |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2724 { |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2725 if (new_prop_count == 0) |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2726 return; // nothing to do |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2727 new_len = *len + new_prop_count * sizeof(textprop_T); |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
2728 new_line = alloc(new_len); |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2729 if (new_line == NULL) |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2730 return; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2731 mch_memmove(new_line, *line, *len); |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2732 new_prop_count = 0; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2733 } |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2734 |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2735 // Get the line above to find any props that continue in the next |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2736 // line. |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2737 count = get_text_props(buf, lnum, &props, FALSE); |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2738 for (n = 0; n < count; ++n) |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2739 { |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2740 mch_memmove(&prop, props + n * sizeof(textprop_T), |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2741 sizeof(textprop_T)); |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2742 if (prop.tp_flags & TP_FLAG_CONT_NEXT) |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2743 { |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2744 if (round == 2) |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2745 { |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2746 prop.tp_flags |= TP_FLAG_CONT_PREV; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2747 prop.tp_col = 1; |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2748 prop.tp_len = *len; // not exactly the right length |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2749 mch_memmove(new_line + *len + new_prop_count |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2750 * sizeof(textprop_T), &prop, sizeof(textprop_T)); |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2751 } |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2752 ++new_prop_count; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2753 } |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2754 } |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2755 } |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2756 *line = new_line; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2757 *tofree = new_line; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2758 *len = new_len; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2759 } |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2760 #endif |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2761 |
7 | 2762 static int |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2763 ml_append_int( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2764 buf_T *buf, |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2765 linenr_T lnum, // append after this line (can be 0) |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2766 char_u *line_arg, // text of the new line |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2767 colnr_T len_arg, // length of line, including NUL, or 0 |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2768 int flags) // ML_APPEND_ flags |
7 | 2769 { |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2770 char_u *line = line_arg; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2771 colnr_T len = len_arg; |
7 | 2772 int i; |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2773 int line_count; // number of indexes in current block |
7 | 2774 int offset; |
2775 int from, to; | |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2776 int space_needed; // space needed for new line |
7 | 2777 int page_size; |
2778 int page_count; | |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2779 int db_idx; // index for lnum in data block |
7 | 2780 bhdr_T *hp; |
2781 memfile_T *mfp; | |
2782 DATA_BL *dp; | |
2783 PTR_BL *pp; | |
2784 infoptr_T *ip; | |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2785 #ifdef FEAT_PROP_POPUP |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2786 char_u *tofree = NULL; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2787 #endif |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2788 int ret = FAIL; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2789 |
7 | 2790 if (lnum > buf->b_ml.ml_line_count || buf->b_ml.ml_mfp == NULL) |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2791 return FAIL; // lnum out of range |
7 | 2792 |
2793 if (lowest_marked && lowest_marked > lnum) | |
2794 lowest_marked = lnum + 1; | |
2795 | |
2796 if (len == 0) | |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2797 len = (colnr_T)STRLEN(line) + 1; // space needed for the text |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2798 |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2799 #ifdef FEAT_PROP_POPUP |
24703
4bc0bda6857d
patch 8.2.2890: text property duplicated when data block splits
Bram Moolenaar <Bram@vim.org>
parents:
24093
diff
changeset
|
2800 if (curbuf->b_has_textprop && lnum > 0 |
4bc0bda6857d
patch 8.2.2890: text property duplicated when data block splits
Bram Moolenaar <Bram@vim.org>
parents:
24093
diff
changeset
|
2801 && !(flags & (ML_APPEND_UNDO | ML_APPEND_NOPROP))) |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2802 // Add text properties that continue from the previous line. |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2803 add_text_props_for_append(buf, lnum, &line, &len, &tofree); |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2804 #endif |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2805 |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2806 space_needed = len + INDEX_SIZE; // space needed for text + index |
7 | 2807 |
2808 mfp = buf->b_ml.ml_mfp; | |
2809 page_size = mfp->mf_page_size; | |
2810 | |
2811 /* | |
2812 * find the data block containing the previous line | |
2813 * This also fills the stack with the blocks from the root to the data block | |
2814 * This also releases any locked block. | |
2815 */ | |
2816 if ((hp = ml_find_line(buf, lnum == 0 ? (linenr_T)1 : lnum, | |
2817 ML_INSERT)) == NULL) | |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2818 goto theend; |
7 | 2819 |
2820 buf->b_ml.ml_flags &= ~ML_EMPTY; | |
2821 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2822 if (lnum == 0) // got line one instead, correct db_idx |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2823 db_idx = -1; // careful, it is negative! |
7 | 2824 else |
2825 db_idx = lnum - buf->b_ml.ml_locked_low; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2826 // get line count before the insertion |
7 | 2827 line_count = buf->b_ml.ml_locked_high - buf->b_ml.ml_locked_low; |
2828 | |
2829 dp = (DATA_BL *)(hp->bh_data); | |
2830 | |
2831 /* | |
2832 * If | |
2833 * - there is not enough room in the current block | |
2834 * - appending to the last line in the block | |
2835 * - not appending to the last line in the file | |
2836 * insert in front of the next block. | |
2837 */ | |
2838 if ((int)dp->db_free < space_needed && db_idx == line_count - 1 | |
2839 && lnum < buf->b_ml.ml_line_count) | |
2840 { | |
2841 /* | |
2842 * Now that the line is not going to be inserted in the block that we | |
2843 * expected, the line count has to be adjusted in the pointer blocks | |
2844 * by using ml_locked_lineadd. | |
2845 */ | |
2846 --(buf->b_ml.ml_locked_lineadd); | |
2847 --(buf->b_ml.ml_locked_high); | |
2848 if ((hp = ml_find_line(buf, lnum + 1, ML_INSERT)) == NULL) | |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2849 goto theend; |
7 | 2850 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2851 db_idx = -1; // careful, it is negative! |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2852 // get line count before the insertion |
7 | 2853 line_count = buf->b_ml.ml_locked_high - buf->b_ml.ml_locked_low; |
2854 CHECK(buf->b_ml.ml_locked_low != lnum + 1, "locked_low != lnum + 1"); | |
2855 | |
2856 dp = (DATA_BL *)(hp->bh_data); | |
2857 } | |
2858 | |
2859 ++buf->b_ml.ml_line_count; | |
2860 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2861 if ((int)dp->db_free >= space_needed) // enough room in data block |
7 | 2862 { |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2863 /* |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2864 * Insert the new line in an existing data block, or in the data block |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2865 * allocated above. |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2866 */ |
7 | 2867 dp->db_txt_start -= len; |
2868 dp->db_free -= space_needed; | |
2869 ++(dp->db_line_count); | |
2870 | |
2871 /* | |
2872 * move the text of the lines that follow to the front | |
2873 * adjust the indexes of the lines that follow | |
2874 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2875 if (line_count > db_idx + 1) // if there are following lines |
7 | 2876 { |
2877 /* | |
2878 * Offset is the start of the previous line. | |
2879 * This will become the character just after the new line. | |
2880 */ | |
2881 if (db_idx < 0) | |
2882 offset = dp->db_txt_end; | |
2883 else | |
2884 offset = ((dp->db_index[db_idx]) & DB_INDEX_MASK); | |
2885 mch_memmove((char *)dp + dp->db_txt_start, | |
2886 (char *)dp + dp->db_txt_start + len, | |
2887 (size_t)(offset - (dp->db_txt_start + len))); | |
2888 for (i = line_count - 1; i > db_idx; --i) | |
2889 dp->db_index[i + 1] = dp->db_index[i] - len; | |
2890 dp->db_index[db_idx + 1] = offset - len; | |
2891 } | |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2892 else |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2893 // add line at the end (which is the start of the text) |
7 | 2894 dp->db_index[db_idx + 1] = dp->db_txt_start; |
2895 | |
2896 /* | |
2897 * copy the text into the block | |
2898 */ | |
2899 mch_memmove((char *)dp + dp->db_index[db_idx + 1], line, (size_t)len); | |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2900 if (flags & ML_APPEND_MARK) |
7 | 2901 dp->db_index[db_idx + 1] |= DB_MARKED; |
2902 | |
2903 /* | |
2904 * Mark the block dirty. | |
2905 */ | |
2906 buf->b_ml.ml_flags |= ML_LOCKED_DIRTY; | |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2907 if (!(flags & ML_APPEND_NEW)) |
7 | 2908 buf->b_ml.ml_flags |= ML_LOCKED_POS; |
2909 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2910 else // not enough space in data block |
7 | 2911 { |
2912 long line_count_left, line_count_right; | |
2913 int page_count_left, page_count_right; | |
2914 bhdr_T *hp_left; | |
2915 bhdr_T *hp_right; | |
2916 bhdr_T *hp_new; | |
2917 int lines_moved; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2918 int data_moved = 0; // init to shut up gcc |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2919 int total_moved = 0; // init to shut up gcc |
7 | 2920 DATA_BL *dp_right, *dp_left; |
2921 int stack_idx; | |
2922 int in_left; | |
2923 int lineadd; | |
2924 blocknr_T bnum_left, bnum_right; | |
2925 linenr_T lnum_left, lnum_right; | |
2926 int pb_idx; | |
2927 PTR_BL *pp_new; | |
2928 | |
2929 /* | |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2930 * There is not enough room, we have to create a new data block and |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2931 * copy some lines into it. |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2932 * Then we have to insert an entry in the pointer block. |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2933 * If this pointer block also is full, we go up another block, and so |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2934 * on, up to the root if necessary. |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2935 * The line counts in the pointer blocks have already been adjusted by |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2936 * ml_find_line(). |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2937 * |
7 | 2938 * We are going to allocate a new data block. Depending on the |
2939 * situation it will be put to the left or right of the existing | |
2940 * block. If possible we put the new line in the left block and move | |
2941 * the lines after it to the right block. Otherwise the new line is | |
2942 * also put in the right block. This method is more efficient when | |
2943 * inserting a lot of lines at one place. | |
2944 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2945 if (db_idx < 0) // left block is new, right block is existing |
7 | 2946 { |
2947 lines_moved = 0; | |
2948 in_left = TRUE; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2949 // space_needed does not change |
7 | 2950 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2951 else // left block is existing, right block is new |
7 | 2952 { |
2953 lines_moved = line_count - db_idx - 1; | |
2954 if (lines_moved == 0) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2955 in_left = FALSE; // put new line in right block |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2956 // space_needed does not change |
7 | 2957 else |
2958 { | |
2959 data_moved = ((dp->db_index[db_idx]) & DB_INDEX_MASK) - | |
2960 dp->db_txt_start; | |
2961 total_moved = data_moved + lines_moved * INDEX_SIZE; | |
2962 if ((int)dp->db_free + total_moved >= space_needed) | |
2963 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2964 in_left = TRUE; // put new line in left block |
7 | 2965 space_needed = total_moved; |
2966 } | |
2967 else | |
2968 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2969 in_left = FALSE; // put new line in right block |
7 | 2970 space_needed += total_moved; |
2971 } | |
2972 } | |
2973 } | |
2974 | |
2975 page_count = ((space_needed + HEADER_SIZE) + page_size - 1) / page_size; | |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2976 if ((hp_new = ml_new_data(mfp, flags & ML_APPEND_NEW, page_count)) |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2977 == NULL) |
7 | 2978 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2979 // correct line counts in pointer blocks |
7 | 2980 --(buf->b_ml.ml_locked_lineadd); |
2981 --(buf->b_ml.ml_locked_high); | |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2982 goto theend; |
7 | 2983 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2984 if (db_idx < 0) // left block is new |
7 | 2985 { |
2986 hp_left = hp_new; | |
2987 hp_right = hp; | |
2988 line_count_left = 0; | |
2989 line_count_right = line_count; | |
2990 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2991 else // right block is new |
7 | 2992 { |
2993 hp_left = hp; | |
2994 hp_right = hp_new; | |
2995 line_count_left = line_count; | |
2996 line_count_right = 0; | |
2997 } | |
2998 dp_right = (DATA_BL *)(hp_right->bh_data); | |
2999 dp_left = (DATA_BL *)(hp_left->bh_data); | |
3000 bnum_left = hp_left->bh_bnum; | |
3001 bnum_right = hp_right->bh_bnum; | |
3002 page_count_left = hp_left->bh_page_count; | |
3003 page_count_right = hp_right->bh_page_count; | |
3004 | |
3005 /* | |
3006 * May move the new line into the right/new block. | |
3007 */ | |
3008 if (!in_left) | |
3009 { | |
3010 dp_right->db_txt_start -= len; | |
3011 dp_right->db_free -= len + INDEX_SIZE; | |
3012 dp_right->db_index[0] = dp_right->db_txt_start; | |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3013 if (flags & ML_APPEND_MARK) |
7 | 3014 dp_right->db_index[0] |= DB_MARKED; |
3015 | |
3016 mch_memmove((char *)dp_right + dp_right->db_txt_start, | |
3017 line, (size_t)len); | |
3018 ++line_count_right; | |
3019 } | |
3020 /* | |
3021 * may move lines from the left/old block to the right/new one. | |
3022 */ | |
3023 if (lines_moved) | |
3024 { | |
3025 /* | |
3026 */ | |
3027 dp_right->db_txt_start -= data_moved; | |
3028 dp_right->db_free -= total_moved; | |
3029 mch_memmove((char *)dp_right + dp_right->db_txt_start, | |
3030 (char *)dp_left + dp_left->db_txt_start, | |
3031 (size_t)data_moved); | |
3032 offset = dp_right->db_txt_start - dp_left->db_txt_start; | |
3033 dp_left->db_txt_start += data_moved; | |
3034 dp_left->db_free += total_moved; | |
3035 | |
3036 /* | |
3037 * update indexes in the new block | |
3038 */ | |
3039 for (to = line_count_right, from = db_idx + 1; | |
3040 from < line_count_left; ++from, ++to) | |
3041 dp_right->db_index[to] = dp->db_index[from] + offset; | |
3042 line_count_right += lines_moved; | |
3043 line_count_left -= lines_moved; | |
3044 } | |
3045 | |
3046 /* | |
3047 * May move the new line into the left (old or new) block. | |
3048 */ | |
3049 if (in_left) | |
3050 { | |
3051 dp_left->db_txt_start -= len; | |
3052 dp_left->db_free -= len + INDEX_SIZE; | |
3053 dp_left->db_index[line_count_left] = dp_left->db_txt_start; | |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3054 if (flags & ML_APPEND_MARK) |
7 | 3055 dp_left->db_index[line_count_left] |= DB_MARKED; |
3056 mch_memmove((char *)dp_left + dp_left->db_txt_start, | |
3057 line, (size_t)len); | |
3058 ++line_count_left; | |
3059 } | |
3060 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3061 if (db_idx < 0) // left block is new |
7 | 3062 { |
3063 lnum_left = lnum + 1; | |
3064 lnum_right = 0; | |
3065 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3066 else // right block is new |
7 | 3067 { |
3068 lnum_left = 0; | |
3069 if (in_left) | |
3070 lnum_right = lnum + 2; | |
3071 else | |
3072 lnum_right = lnum + 1; | |
3073 } | |
3074 dp_left->db_line_count = line_count_left; | |
3075 dp_right->db_line_count = line_count_right; | |
3076 | |
3077 /* | |
3078 * release the two data blocks | |
3079 * The new one (hp_new) already has a correct blocknumber. | |
3080 * The old one (hp, in ml_locked) gets a positive blocknumber if | |
3081 * we changed it and we are not editing a new file. | |
3082 */ | |
3083 if (lines_moved || in_left) | |
3084 buf->b_ml.ml_flags |= ML_LOCKED_DIRTY; | |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3085 if (!(flags & ML_APPEND_NEW) && db_idx >= 0 && in_left) |
7 | 3086 buf->b_ml.ml_flags |= ML_LOCKED_POS; |
3087 mf_put(mfp, hp_new, TRUE, FALSE); | |
3088 | |
3089 /* | |
3090 * flush the old data block | |
3091 * set ml_locked_lineadd to 0, because the updating of the | |
3092 * pointer blocks is done below | |
3093 */ | |
3094 lineadd = buf->b_ml.ml_locked_lineadd; | |
3095 buf->b_ml.ml_locked_lineadd = 0; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3096 ml_find_line(buf, (linenr_T)0, ML_FLUSH); // flush data block |
7 | 3097 |
3098 /* | |
3099 * update pointer blocks for the new data block | |
3100 */ | |
3101 for (stack_idx = buf->b_ml.ml_stack_top - 1; stack_idx >= 0; | |
3102 --stack_idx) | |
3103 { | |
3104 ip = &(buf->b_ml.ml_stack[stack_idx]); | |
3105 pb_idx = ip->ip_index; | |
3106 if ((hp = mf_get(mfp, ip->ip_bnum, 1)) == NULL) | |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
3107 goto theend; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3108 pp = (PTR_BL *)(hp->bh_data); // must be pointer block |
7 | 3109 if (pp->pb_id != PTR_ID) |
3110 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
3111 iemsg(_("E317: pointer block id wrong 3")); |
7 | 3112 mf_put(mfp, hp, FALSE, FALSE); |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
3113 goto theend; |
7 | 3114 } |
3115 /* | |
3116 * TODO: If the pointer block is full and we are adding at the end | |
3117 * try to insert in front of the next block | |
3118 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3119 // block not full, add one entry |
7 | 3120 if (pp->pb_count < pp->pb_count_max) |
3121 { | |
3122 if (pb_idx + 1 < (int)pp->pb_count) | |
3123 mch_memmove(&pp->pb_pointer[pb_idx + 2], | |
3124 &pp->pb_pointer[pb_idx + 1], | |
3125 (size_t)(pp->pb_count - pb_idx - 1) * sizeof(PTR_EN)); | |
3126 ++pp->pb_count; | |
3127 pp->pb_pointer[pb_idx].pe_line_count = line_count_left; | |
3128 pp->pb_pointer[pb_idx].pe_bnum = bnum_left; | |
3129 pp->pb_pointer[pb_idx].pe_page_count = page_count_left; | |
3130 pp->pb_pointer[pb_idx + 1].pe_line_count = line_count_right; | |
3131 pp->pb_pointer[pb_idx + 1].pe_bnum = bnum_right; | |
3132 pp->pb_pointer[pb_idx + 1].pe_page_count = page_count_right; | |
3133 | |
3134 if (lnum_left != 0) | |
3135 pp->pb_pointer[pb_idx].pe_old_lnum = lnum_left; | |
3136 if (lnum_right != 0) | |
3137 pp->pb_pointer[pb_idx + 1].pe_old_lnum = lnum_right; | |
3138 | |
3139 mf_put(mfp, hp, TRUE, FALSE); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3140 buf->b_ml.ml_stack_top = stack_idx + 1; // truncate stack |
7 | 3141 |
3142 if (lineadd) | |
3143 { | |
3144 --(buf->b_ml.ml_stack_top); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3145 // fix line count for rest of blocks in the stack |
7 | 3146 ml_lineadd(buf, lineadd); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3147 // fix stack itself |
7 | 3148 buf->b_ml.ml_stack[buf->b_ml.ml_stack_top].ip_high += |
3149 lineadd; | |
3150 ++(buf->b_ml.ml_stack_top); | |
3151 } | |
3152 | |
3153 /* | |
3154 * We are finished, break the loop here. | |
3155 */ | |
3156 break; | |
3157 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3158 else // pointer block full |
7 | 3159 { |
3160 /* | |
3161 * split the pointer block | |
3162 * allocate a new pointer block | |
3163 * move some of the pointer into the new block | |
3164 * prepare for updating the parent block | |
3165 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3166 for (;;) // do this twice when splitting block 1 |
7 | 3167 { |
3168 hp_new = ml_new_ptr(mfp); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3169 if (hp_new == NULL) // TODO: try to fix tree |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
3170 goto theend; |
7 | 3171 pp_new = (PTR_BL *)(hp_new->bh_data); |
3172 | |
3173 if (hp->bh_bnum != 1) | |
3174 break; | |
3175 | |
3176 /* | |
3177 * if block 1 becomes full the tree is given an extra level | |
3178 * The pointers from block 1 are moved into the new block. | |
3179 * block 1 is updated to point to the new block | |
3180 * then continue to split the new block | |
3181 */ | |
3182 mch_memmove(pp_new, pp, (size_t)page_size); | |
3183 pp->pb_count = 1; | |
3184 pp->pb_pointer[0].pe_bnum = hp_new->bh_bnum; | |
3185 pp->pb_pointer[0].pe_line_count = buf->b_ml.ml_line_count; | |
3186 pp->pb_pointer[0].pe_old_lnum = 1; | |
3187 pp->pb_pointer[0].pe_page_count = 1; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3188 mf_put(mfp, hp, TRUE, FALSE); // release block 1 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3189 hp = hp_new; // new block is to be split |
7 | 3190 pp = pp_new; |
3191 CHECK(stack_idx != 0, _("stack_idx should be 0")); | |
3192 ip->ip_index = 0; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3193 ++stack_idx; // do block 1 again later |
7 | 3194 } |
3195 /* | |
3196 * move the pointers after the current one to the new block | |
3197 * If there are none, the new entry will be in the new block. | |
3198 */ | |
3199 total_moved = pp->pb_count - pb_idx - 1; | |
3200 if (total_moved) | |
3201 { | |
3202 mch_memmove(&pp_new->pb_pointer[0], | |
3203 &pp->pb_pointer[pb_idx + 1], | |
3204 (size_t)(total_moved) * sizeof(PTR_EN)); | |
3205 pp_new->pb_count = total_moved; | |
3206 pp->pb_count -= total_moved - 1; | |
3207 pp->pb_pointer[pb_idx + 1].pe_bnum = bnum_right; | |
3208 pp->pb_pointer[pb_idx + 1].pe_line_count = line_count_right; | |
3209 pp->pb_pointer[pb_idx + 1].pe_page_count = page_count_right; | |
3210 if (lnum_right) | |
3211 pp->pb_pointer[pb_idx + 1].pe_old_lnum = lnum_right; | |
3212 } | |
3213 else | |
3214 { | |
3215 pp_new->pb_count = 1; | |
3216 pp_new->pb_pointer[0].pe_bnum = bnum_right; | |
3217 pp_new->pb_pointer[0].pe_line_count = line_count_right; | |
3218 pp_new->pb_pointer[0].pe_page_count = page_count_right; | |
3219 pp_new->pb_pointer[0].pe_old_lnum = lnum_right; | |
3220 } | |
3221 pp->pb_pointer[pb_idx].pe_bnum = bnum_left; | |
3222 pp->pb_pointer[pb_idx].pe_line_count = line_count_left; | |
3223 pp->pb_pointer[pb_idx].pe_page_count = page_count_left; | |
3224 if (lnum_left) | |
3225 pp->pb_pointer[pb_idx].pe_old_lnum = lnum_left; | |
3226 lnum_left = 0; | |
3227 lnum_right = 0; | |
3228 | |
3229 /* | |
3230 * recompute line counts | |
3231 */ | |
3232 line_count_right = 0; | |
3233 for (i = 0; i < (int)pp_new->pb_count; ++i) | |
3234 line_count_right += pp_new->pb_pointer[i].pe_line_count; | |
3235 line_count_left = 0; | |
3236 for (i = 0; i < (int)pp->pb_count; ++i) | |
3237 line_count_left += pp->pb_pointer[i].pe_line_count; | |
3238 | |
3239 bnum_left = hp->bh_bnum; | |
3240 bnum_right = hp_new->bh_bnum; | |
3241 page_count_left = 1; | |
3242 page_count_right = 1; | |
3243 mf_put(mfp, hp, TRUE, FALSE); | |
3244 mf_put(mfp, hp_new, TRUE, FALSE); | |
3245 } | |
3246 } | |
3247 | |
3248 /* | |
3249 * Safety check: fallen out of for loop? | |
3250 */ | |
3251 if (stack_idx < 0) | |
3252 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
3253 iemsg(_("E318: Updated too many blocks?")); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3254 buf->b_ml.ml_stack_top = 0; // invalidate stack |
7 | 3255 } |
3256 } | |
3257 | |
3258 #ifdef FEAT_BYTEOFF | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3259 // The line was inserted below 'lnum' |
7 | 3260 ml_updatechunk(buf, lnum + 1, (long)len, ML_CHNK_ADDLINE); |
3261 #endif | |
3262 #ifdef FEAT_NETBEANS_INTG | |
2210 | 3263 if (netbeans_active()) |
7 | 3264 { |
3265 if (STRLEN(line) > 0) | |
835 | 3266 netbeans_inserted(buf, lnum+1, (colnr_T)0, line, (int)STRLEN(line)); |
34 | 3267 netbeans_inserted(buf, lnum+1, (colnr_T)STRLEN(line), |
7 | 3268 (char_u *)"\n", 1); |
3269 } | |
3270 #endif | |
8493
caed4b2d305f
commit https://github.com/vim/vim/commit/509ce2a558e7e0c03242e32e844255af52f1c821
Christian Brabandt <cb@256bit.org>
parents:
8422
diff
changeset
|
3271 #ifdef FEAT_JOB_CHANNEL |
8422
5d2c84be23b5
commit https://github.com/vim/vim/commit/99ef06296f3c37490511c03786a2c8672e015c56
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
3272 if (buf->b_write_to_channel) |
5d2c84be23b5
commit https://github.com/vim/vim/commit/99ef06296f3c37490511c03786a2c8672e015c56
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
3273 channel_write_new_lines(buf); |
5d2c84be23b5
commit https://github.com/vim/vim/commit/99ef06296f3c37490511c03786a2c8672e015c56
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
3274 #endif |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
3275 ret = OK; |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
3276 |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
3277 theend: |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3278 #ifdef FEAT_PROP_POPUP |
15294
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
3279 vim_free(tofree); |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
3280 #endif |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
3281 return ret; |
7 | 3282 } |
3283 | |
3284 /* | |
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3285 * Flush any pending change and call ml_append_int() |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3286 */ |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3287 static int |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3288 ml_append_flush( |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3289 buf_T *buf, |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3290 linenr_T lnum, // append after this line (can be 0) |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3291 char_u *line, // text of the new line |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3292 colnr_T len, // length of line, including NUL, or 0 |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3293 int flags) // ML_APPEND_ flags |
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3294 { |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3295 if (lnum > buf->b_ml.ml_line_count) |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3296 return FAIL; // lnum out of range |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3297 |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3298 if (buf->b_ml.ml_line_lnum != 0) |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3299 // This may also invoke ml_append_int(). |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3300 ml_flush_line(buf); |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3301 |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3302 #ifdef FEAT_EVAL |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3303 // When inserting above recorded changes: flush the changes before changing |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3304 // the text. Then flush the cached line, it may become invalid. |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3305 may_invoke_listeners(buf, lnum + 1, lnum + 1, 1); |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3306 if (buf->b_ml.ml_line_lnum != 0) |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3307 ml_flush_line(buf); |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3308 #endif |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3309 |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3310 return ml_append_int(buf, lnum, line, len, flags); |
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3311 } |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3312 |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3313 /* |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3314 * Append a line after lnum (may be 0 to insert a line in front of the file). |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3315 * "line" does not need to be allocated, but can't be another line in a |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3316 * buffer, unlocking may make it invalid. |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3317 * |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3318 * "newfile": TRUE when starting to edit a new file, meaning that pe_old_lnum |
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3319 * will be set for recovery |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3320 * Check: The caller of this function should probably also call |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3321 * appended_lines(). |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3322 * |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3323 * return FAIL for failure, OK otherwise |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3324 */ |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3325 int |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3326 ml_append( |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3327 linenr_T lnum, // append after this line (can be 0) |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3328 char_u *line, // text of the new line |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3329 colnr_T len, // length of new line, including NUL, or 0 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3330 int newfile) // flag, see above |
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3331 { |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3332 return ml_append_flags(lnum, line, len, newfile ? ML_APPEND_NEW : 0); |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3333 } |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3334 |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3335 int |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3336 ml_append_flags( |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3337 linenr_T lnum, // append after this line (can be 0) |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3338 char_u *line, // text of the new line |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3339 colnr_T len, // length of new line, including NUL, or 0 |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3340 int flags) // ML_APPEND_ values |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3341 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3342 // When starting up, we might still need to create the memfile |
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3343 if (curbuf->b_ml.ml_mfp == NULL && open_buffer(FALSE, NULL, 0) == FAIL) |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3344 return FAIL; |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3345 return ml_append_flush(curbuf, lnum, line, len, flags); |
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3346 } |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3347 |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3348 |
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3349 #if defined(FEAT_SPELL) || defined(FEAT_QUICKFIX) || defined(PROTO) |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3350 /* |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3351 * Like ml_append() but for an arbitrary buffer. The buffer must already have |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3352 * a memline. |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3353 */ |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3354 int |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3355 ml_append_buf( |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3356 buf_T *buf, |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3357 linenr_T lnum, // append after this line (can be 0) |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3358 char_u *line, // text of the new line |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3359 colnr_T len, // length of new line, including NUL, or 0 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3360 int newfile) // flag, see above |
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3361 { |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3362 if (buf->b_ml.ml_mfp == NULL) |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3363 return FAIL; |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3364 return ml_append_flush(buf, lnum, line, len, newfile ? ML_APPEND_NEW : 0); |
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3365 } |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3366 #endif |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3367 |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3368 /* |
21337
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
3369 * Replace line "lnum", with buffering, in current buffer. |
7 | 3370 * |
720 | 3371 * If "copy" is TRUE, make a copy of the line, otherwise the line has been |
7 | 3372 * copied to allocated memory already. |
21337
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
3373 * If "copy" is FALSE the "line" may be freed to add text properties! |
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
3374 * Do not use it after calling ml_replace(). |
7 | 3375 * |
3376 * Check: The caller of this function should probably also call | |
3377 * changed_lines(), unless update_screen(NOT_VALID) is used. | |
3378 * | |
3379 * return FAIL for failure, OK otherwise | |
3380 */ | |
3381 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3382 ml_replace(linenr_T lnum, char_u *line, int copy) |
7 | 3383 { |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3384 colnr_T len = -1; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3385 |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3386 if (line != NULL) |
15182
4b2de998ebd6
patch 8.1.0601: a few compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
15142
diff
changeset
|
3387 len = (colnr_T)STRLEN(line); |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3388 return ml_replace_len(lnum, line, len, FALSE, copy); |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3389 } |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3390 |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3391 /* |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3392 * Replace a line for the current buffer. Like ml_replace() with: |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3393 * "len_arg" is the length of the text, excluding NUL. |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3394 * If "has_props" is TRUE then "line_arg" includes the text properties and |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3395 * "len_arg" includes the NUL of the text. |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3396 */ |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3397 int |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3398 ml_replace_len( |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3399 linenr_T lnum, |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3400 char_u *line_arg, |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3401 colnr_T len_arg, |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3402 int has_props, |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3403 int copy) |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3404 { |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3405 char_u *line = line_arg; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3406 colnr_T len = len_arg; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3407 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3408 if (line == NULL) // just checking... |
7 | 3409 return FAIL; |
3410 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3411 // When starting up, we might still need to create the memfile |
2394
a3aca345aafa
Add the 'undoreload' option to be able to undo a file reload.
Bram Moolenaar <bram@vim.org>
parents:
2360
diff
changeset
|
3412 if (curbuf->b_ml.ml_mfp == NULL && open_buffer(FALSE, NULL, 0) == FAIL) |
7 | 3413 return FAIL; |
3414 | |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3415 if (!has_props) |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3416 ++len; // include the NUL after the text |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3417 if (copy) |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3418 { |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3419 // copy the line to allocated memory |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3420 #ifdef FEAT_PROP_POPUP |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3421 if (has_props) |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3422 line = vim_memsave(line, len); |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3423 else |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3424 #endif |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3425 line = vim_strnsave(line, len - 1); |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3426 if (line == NULL) |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3427 return FAIL; |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3428 } |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3429 |
7 | 3430 #ifdef FEAT_NETBEANS_INTG |
2210 | 3431 if (netbeans_active()) |
7 | 3432 { |
3433 netbeans_removed(curbuf, lnum, 0, (long)STRLEN(ml_get(lnum))); | |
835 | 3434 netbeans_inserted(curbuf, lnum, 0, line, (int)STRLEN(line)); |
7 | 3435 } |
3436 #endif | |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3437 if (curbuf->b_ml.ml_line_lnum != lnum) |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3438 { |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3439 // another line is buffered, flush it |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3440 ml_flush_line(curbuf); |
15142
7713ceb8c593
patch 8.1.0581: double free without the text properties feature
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
3441 curbuf->b_ml.ml_flags &= ~ML_LINE_DIRTY; |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3442 |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3443 #ifdef FEAT_PROP_POPUP |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3444 if (curbuf->b_has_textprop && !has_props) |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3445 // Need to fetch the old line to copy over any text properties. |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3446 ml_get_buf(curbuf, lnum, TRUE); |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3447 #endif |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3448 } |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3449 |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3450 #ifdef FEAT_PROP_POPUP |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3451 if (curbuf->b_has_textprop && !has_props) |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3452 { |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3453 size_t oldtextlen = STRLEN(curbuf->b_ml.ml_line_ptr) + 1; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3454 |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3455 if (oldtextlen < (size_t)curbuf->b_ml.ml_line_len) |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3456 { |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3457 char_u *newline; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3458 size_t textproplen = curbuf->b_ml.ml_line_len - oldtextlen; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3459 |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3460 // Need to copy over text properties, stored after the text. |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3461 newline = alloc(len + (int)textproplen); |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3462 if (newline != NULL) |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3463 { |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3464 mch_memmove(newline, line, len); |
16684
1c2d9f67d98f
patch 8.1.1344: Coverity complains about possibly using a NULL pointer
Bram Moolenaar <Bram@vim.org>
parents:
16666
diff
changeset
|
3465 mch_memmove(newline + len, curbuf->b_ml.ml_line_ptr |
1c2d9f67d98f
patch 8.1.1344: Coverity complains about possibly using a NULL pointer
Bram Moolenaar <Bram@vim.org>
parents:
16666
diff
changeset
|
3466 + oldtextlen, textproplen); |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3467 vim_free(line); |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3468 line = newline; |
15182
4b2de998ebd6
patch 8.1.0601: a few compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
15142
diff
changeset
|
3469 len += (colnr_T)textproplen; |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3470 } |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3471 } |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3472 } |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3473 #endif |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3474 |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3475 if (curbuf->b_ml.ml_flags & ML_LINE_DIRTY) // same line allocated |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3476 vim_free(curbuf->b_ml.ml_line_ptr); // free it |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3477 |
7 | 3478 curbuf->b_ml.ml_line_ptr = line; |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3479 curbuf->b_ml.ml_line_len = len; |
7 | 3480 curbuf->b_ml.ml_line_lnum = lnum; |
3481 curbuf->b_ml.ml_flags = (curbuf->b_ml.ml_flags | ML_LINE_DIRTY) & ~ML_EMPTY; | |
3482 | |
3483 return OK; | |
3484 } | |
3485 | |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3486 #ifdef FEAT_PROP_POPUP |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3487 /* |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3488 * Adjust text properties in line "lnum" for a deleted line. |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3489 * When "above" is true this is the line above the deleted line. |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3490 * "del_props" are the properties of the deleted line. |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3491 */ |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3492 static void |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3493 adjust_text_props_for_delete( |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3494 buf_T *buf, |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3495 linenr_T lnum, |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3496 char_u *del_props, |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3497 int del_props_len, |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3498 int above) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3499 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3500 int did_get_line = FALSE; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3501 int done_del; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3502 int done_this; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3503 textprop_T prop_del; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3504 bhdr_T *hp; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3505 DATA_BL *dp; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3506 int idx; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3507 int line_start; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3508 long line_size; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3509 int this_props_len; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3510 char_u *text; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3511 size_t textlen; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3512 int found; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3513 |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3514 for (done_del = 0; done_del < del_props_len; done_del += sizeof(textprop_T)) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3515 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3516 mch_memmove(&prop_del, del_props + done_del, sizeof(textprop_T)); |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3517 if ((above && (prop_del.tp_flags & TP_FLAG_CONT_PREV) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3518 && !(prop_del.tp_flags & TP_FLAG_CONT_NEXT)) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3519 || (!above && (prop_del.tp_flags & TP_FLAG_CONT_NEXT) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3520 && !(prop_del.tp_flags & TP_FLAG_CONT_PREV))) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3521 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3522 if (!did_get_line) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3523 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3524 did_get_line = TRUE; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3525 if ((hp = ml_find_line(buf, lnum, ML_FIND)) == NULL) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3526 return; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3527 |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3528 dp = (DATA_BL *)(hp->bh_data); |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3529 idx = lnum - buf->b_ml.ml_locked_low; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3530 line_start = ((dp->db_index[idx]) & DB_INDEX_MASK); |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3531 if (idx == 0) // first line in block, text at the end |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3532 line_size = dp->db_txt_end - line_start; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3533 else |
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3534 line_size = ((dp->db_index[idx - 1]) & DB_INDEX_MASK) |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3535 - line_start; |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3536 text = (char_u *)dp + line_start; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3537 textlen = STRLEN(text) + 1; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3538 if ((long)textlen >= line_size) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3539 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3540 if (above) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3541 internal_error("no text property above deleted line"); |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3542 else |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3543 internal_error("no text property below deleted line"); |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3544 return; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3545 } |
15353
21580db06cf3
patch 8.1.0684: warnings from 64-bit compiler
Bram Moolenaar <Bram@vim.org>
parents:
15294
diff
changeset
|
3546 this_props_len = line_size - (int)textlen; |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3547 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3548 |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3549 found = FALSE; |
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3550 for (done_this = 0; done_this < this_props_len; |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3551 done_this += sizeof(textprop_T)) |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3552 { |
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3553 int flag = above ? TP_FLAG_CONT_NEXT |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3554 : TP_FLAG_CONT_PREV; |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3555 textprop_T prop_this; |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3556 |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3557 mch_memmove(&prop_this, text + textlen + done_del, |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3558 sizeof(textprop_T)); |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3559 if ((prop_this.tp_flags & flag) |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3560 && prop_del.tp_id == prop_this.tp_id |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3561 && prop_del.tp_type == prop_this.tp_type) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3562 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3563 found = TRUE; |
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3564 prop_this.tp_flags &= ~flag; |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3565 mch_memmove(text + textlen + done_del, &prop_this, |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3566 sizeof(textprop_T)); |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3567 break; |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3568 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3569 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3570 if (!found) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3571 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3572 if (above) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3573 internal_error("text property above deleted line not found"); |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3574 else |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3575 internal_error("text property below deleted line not found"); |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3576 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3577 |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3578 buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS); |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3579 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3580 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3581 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3582 #endif |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3583 |
7 | 3584 /* |
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
3585 * Delete line "lnum" in the current buffer. |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3586 * When "flags" has ML_DEL_MESSAGE may give a "No lines in buffer" message. |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3587 * When "flags" has ML_DEL_UNDO this is called from undo. |
7 | 3588 * |
3589 * return FAIL for failure, OK otherwise | |
3590 */ | |
3591 static int | |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3592 ml_delete_int(buf_T *buf, linenr_T lnum, int flags) |
7 | 3593 { |
3594 bhdr_T *hp; | |
3595 memfile_T *mfp; | |
3596 DATA_BL *dp; | |
3597 PTR_BL *pp; | |
3598 infoptr_T *ip; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3599 int count; // number of entries in block |
7 | 3600 int idx; |
3601 int stack_idx; | |
3602 int text_start; | |
3603 int line_start; | |
3604 long line_size; | |
3605 int i; | |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3606 int ret = FAIL; |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3607 #ifdef FEAT_PROP_POPUP |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3608 char_u *textprop_save = NULL; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3609 int textprop_save_len; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3610 #endif |
7 | 3611 |
3612 if (lowest_marked && lowest_marked > lnum) | |
3613 lowest_marked--; | |
3614 | |
3615 /* | |
3616 * If the file becomes empty the last line is replaced by an empty line. | |
3617 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3618 if (buf->b_ml.ml_line_count == 1) // file becomes empty |
7 | 3619 { |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3620 if ((flags & ML_DEL_MESSAGE) |
7 | 3621 #ifdef FEAT_NETBEANS_INTG |
3622 && !netbeansSuppressNoLines | |
3623 #endif | |
3624 ) | |
680 | 3625 set_keep_msg((char_u *)_(no_lines_msg), 0); |
3626 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3627 // FEAT_BYTEOFF already handled in there, don't worry 'bout it below |
7 | 3628 i = ml_replace((linenr_T)1, (char_u *)"", TRUE); |
3629 buf->b_ml.ml_flags |= ML_EMPTY; | |
3630 | |
3631 return i; | |
3632 } | |
3633 | |
3634 /* | |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3635 * Find the data block containing the line. |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3636 * This also fills the stack with the blocks from the root to the data block. |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3637 * This also releases any locked block.. |
7 | 3638 */ |
3639 mfp = buf->b_ml.ml_mfp; | |
3640 if (mfp == NULL) | |
3641 return FAIL; | |
3642 | |
3643 if ((hp = ml_find_line(buf, lnum, ML_DELETE)) == NULL) | |
3644 return FAIL; | |
3645 | |
3646 dp = (DATA_BL *)(hp->bh_data); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3647 // compute line count before the delete |
7 | 3648 count = (long)(buf->b_ml.ml_locked_high) |
3649 - (long)(buf->b_ml.ml_locked_low) + 2; | |
3650 idx = lnum - buf->b_ml.ml_locked_low; | |
3651 | |
3652 --buf->b_ml.ml_line_count; | |
3653 | |
3654 line_start = ((dp->db_index[idx]) & DB_INDEX_MASK); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3655 if (idx == 0) // first line in block, text at the end |
7 | 3656 line_size = dp->db_txt_end - line_start; |
3657 else | |
3658 line_size = ((dp->db_index[idx - 1]) & DB_INDEX_MASK) - line_start; | |
3659 | |
3660 #ifdef FEAT_NETBEANS_INTG | |
2210 | 3661 if (netbeans_active()) |
34 | 3662 netbeans_removed(buf, lnum, 0, (long)line_size); |
7 | 3663 #endif |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3664 #ifdef FEAT_PROP_POPUP |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3665 // If there are text properties, make a copy, so that we can update |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3666 // properties in preceding and following lines. |
25050
7ef7a211f6bf
patch 8.2.3062: internal error when adding several text properties
Bram Moolenaar <Bram@vim.org>
parents:
24990
diff
changeset
|
3667 if (buf->b_has_textprop && !(flags & (ML_DEL_UNDO | ML_DEL_NOPROP))) |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3668 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3669 size_t textlen = STRLEN((char_u *)dp + line_start) + 1; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3670 |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3671 if ((long)textlen < line_size) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3672 { |
15353
21580db06cf3
patch 8.1.0684: warnings from 64-bit compiler
Bram Moolenaar <Bram@vim.org>
parents:
15294
diff
changeset
|
3673 textprop_save_len = line_size - (int)textlen; |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3674 textprop_save = vim_memsave((char_u *)dp + line_start + textlen, |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3675 textprop_save_len); |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3676 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3677 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3678 #endif |
7 | 3679 |
3680 /* | |
3681 * special case: If there is only one line in the data block it becomes empty. | |
3682 * Then we have to remove the entry, pointing to this data block, from the | |
3683 * pointer block. If this pointer block also becomes empty, we go up another | |
3684 * block, and so on, up to the root if necessary. | |
3685 * The line counts in the pointer blocks have already been adjusted by | |
3686 * ml_find_line(). | |
3687 */ | |
3688 if (count == 1) | |
3689 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3690 mf_free(mfp, hp); // free the data block |
7 | 3691 buf->b_ml.ml_locked = NULL; |
3692 | |
2823 | 3693 for (stack_idx = buf->b_ml.ml_stack_top - 1; stack_idx >= 0; |
3694 --stack_idx) | |
7 | 3695 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3696 buf->b_ml.ml_stack_top = 0; // stack is invalid when failing |
7 | 3697 ip = &(buf->b_ml.ml_stack[stack_idx]); |
3698 idx = ip->ip_index; | |
3699 if ((hp = mf_get(mfp, ip->ip_bnum, 1)) == NULL) | |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3700 goto theend; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3701 pp = (PTR_BL *)(hp->bh_data); // must be pointer block |
7 | 3702 if (pp->pb_id != PTR_ID) |
3703 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
3704 iemsg(_("E317: pointer block id wrong 4")); |
7 | 3705 mf_put(mfp, hp, FALSE, FALSE); |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3706 goto theend; |
7 | 3707 } |
3708 count = --(pp->pb_count); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3709 if (count == 0) // the pointer block becomes empty! |
7 | 3710 mf_free(mfp, hp); |
3711 else | |
3712 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3713 if (count != idx) // move entries after the deleted one |
7 | 3714 mch_memmove(&pp->pb_pointer[idx], &pp->pb_pointer[idx + 1], |
3715 (size_t)(count - idx) * sizeof(PTR_EN)); | |
3716 mf_put(mfp, hp, TRUE, FALSE); | |
3717 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3718 buf->b_ml.ml_stack_top = stack_idx; // truncate stack |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3719 // fix line count for rest of blocks in the stack |
1167 | 3720 if (buf->b_ml.ml_locked_lineadd != 0) |
7 | 3721 { |
3722 ml_lineadd(buf, buf->b_ml.ml_locked_lineadd); | |
3723 buf->b_ml.ml_stack[buf->b_ml.ml_stack_top].ip_high += | |
1167 | 3724 buf->b_ml.ml_locked_lineadd; |
7 | 3725 } |
3726 ++(buf->b_ml.ml_stack_top); | |
3727 | |
3728 break; | |
3729 } | |
3730 } | |
3731 CHECK(stack_idx < 0, _("deleted block 1?")); | |
3732 } | |
3733 else | |
3734 { | |
3735 /* | |
3736 * delete the text by moving the next lines forwards | |
3737 */ | |
3738 text_start = dp->db_txt_start; | |
3739 mch_memmove((char *)dp + text_start + line_size, | |
3740 (char *)dp + text_start, (size_t)(line_start - text_start)); | |
3741 | |
3742 /* | |
3743 * delete the index by moving the next indexes backwards | |
3744 * Adjust the indexes for the text movement. | |
3745 */ | |
3746 for (i = idx; i < count - 1; ++i) | |
3747 dp->db_index[i] = dp->db_index[i + 1] + line_size; | |
3748 | |
3749 dp->db_free += line_size + INDEX_SIZE; | |
3750 dp->db_txt_start += line_size; | |
3751 --(dp->db_line_count); | |
3752 | |
3753 /* | |
3754 * mark the block dirty and make sure it is in the file (for recovery) | |
3755 */ | |
3756 buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS); | |
3757 } | |
3758 | |
3759 #ifdef FEAT_BYTEOFF | |
3760 ml_updatechunk(buf, lnum, line_size, ML_CHNK_DELLINE); | |
3761 #endif | |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3762 ret = OK; |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3763 |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3764 theend: |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3765 #ifdef FEAT_PROP_POPUP |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3766 if (textprop_save != NULL) |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3767 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3768 // Adjust text properties in the line above and below. |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3769 if (lnum > 1) |
25050
7ef7a211f6bf
patch 8.2.3062: internal error when adding several text properties
Bram Moolenaar <Bram@vim.org>
parents:
24990
diff
changeset
|
3770 adjust_text_props_for_delete(buf, lnum - 1, textprop_save, |
7ef7a211f6bf
patch 8.2.3062: internal error when adding several text properties
Bram Moolenaar <Bram@vim.org>
parents:
24990
diff
changeset
|
3771 textprop_save_len, TRUE); |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3772 if (lnum <= buf->b_ml.ml_line_count) |
25050
7ef7a211f6bf
patch 8.2.3062: internal error when adding several text properties
Bram Moolenaar <Bram@vim.org>
parents:
24990
diff
changeset
|
3773 adjust_text_props_for_delete(buf, lnum, textprop_save, |
7ef7a211f6bf
patch 8.2.3062: internal error when adding several text properties
Bram Moolenaar <Bram@vim.org>
parents:
24990
diff
changeset
|
3774 textprop_save_len, FALSE); |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3775 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3776 vim_free(textprop_save); |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3777 #endif |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3778 return ret; |
7 | 3779 } |
3780 | |
3781 /* | |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3782 * Delete line "lnum" in the current buffer. |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3783 * When "message" is TRUE may give a "No lines in buffer" message. |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3784 * |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3785 * Check: The caller of this function should probably also call |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3786 * deleted_lines() after this. |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3787 * |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3788 * return FAIL for failure, OK otherwise |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3789 */ |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3790 int |
20599
d571231175b4
patch 8.2.0853: ml_delete() often called with FALSE argument
Bram Moolenaar <Bram@vim.org>
parents:
20583
diff
changeset
|
3791 ml_delete(linenr_T lnum) |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3792 { |
20599
d571231175b4
patch 8.2.0853: ml_delete() often called with FALSE argument
Bram Moolenaar <Bram@vim.org>
parents:
20583
diff
changeset
|
3793 return ml_delete_flags(lnum, 0); |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3794 } |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3795 |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3796 /* |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3797 * Like ml_delete() but using flags (see ml_delete_int()). |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3798 */ |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3799 int |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3800 ml_delete_flags(linenr_T lnum, int flags) |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3801 { |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3802 ml_flush_line(curbuf); |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3803 if (lnum < 1 || lnum > curbuf->b_ml.ml_line_count) |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3804 return FAIL; |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3805 |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3806 #ifdef FEAT_EVAL |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3807 // When inserting above recorded changes: flush the changes before changing |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3808 // the text. |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3809 may_invoke_listeners(curbuf, lnum, lnum + 1, -1); |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3810 #endif |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3811 |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3812 return ml_delete_int(curbuf, lnum, flags); |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3813 } |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3814 |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3815 /* |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3816 * set the DB_MARKED flag for line 'lnum' |
7 | 3817 */ |
3818 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3819 ml_setmarked(linenr_T lnum) |
7 | 3820 { |
3821 bhdr_T *hp; | |
3822 DATA_BL *dp; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3823 // invalid line number |
7 | 3824 if (lnum < 1 || lnum > curbuf->b_ml.ml_line_count |
3825 || curbuf->b_ml.ml_mfp == NULL) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3826 return; // give error message? |
7 | 3827 |
3828 if (lowest_marked == 0 || lowest_marked > lnum) | |
3829 lowest_marked = lnum; | |
3830 | |
3831 /* | |
3832 * find the data block containing the line | |
3833 * This also fills the stack with the blocks from the root to the data block | |
3834 * This also releases any locked block. | |
3835 */ | |
3836 if ((hp = ml_find_line(curbuf, lnum, ML_FIND)) == NULL) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3837 return; // give error message? |
7 | 3838 |
3839 dp = (DATA_BL *)(hp->bh_data); | |
3840 dp->db_index[lnum - curbuf->b_ml.ml_locked_low] |= DB_MARKED; | |
3841 curbuf->b_ml.ml_flags |= ML_LOCKED_DIRTY; | |
3842 } | |
3843 | |
3844 /* | |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3845 * find the first line with its DB_MARKED flag set |
7 | 3846 */ |
3847 linenr_T | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3848 ml_firstmarked(void) |
7 | 3849 { |
3850 bhdr_T *hp; | |
3851 DATA_BL *dp; | |
3852 linenr_T lnum; | |
3853 int i; | |
3854 | |
3855 if (curbuf->b_ml.ml_mfp == NULL) | |
3856 return (linenr_T) 0; | |
3857 | |
3858 /* | |
3859 * The search starts with lowest_marked line. This is the last line where | |
3860 * a mark was found, adjusted by inserting/deleting lines. | |
3861 */ | |
3862 for (lnum = lowest_marked; lnum <= curbuf->b_ml.ml_line_count; ) | |
3863 { | |
3864 /* | |
3865 * Find the data block containing the line. | |
3866 * This also fills the stack with the blocks from the root to the data | |
3867 * block This also releases any locked block. | |
3868 */ | |
3869 if ((hp = ml_find_line(curbuf, lnum, ML_FIND)) == NULL) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3870 return (linenr_T)0; // give error message? |
7 | 3871 |
3872 dp = (DATA_BL *)(hp->bh_data); | |
3873 | |
3874 for (i = lnum - curbuf->b_ml.ml_locked_low; | |
3875 lnum <= curbuf->b_ml.ml_locked_high; ++i, ++lnum) | |
3876 if ((dp->db_index[i]) & DB_MARKED) | |
3877 { | |
3878 (dp->db_index[i]) &= DB_INDEX_MASK; | |
3879 curbuf->b_ml.ml_flags |= ML_LOCKED_DIRTY; | |
3880 lowest_marked = lnum + 1; | |
3881 return lnum; | |
3882 } | |
3883 } | |
3884 | |
3885 return (linenr_T) 0; | |
3886 } | |
3887 | |
3888 /* | |
3889 * clear all DB_MARKED flags | |
3890 */ | |
3891 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3892 ml_clearmarked(void) |
7 | 3893 { |
3894 bhdr_T *hp; | |
3895 DATA_BL *dp; | |
3896 linenr_T lnum; | |
3897 int i; | |
3898 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3899 if (curbuf->b_ml.ml_mfp == NULL) // nothing to do |
7 | 3900 return; |
3901 | |
3902 /* | |
3903 * The search starts with line lowest_marked. | |
3904 */ | |
3905 for (lnum = lowest_marked; lnum <= curbuf->b_ml.ml_line_count; ) | |
3906 { | |
3907 /* | |
3908 * Find the data block containing the line. | |
3909 * This also fills the stack with the blocks from the root to the data | |
3910 * block and releases any locked block. | |
3911 */ | |
3912 if ((hp = ml_find_line(curbuf, lnum, ML_FIND)) == NULL) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3913 return; // give error message? |
7 | 3914 |
3915 dp = (DATA_BL *)(hp->bh_data); | |
3916 | |
3917 for (i = lnum - curbuf->b_ml.ml_locked_low; | |
3918 lnum <= curbuf->b_ml.ml_locked_high; ++i, ++lnum) | |
3919 if ((dp->db_index[i]) & DB_MARKED) | |
3920 { | |
3921 (dp->db_index[i]) &= DB_INDEX_MASK; | |
3922 curbuf->b_ml.ml_flags |= ML_LOCKED_DIRTY; | |
3923 } | |
3924 } | |
3925 | |
3926 lowest_marked = 0; | |
3927 return; | |
3928 } | |
3929 | |
3930 /* | |
3931 * flush ml_line if necessary | |
3932 */ | |
3933 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3934 ml_flush_line(buf_T *buf) |
7 | 3935 { |
3936 bhdr_T *hp; | |
3937 DATA_BL *dp; | |
3938 linenr_T lnum; | |
3939 char_u *new_line; | |
3940 char_u *old_line; | |
3941 colnr_T new_len; | |
3942 int old_len; | |
3943 int extra; | |
3944 int idx; | |
3945 int start; | |
3946 int count; | |
3947 int i; | |
2075
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
3948 static int entered = FALSE; |
7 | 3949 |
3950 if (buf->b_ml.ml_line_lnum == 0 || buf->b_ml.ml_mfp == NULL) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3951 return; // nothing to do |
7 | 3952 |
3953 if (buf->b_ml.ml_flags & ML_LINE_DIRTY) | |
3954 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3955 // This code doesn't work recursively, but Netbeans may call back here |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3956 // when obtaining the cursor position. |
2075
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
3957 if (entered) |
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
3958 return; |
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
3959 entered = TRUE; |
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
3960 |
7 | 3961 lnum = buf->b_ml.ml_line_lnum; |
3962 new_line = buf->b_ml.ml_line_ptr; | |
3963 | |
3964 hp = ml_find_line(buf, lnum, ML_FIND); | |
3965 if (hp == NULL) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
3966 siemsg(_("E320: Cannot find line %ld"), lnum); |
7 | 3967 else |
3968 { | |
3969 dp = (DATA_BL *)(hp->bh_data); | |
3970 idx = lnum - buf->b_ml.ml_locked_low; | |
3971 start = ((dp->db_index[idx]) & DB_INDEX_MASK); | |
3972 old_line = (char_u *)dp + start; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3973 if (idx == 0) // line is last in block |
7 | 3974 old_len = dp->db_txt_end - start; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3975 else // text of previous line follows |
7 | 3976 old_len = (dp->db_index[idx - 1] & DB_INDEX_MASK) - start; |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3977 new_len = buf->b_ml.ml_line_len; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3978 extra = new_len - old_len; // negative if lines gets smaller |
7 | 3979 |
3980 /* | |
3981 * if new line fits in data block, replace directly | |
3982 */ | |
3983 if ((int)dp->db_free >= extra) | |
3984 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3985 // if the length changes and there are following lines |
7 | 3986 count = buf->b_ml.ml_locked_high - buf->b_ml.ml_locked_low + 1; |
3987 if (extra != 0 && idx < count - 1) | |
3988 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3989 // move text of following lines |
7 | 3990 mch_memmove((char *)dp + dp->db_txt_start - extra, |
3991 (char *)dp + dp->db_txt_start, | |
3992 (size_t)(start - dp->db_txt_start)); | |
3993 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3994 // adjust pointers of this and following lines |
7 | 3995 for (i = idx + 1; i < count; ++i) |
3996 dp->db_index[i] -= extra; | |
3997 } | |
3998 dp->db_index[idx] -= extra; | |
3999 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4000 // adjust free space |
7 | 4001 dp->db_free -= extra; |
4002 dp->db_txt_start -= extra; | |
4003 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4004 // copy new line into the data block |
7 | 4005 mch_memmove(old_line - extra, new_line, (size_t)new_len); |
4006 buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS); | |
4007 #ifdef FEAT_BYTEOFF | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4008 // The else case is already covered by the insert and delete |
7 | 4009 ml_updatechunk(buf, lnum, (long)extra, ML_CHNK_UPDLINE); |
4010 #endif | |
4011 } | |
4012 else | |
4013 { | |
4014 /* | |
4015 * Cannot do it in one data block: Delete and append. | |
4016 * Append first, because ml_delete_int() cannot delete the | |
4017 * last line in a buffer, which causes trouble for a buffer | |
4018 * that has only one line. | |
4019 * Don't forget to copy the mark! | |
4020 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4021 // How about handling errors??? |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
4022 (void)ml_append_int(buf, lnum, new_line, new_len, |
24703
4bc0bda6857d
patch 8.2.2890: text property duplicated when data block splits
Bram Moolenaar <Bram@vim.org>
parents:
24093
diff
changeset
|
4023 ((dp->db_index[idx] & DB_MARKED) ? ML_APPEND_MARK : 0) |
4bc0bda6857d
patch 8.2.2890: text property duplicated when data block splits
Bram Moolenaar <Bram@vim.org>
parents:
24093
diff
changeset
|
4024 #ifdef FEAT_PROP_POPUP |
4bc0bda6857d
patch 8.2.2890: text property duplicated when data block splits
Bram Moolenaar <Bram@vim.org>
parents:
24093
diff
changeset
|
4025 | ML_APPEND_NOPROP |
4bc0bda6857d
patch 8.2.2890: text property duplicated when data block splits
Bram Moolenaar <Bram@vim.org>
parents:
24093
diff
changeset
|
4026 #endif |
4bc0bda6857d
patch 8.2.2890: text property duplicated when data block splits
Bram Moolenaar <Bram@vim.org>
parents:
24093
diff
changeset
|
4027 ); |
25050
7ef7a211f6bf
patch 8.2.3062: internal error when adding several text properties
Bram Moolenaar <Bram@vim.org>
parents:
24990
diff
changeset
|
4028 (void)ml_delete_int(buf, lnum, ML_DEL_NOPROP); |
7 | 4029 } |
4030 } | |
4031 vim_free(new_line); | |
2075
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4032 |
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4033 entered = FALSE; |
7 | 4034 } |
4035 | |
4036 buf->b_ml.ml_line_lnum = 0; | |
4037 } | |
4038 | |
4039 /* | |
4040 * create a new, empty, data block | |
4041 */ | |
4042 static bhdr_T * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4043 ml_new_data(memfile_T *mfp, int negative, int page_count) |
7 | 4044 { |
4045 bhdr_T *hp; | |
4046 DATA_BL *dp; | |
4047 | |
4048 if ((hp = mf_new(mfp, negative, page_count)) == NULL) | |
4049 return NULL; | |
4050 | |
4051 dp = (DATA_BL *)(hp->bh_data); | |
4052 dp->db_id = DATA_ID; | |
4053 dp->db_txt_start = dp->db_txt_end = page_count * mfp->mf_page_size; | |
4054 dp->db_free = dp->db_txt_start - HEADER_SIZE; | |
4055 dp->db_line_count = 0; | |
4056 | |
4057 return hp; | |
4058 } | |
4059 | |
4060 /* | |
4061 * create a new, empty, pointer block | |
4062 */ | |
4063 static bhdr_T * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4064 ml_new_ptr(memfile_T *mfp) |
7 | 4065 { |
4066 bhdr_T *hp; | |
4067 PTR_BL *pp; | |
4068 | |
4069 if ((hp = mf_new(mfp, FALSE, 1)) == NULL) | |
4070 return NULL; | |
4071 | |
4072 pp = (PTR_BL *)(hp->bh_data); | |
4073 pp->pb_id = PTR_ID; | |
4074 pp->pb_count = 0; | |
2240
6b4879aea261
Add test for gettabvar() and settabvar().
Bram Moolenaar <bram@vim.org>
parents:
2221
diff
changeset
|
4075 pp->pb_count_max = (short_u)((mfp->mf_page_size - sizeof(PTR_BL)) |
6b4879aea261
Add test for gettabvar() and settabvar().
Bram Moolenaar <bram@vim.org>
parents:
2221
diff
changeset
|
4076 / sizeof(PTR_EN) + 1); |
7 | 4077 |
4078 return hp; | |
4079 } | |
4080 | |
4081 /* | |
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
4082 * Lookup line 'lnum' in a memline. |
7 | 4083 * |
4084 * action: if ML_DELETE or ML_INSERT the line count is updated while searching | |
4085 * if ML_FLUSH only flush a locked block | |
4086 * if ML_FIND just find the line | |
4087 * | |
4088 * If the block was found it is locked and put in ml_locked. | |
4089 * The stack is updated to lead to the locked block. The ip_high field in | |
4090 * the stack is updated to reflect the last line in the block AFTER the | |
4091 * insert or delete, also if the pointer block has not been updated yet. But | |
1167 | 4092 * if ml_locked != NULL ml_locked_lineadd must be added to ip_high. |
7 | 4093 * |
4094 * return: NULL for failure, pointer to block header otherwise | |
4095 */ | |
4096 static bhdr_T * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4097 ml_find_line(buf_T *buf, linenr_T lnum, int action) |
7 | 4098 { |
4099 DATA_BL *dp; | |
4100 PTR_BL *pp; | |
4101 infoptr_T *ip; | |
4102 bhdr_T *hp; | |
4103 memfile_T *mfp; | |
4104 linenr_T t; | |
4105 blocknr_T bnum, bnum2; | |
4106 int dirty; | |
4107 linenr_T low, high; | |
4108 int top; | |
4109 int page_count; | |
4110 int idx; | |
4111 | |
4112 mfp = buf->b_ml.ml_mfp; | |
4113 | |
4114 /* | |
4115 * If there is a locked block check if the wanted line is in it. | |
4116 * If not, flush and release the locked block. | |
4117 * Don't do this for ML_INSERT_SAME, because the stack need to be updated. | |
4118 * Don't do this for ML_FLUSH, because we want to flush the locked block. | |
1066 | 4119 * Don't do this when 'swapfile' is reset, we want to load all the blocks. |
7 | 4120 */ |
4121 if (buf->b_ml.ml_locked) | |
4122 { | |
1066 | 4123 if (ML_SIMPLE(action) |
4124 && buf->b_ml.ml_locked_low <= lnum | |
4125 && buf->b_ml.ml_locked_high >= lnum | |
4126 && !mf_dont_release) | |
7 | 4127 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4128 // remember to update pointer blocks and stack later |
7 | 4129 if (action == ML_INSERT) |
4130 { | |
4131 ++(buf->b_ml.ml_locked_lineadd); | |
4132 ++(buf->b_ml.ml_locked_high); | |
4133 } | |
4134 else if (action == ML_DELETE) | |
4135 { | |
4136 --(buf->b_ml.ml_locked_lineadd); | |
4137 --(buf->b_ml.ml_locked_high); | |
4138 } | |
4139 return (buf->b_ml.ml_locked); | |
4140 } | |
4141 | |
4142 mf_put(mfp, buf->b_ml.ml_locked, buf->b_ml.ml_flags & ML_LOCKED_DIRTY, | |
4143 buf->b_ml.ml_flags & ML_LOCKED_POS); | |
4144 buf->b_ml.ml_locked = NULL; | |
4145 | |
1167 | 4146 /* |
4147 * If lines have been added or deleted in the locked block, need to | |
4148 * update the line count in pointer blocks. | |
4149 */ | |
4150 if (buf->b_ml.ml_locked_lineadd != 0) | |
7 | 4151 ml_lineadd(buf, buf->b_ml.ml_locked_lineadd); |
4152 } | |
4153 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4154 if (action == ML_FLUSH) // nothing else to do |
7 | 4155 return NULL; |
4156 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4157 bnum = 1; // start at the root of the tree |
7 | 4158 page_count = 1; |
4159 low = 1; | |
4160 high = buf->b_ml.ml_line_count; | |
4161 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4162 if (action == ML_FIND) // first try stack entries |
7 | 4163 { |
4164 for (top = buf->b_ml.ml_stack_top - 1; top >= 0; --top) | |
4165 { | |
4166 ip = &(buf->b_ml.ml_stack[top]); | |
4167 if (ip->ip_low <= lnum && ip->ip_high >= lnum) | |
4168 { | |
4169 bnum = ip->ip_bnum; | |
4170 low = ip->ip_low; | |
4171 high = ip->ip_high; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4172 buf->b_ml.ml_stack_top = top; // truncate stack at prev entry |
7 | 4173 break; |
4174 } | |
4175 } | |
4176 if (top < 0) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4177 buf->b_ml.ml_stack_top = 0; // not found, start at the root |
7 | 4178 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4179 else // ML_DELETE or ML_INSERT |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4180 buf->b_ml.ml_stack_top = 0; // start at the root |
7 | 4181 |
4182 /* | |
4183 * search downwards in the tree until a data block is found | |
4184 */ | |
4185 for (;;) | |
4186 { | |
4187 if ((hp = mf_get(mfp, bnum, page_count)) == NULL) | |
4188 goto error_noblock; | |
4189 | |
4190 /* | |
4191 * update high for insert/delete | |
4192 */ | |
4193 if (action == ML_INSERT) | |
4194 ++high; | |
4195 else if (action == ML_DELETE) | |
4196 --high; | |
4197 | |
4198 dp = (DATA_BL *)(hp->bh_data); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4199 if (dp->db_id == DATA_ID) // data block |
7 | 4200 { |
4201 buf->b_ml.ml_locked = hp; | |
4202 buf->b_ml.ml_locked_low = low; | |
4203 buf->b_ml.ml_locked_high = high; | |
4204 buf->b_ml.ml_locked_lineadd = 0; | |
4205 buf->b_ml.ml_flags &= ~(ML_LOCKED_DIRTY | ML_LOCKED_POS); | |
4206 return hp; | |
4207 } | |
4208 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4209 pp = (PTR_BL *)(dp); // must be pointer block |
7 | 4210 if (pp->pb_id != PTR_ID) |
4211 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
4212 iemsg(_("E317: pointer block id wrong")); |
7 | 4213 goto error_block; |
4214 } | |
4215 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4216 if ((top = ml_add_stack(buf)) < 0) // add new entry to stack |
7 | 4217 goto error_block; |
4218 ip = &(buf->b_ml.ml_stack[top]); | |
4219 ip->ip_bnum = bnum; | |
4220 ip->ip_low = low; | |
4221 ip->ip_high = high; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4222 ip->ip_index = -1; // index not known yet |
7 | 4223 |
4224 dirty = FALSE; | |
4225 for (idx = 0; idx < (int)pp->pb_count; ++idx) | |
4226 { | |
4227 t = pp->pb_pointer[idx].pe_line_count; | |
4228 CHECK(t == 0, _("pe_line_count is zero")); | |
4229 if ((low += t) > lnum) | |
4230 { | |
4231 ip->ip_index = idx; | |
4232 bnum = pp->pb_pointer[idx].pe_bnum; | |
4233 page_count = pp->pb_pointer[idx].pe_page_count; | |
4234 high = low - 1; | |
4235 low -= t; | |
4236 | |
4237 /* | |
4238 * a negative block number may have been changed | |
4239 */ | |
4240 if (bnum < 0) | |
4241 { | |
4242 bnum2 = mf_trans_del(mfp, bnum); | |
4243 if (bnum != bnum2) | |
4244 { | |
4245 bnum = bnum2; | |
4246 pp->pb_pointer[idx].pe_bnum = bnum; | |
4247 dirty = TRUE; | |
4248 } | |
4249 } | |
4250 | |
4251 break; | |
4252 } | |
4253 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4254 if (idx >= (int)pp->pb_count) // past the end: something wrong! |
7 | 4255 { |
4256 if (lnum > buf->b_ml.ml_line_count) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
4257 siemsg(_("E322: line number out of range: %ld past the end"), |
7 | 4258 lnum - buf->b_ml.ml_line_count); |
4259 | |
4260 else | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
4261 siemsg(_("E323: line count wrong in block %ld"), bnum); |
7 | 4262 goto error_block; |
4263 } | |
4264 if (action == ML_DELETE) | |
4265 { | |
4266 pp->pb_pointer[idx].pe_line_count--; | |
4267 dirty = TRUE; | |
4268 } | |
4269 else if (action == ML_INSERT) | |
4270 { | |
4271 pp->pb_pointer[idx].pe_line_count++; | |
4272 dirty = TRUE; | |
4273 } | |
4274 mf_put(mfp, hp, dirty, FALSE); | |
4275 } | |
4276 | |
4277 error_block: | |
4278 mf_put(mfp, hp, FALSE, FALSE); | |
4279 error_noblock: | |
2267 | 4280 /* |
4281 * If action is ML_DELETE or ML_INSERT we have to correct the tree for | |
4282 * the incremented/decremented line counts, because there won't be a line | |
4283 * inserted/deleted after all. | |
4284 */ | |
7 | 4285 if (action == ML_DELETE) |
4286 ml_lineadd(buf, 1); | |
4287 else if (action == ML_INSERT) | |
4288 ml_lineadd(buf, -1); | |
4289 buf->b_ml.ml_stack_top = 0; | |
4290 return NULL; | |
4291 } | |
4292 | |
4293 /* | |
4294 * add an entry to the info pointer stack | |
4295 * | |
4296 * return -1 for failure, number of the new entry otherwise | |
4297 */ | |
4298 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4299 ml_add_stack(buf_T *buf) |
7 | 4300 { |
4301 int top; | |
4302 infoptr_T *newstack; | |
4303 | |
4304 top = buf->b_ml.ml_stack_top; | |
4305 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4306 // may have to increase the stack size |
7 | 4307 if (top == buf->b_ml.ml_stack_size) |
4308 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4309 CHECK(top > 0, _("Stack size increases")); // more than 5 levels??? |
7 | 4310 |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16786
diff
changeset
|
4311 newstack = ALLOC_MULT(infoptr_T, buf->b_ml.ml_stack_size + STACK_INCR); |
7 | 4312 if (newstack == NULL) |
4313 return -1; | |
6989 | 4314 if (top > 0) |
4315 mch_memmove(newstack, buf->b_ml.ml_stack, | |
1624 | 4316 (size_t)top * sizeof(infoptr_T)); |
7 | 4317 vim_free(buf->b_ml.ml_stack); |
4318 buf->b_ml.ml_stack = newstack; | |
4319 buf->b_ml.ml_stack_size += STACK_INCR; | |
4320 } | |
4321 | |
4322 buf->b_ml.ml_stack_top++; | |
4323 return top; | |
4324 } | |
4325 | |
4326 /* | |
4327 * Update the pointer blocks on the stack for inserted/deleted lines. | |
4328 * The stack itself is also updated. | |
4329 * | |
4330 * When a insert/delete line action fails, the line is not inserted/deleted, | |
4331 * but the pointer blocks have already been updated. That is fixed here by | |
4332 * walking through the stack. | |
4333 * | |
4334 * Count is the number of lines added, negative if lines have been deleted. | |
4335 */ | |
4336 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4337 ml_lineadd(buf_T *buf, int count) |
7 | 4338 { |
4339 int idx; | |
4340 infoptr_T *ip; | |
4341 PTR_BL *pp; | |
4342 memfile_T *mfp = buf->b_ml.ml_mfp; | |
4343 bhdr_T *hp; | |
4344 | |
4345 for (idx = buf->b_ml.ml_stack_top - 1; idx >= 0; --idx) | |
4346 { | |
4347 ip = &(buf->b_ml.ml_stack[idx]); | |
4348 if ((hp = mf_get(mfp, ip->ip_bnum, 1)) == NULL) | |
4349 break; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4350 pp = (PTR_BL *)(hp->bh_data); // must be pointer block |
7 | 4351 if (pp->pb_id != PTR_ID) |
4352 { | |
4353 mf_put(mfp, hp, FALSE, FALSE); | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
4354 iemsg(_("E317: pointer block id wrong 2")); |
7 | 4355 break; |
4356 } | |
4357 pp->pb_pointer[ip->ip_index].pe_line_count += count; | |
4358 ip->ip_high += count; | |
4359 mf_put(mfp, hp, TRUE, FALSE); | |
4360 } | |
4361 } | |
4362 | |
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4363 #if defined(HAVE_READLINK) || defined(PROTO) |
594 | 4364 /* |
4365 * Resolve a symlink in the last component of a file name. | |
4366 * Note that f_resolve() does it for every part of the path, we don't do that | |
4367 * here. | |
4368 * If it worked returns OK and the resolved link in "buf[MAXPATHL]". | |
4369 * Otherwise returns FAIL. | |
4370 */ | |
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4371 int |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4372 resolve_symlink(char_u *fname, char_u *buf) |
594 | 4373 { |
4374 char_u tmp[MAXPATHL]; | |
4375 int ret; | |
4376 int depth = 0; | |
4377 | |
4378 if (fname == NULL) | |
4379 return FAIL; | |
4380 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4381 // Put the result so far in tmp[], starting with the original name. |
594 | 4382 vim_strncpy(tmp, fname, MAXPATHL - 1); |
4383 | |
4384 for (;;) | |
4385 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4386 // Limit symlink depth to 100, catch recursive loops. |
594 | 4387 if (++depth == 100) |
4388 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
4389 semsg(_("E773: Symlink loop for \"%s\""), fname); |
594 | 4390 return FAIL; |
4391 } | |
4392 | |
4393 ret = readlink((char *)tmp, (char *)buf, MAXPATHL - 1); | |
4394 if (ret <= 0) | |
4395 { | |
619 | 4396 if (errno == EINVAL || errno == ENOENT) |
594 | 4397 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4398 // Found non-symlink or not existing file, stop here. |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4399 // When at the first level use the unmodified name, skip the |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4400 // call to vim_FullName(). |
594 | 4401 if (depth == 1) |
4402 return FAIL; | |
4403 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4404 // Use the resolved name in tmp[]. |
594 | 4405 break; |
4406 } | |
4407 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4408 // There must be some error reading links, use original name. |
594 | 4409 return FAIL; |
4410 } | |
4411 buf[ret] = NUL; | |
4412 | |
4413 /* | |
4414 * Check whether the symlink is relative or absolute. | |
4415 * If it's relative, build a new path based on the directory | |
4416 * portion of the filename (if any) and the path the symlink | |
4417 * points to. | |
4418 */ | |
4419 if (mch_isFullName(buf)) | |
4420 STRCPY(tmp, buf); | |
4421 else | |
4422 { | |
4423 char_u *tail; | |
4424 | |
4425 tail = gettail(tmp); | |
4426 if (STRLEN(tail) + STRLEN(buf) >= MAXPATHL) | |
4427 return FAIL; | |
4428 STRCPY(tail, buf); | |
4429 } | |
4430 } | |
4431 | |
4432 /* | |
4433 * Try to resolve the full name of the file so that the swapfile name will | |
4434 * be consistent even when opening a relative symlink from different | |
4435 * working directories. | |
4436 */ | |
4437 return vim_FullName(tmp, buf, MAXPATHL, TRUE); | |
4438 } | |
4439 #endif | |
4440 | |
7 | 4441 /* |
460 | 4442 * Make swap file name out of the file name and a directory name. |
4443 * Returns pointer to allocated memory or NULL. | |
7 | 4444 */ |
460 | 4445 char_u * |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4446 makeswapname( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4447 char_u *fname, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4448 char_u *ffname UNUSED, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4449 buf_T *buf, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4450 char_u *dir_name) |
7 | 4451 { |
4452 char_u *r, *s; | |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
4453 char_u *fname_res = fname; |
594 | 4454 #ifdef HAVE_READLINK |
4455 char_u fname_buf[MAXPATHL]; | |
21337
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
4456 |
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
4457 // Expand symlink in the file name, so that we put the swap file with the |
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
4458 // actual file instead of with the symlink. |
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
4459 if (resolve_symlink(fname, fname_buf) == OK) |
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
4460 fname_res = fname_buf; |
594 | 4461 #endif |
7 | 4462 |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
4463 #if defined(UNIX) || defined(MSWIN) // Need _very_ long file names |
10996
2f041b367cd9
patch 8.0.0387: compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
4464 int len = (int)STRLEN(dir_name); |
10896
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
4465 |
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
4466 s = dir_name + len; |
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
4467 if (after_pathsep(dir_name, s) && len > 1 && s[-1] == s[-2]) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4468 { // Ends with '//', Use Full path |
7 | 4469 r = NULL; |
21337
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
4470 if ((s = make_percent_swname(dir_name, fname_res)) != NULL) |
7 | 4471 { |
4472 r = modname(s, (char_u *)".swp", FALSE); | |
4473 vim_free(s); | |
4474 } | |
4475 return r; | |
4476 } | |
4477 #endif | |
4478 | |
4479 r = buf_modname( | |
4480 (buf->b_p_sn || buf->b_shortname), | |
594 | 4481 fname_res, |
7 | 4482 (char_u *) |
2823 | 4483 #if defined(VMS) |
7 | 4484 "_swp", |
4485 #else | |
4486 ".swp", | |
4487 #endif | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4488 // Prepend a '.' to the swap file name for the current directory. |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
4489 dir_name[0] == '.' && dir_name[1] == NUL); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4490 if (r == NULL) // out of memory |
7 | 4491 return NULL; |
4492 | |
4493 s = get_file_in_dir(r, dir_name); | |
4494 vim_free(r); | |
4495 return s; | |
4496 } | |
4497 | |
4498 /* | |
4499 * Get file name to use for swap file or backup file. | |
4500 * Use the name of the edited file "fname" and an entry in the 'dir' or 'bdir' | |
4501 * option "dname". | |
4502 * - If "dname" is ".", return "fname" (swap file in dir of file). | |
4503 * - If "dname" starts with "./", insert "dname" in "fname" (swap file | |
4504 * relative to dir of file). | |
4505 * - Otherwise, prepend "dname" to the tail of "fname" (swap file in specific | |
4506 * dir). | |
4507 * | |
4508 * The return value is an allocated string and can be NULL. | |
4509 */ | |
4510 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4511 get_file_in_dir( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4512 char_u *fname, |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4513 char_u *dname) // don't use "dirname", it is a global for Alpha |
7 | 4514 { |
4515 char_u *t; | |
4516 char_u *tail; | |
4517 char_u *retval; | |
4518 int save_char; | |
4519 | |
4520 tail = gettail(fname); | |
4521 | |
4522 if (dname[0] == '.' && dname[1] == NUL) | |
4523 retval = vim_strsave(fname); | |
4524 else if (dname[0] == '.' && vim_ispathsep(dname[1])) | |
4525 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4526 if (tail == fname) // no path before file name |
7 | 4527 retval = concat_fnames(dname + 2, tail, TRUE); |
4528 else | |
4529 { | |
4530 save_char = *tail; | |
4531 *tail = NUL; | |
4532 t = concat_fnames(fname, dname + 2, TRUE); | |
4533 *tail = save_char; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4534 if (t == NULL) // out of memory |
7 | 4535 retval = NULL; |
4536 else | |
4537 { | |
4538 retval = concat_fnames(t, tail, TRUE); | |
4539 vim_free(t); | |
4540 } | |
4541 } | |
4542 } | |
4543 else | |
4544 retval = concat_fnames(dname, tail, TRUE); | |
4545 | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
4546 #ifdef MSWIN |
5432 | 4547 if (retval != NULL) |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10996
diff
changeset
|
4548 for (t = gettail(retval); *t != NUL; MB_PTR_ADV(t)) |
5432 | 4549 if (*t == ':') |
4550 *t = '%'; | |
4551 #endif | |
4552 | |
7 | 4553 return retval; |
4554 } | |
4555 | |
580 | 4556 /* |
4557 * Print the ATTENTION message: info about an existing swap file. | |
4558 */ | |
4559 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4560 attention_message( |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4561 buf_T *buf, // buffer being edited |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4562 char_u *fname) // swap file name |
580 | 4563 { |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
4564 stat_T st; |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
4565 time_t swap_mtime; |
580 | 4566 |
4567 ++no_wait_return; | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
4568 (void)emsg(_("E325: ATTENTION")); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4569 msg_puts(_("\nFound a swap file by the name \"")); |
580 | 4570 msg_home_replace(fname); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4571 msg_puts("\"\n"); |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
4572 swap_mtime = swapfile_info(fname); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4573 msg_puts(_("While opening file \"")); |
580 | 4574 msg_outtrans(buf->b_fname); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4575 msg_puts("\"\n"); |
14923
95400980f7c9
patch 8.1.0473: user doesn't notice file does not exist when swap file does
Bram Moolenaar <Bram@vim.org>
parents:
14909
diff
changeset
|
4576 if (mch_stat((char *)buf->b_fname, &st) == -1) |
95400980f7c9
patch 8.1.0473: user doesn't notice file does not exist when swap file does
Bram Moolenaar <Bram@vim.org>
parents:
14909
diff
changeset
|
4577 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4578 msg_puts(_(" CANNOT BE FOUND")); |
14923
95400980f7c9
patch 8.1.0473: user doesn't notice file does not exist when swap file does
Bram Moolenaar <Bram@vim.org>
parents:
14909
diff
changeset
|
4579 } |
95400980f7c9
patch 8.1.0473: user doesn't notice file does not exist when swap file does
Bram Moolenaar <Bram@vim.org>
parents:
14909
diff
changeset
|
4580 else |
580 | 4581 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4582 msg_puts(_(" dated: ")); |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
4583 msg_puts(get_ctime(st.st_mtime, TRUE)); |
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
4584 if (swap_mtime != 0 && st.st_mtime > swap_mtime) |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4585 msg_puts(_(" NEWER than swap file!\n")); |
580 | 4586 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4587 // Some of these messages are long to allow translation to |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4588 // other languages. |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4589 msg_puts(_("\n(1) Another program may be editing the same file. If this is the case,\n be careful not to end up with two different instances of the same\n file when making changes. Quit, or continue with caution.\n")); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4590 msg_puts(_("(2) An edit session for this file crashed.\n")); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4591 msg_puts(_(" If this is the case, use \":recover\" or \"vim -r ")); |
580 | 4592 msg_outtrans(buf->b_fname); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4593 msg_puts(_("\"\n to recover the changes (see \":help recovery\").\n")); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4594 msg_puts(_(" If you did this already, delete the swap file \"")); |
580 | 4595 msg_outtrans(fname); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4596 msg_puts(_("\"\n to avoid this message.\n")); |
580 | 4597 cmdline_row = msg_row; |
4598 --no_wait_return; | |
4599 } | |
4600 | |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
4601 #if defined(FEAT_EVAL) |
580 | 4602 /* |
4603 * Trigger the SwapExists autocommands. | |
4604 * Returns a value for equivalent to do_dialog() (see below): | |
4605 * 0: still need to ask for a choice | |
4606 * 1: open read-only | |
4607 * 2: edit anyway | |
4608 * 3: recover | |
4609 * 4: delete it | |
4610 * 5: quit | |
4611 * 6: abort | |
4612 */ | |
4613 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4614 do_swapexists(buf_T *buf, char_u *fname) |
580 | 4615 { |
4616 set_vim_var_string(VV_SWAPNAME, fname, -1); | |
4617 set_vim_var_string(VV_SWAPCHOICE, NULL, -1); | |
4618 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4619 // Trigger SwapExists autocommands with <afile> set to the file being |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4620 // edited. Disallow changing directory here. |
1856 | 4621 ++allbuf_lock; |
580 | 4622 apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL); |
1856 | 4623 --allbuf_lock; |
580 | 4624 |
4625 set_vim_var_string(VV_SWAPNAME, NULL, -1); | |
4626 | |
4627 switch (*get_vim_var_str(VV_SWAPCHOICE)) | |
4628 { | |
4629 case 'o': return 1; | |
4630 case 'e': return 2; | |
4631 case 'r': return 3; | |
4632 case 'd': return 4; | |
4633 case 'q': return 5; | |
4634 case 'a': return 6; | |
4635 } | |
4636 | |
4637 return 0; | |
4638 } | |
4639 #endif | |
4640 | |
7 | 4641 /* |
4642 * Find out what name to use for the swap file for buffer 'buf'. | |
4643 * | |
4644 * Several names are tried to find one that does not exist | |
460 | 4645 * Returns the name in allocated memory or NULL. |
3158 | 4646 * When out of memory "dirp" is set to NULL. |
7 | 4647 * |
4648 * Note: If BASENAMELEN is not correct, you will get error messages for | |
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4649 * not being able to open the swap or undo file |
1856 | 4650 * Note: May trigger SwapExists autocmd, pointers may change! |
7 | 4651 */ |
4652 static char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4653 findswapname( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4654 buf_T *buf, |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4655 char_u **dirp, // pointer to list of directories |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4656 char_u *old_fname) // don't give warning for this file name |
7 | 4657 { |
4658 char_u *fname; | |
4659 int n; | |
4660 char_u *dir_name; | |
4661 #ifdef AMIGA | |
4662 BPTR fh; | |
4663 #endif | |
4664 int r; | |
5432 | 4665 char_u *buf_fname = buf->b_fname; |
7 | 4666 |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
4667 #if !defined(UNIX) |
7 | 4668 # define CREATE_DUMMY_FILE |
4669 FILE *dummyfd = NULL; | |
4670 | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
4671 # ifdef MSWIN |
5432 | 4672 if (buf_fname != NULL && !mch_isFullName(buf_fname) |
4673 && vim_strchr(gettail(buf_fname), ':')) | |
4674 { | |
4675 char_u *t; | |
4676 | |
4677 buf_fname = vim_strsave(buf_fname); | |
4678 if (buf_fname == NULL) | |
4679 buf_fname = buf->b_fname; | |
4680 else | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10996
diff
changeset
|
4681 for (t = gettail(buf_fname); *t != NUL; MB_PTR_ADV(t)) |
5432 | 4682 if (*t == ':') |
4683 *t = '%'; | |
4684 } | |
4685 # endif | |
4686 | |
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4687 /* |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4688 * If we start editing a new file, e.g. "test.doc", which resides on an |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4689 * MSDOS compatible filesystem, it is possible that the file |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4690 * "test.doc.swp" which we create will be exactly the same file. To avoid |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4691 * this problem we temporarily create "test.doc". Don't do this when the |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4692 * check below for a 8.3 file name is used. |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4693 */ |
5432 | 4694 if (!(buf->b_p_sn || buf->b_shortname) && buf_fname != NULL |
4695 && mch_getperm(buf_fname) < 0) | |
4696 dummyfd = mch_fopen((char *)buf_fname, "w"); | |
7 | 4697 #endif |
4698 | |
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4699 /* |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4700 * Isolate a directory name from *dirp and put it in dir_name. |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4701 * First allocate some memory to put the directory name in. |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4702 */ |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
4703 dir_name = alloc(STRLEN(*dirp) + 1); |
3158 | 4704 if (dir_name == NULL) |
4705 *dirp = NULL; | |
4706 else | |
7 | 4707 (void)copy_option_part(dirp, dir_name, 31000, ","); |
4708 | |
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4709 /* |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4710 * we try different names until we find one that does not exist yet |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4711 */ |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4712 if (dir_name == NULL) // out of memory |
7 | 4713 fname = NULL; |
4714 else | |
5432 | 4715 fname = makeswapname(buf_fname, buf->b_ffname, buf, dir_name); |
7 | 4716 |
4717 for (;;) | |
4718 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4719 if (fname == NULL) // must be out of memory |
7 | 4720 break; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4721 if ((n = (int)STRLEN(fname)) == 0) // safety check |
7 | 4722 { |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12975
diff
changeset
|
4723 VIM_CLEAR(fname); |
7 | 4724 break; |
4725 } | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
4726 #if defined(UNIX) |
7 | 4727 /* |
4728 * Some systems have a MS-DOS compatible filesystem that use 8.3 character | |
4729 * file names. If this is the first try and the swap file name does not fit in | |
4730 * 8.3, detect if this is the case, set shortname and try again. | |
4731 */ | |
4732 if (fname[n - 2] == 'w' && fname[n - 1] == 'p' | |
4733 && !(buf->b_p_sn || buf->b_shortname)) | |
4734 { | |
4735 char_u *tail; | |
4736 char_u *fname2; | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
4737 stat_T s1, s2; |
7 | 4738 int f1, f2; |
4739 int created1 = FALSE, created2 = FALSE; | |
4740 int same = FALSE; | |
4741 | |
4742 /* | |
4743 * Check if swapfile name does not fit in 8.3: | |
4744 * It either contains two dots, is longer than 8 chars, or starts | |
4745 * with a dot. | |
4746 */ | |
5432 | 4747 tail = gettail(buf_fname); |
7 | 4748 if ( vim_strchr(tail, '.') != NULL |
4749 || STRLEN(tail) > (size_t)8 | |
4750 || *gettail(fname) == '.') | |
4751 { | |
4752 fname2 = alloc(n + 2); | |
4753 if (fname2 != NULL) | |
4754 { | |
4755 STRCPY(fname2, fname); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4756 // if fname == "xx.xx.swp", fname2 = "xx.xx.swx" |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4757 // if fname == ".xx.swp", fname2 = ".xx.swpx" |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4758 // if fname == "123456789.swp", fname2 = "12345678x.swp" |
7 | 4759 if (vim_strchr(tail, '.') != NULL) |
4760 fname2[n - 1] = 'x'; | |
4761 else if (*gettail(fname) == '.') | |
4762 { | |
4763 fname2[n] = 'x'; | |
4764 fname2[n + 1] = NUL; | |
4765 } | |
4766 else | |
4767 fname2[n - 5] += 1; | |
4768 /* | |
4769 * may need to create the files to be able to use mch_stat() | |
4770 */ | |
4771 f1 = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0); | |
4772 if (f1 < 0) | |
4773 { | |
4774 f1 = mch_open_rw((char *)fname, | |
4775 O_RDWR|O_CREAT|O_EXCL|O_EXTRA); | |
4776 created1 = TRUE; | |
4777 } | |
4778 if (f1 >= 0) | |
4779 { | |
4780 f2 = mch_open((char *)fname2, O_RDONLY | O_EXTRA, 0); | |
4781 if (f2 < 0) | |
4782 { | |
4783 f2 = mch_open_rw((char *)fname2, | |
4784 O_RDWR|O_CREAT|O_EXCL|O_EXTRA); | |
4785 created2 = TRUE; | |
4786 } | |
4787 if (f2 >= 0) | |
4788 { | |
4789 /* | |
4790 * Both files exist now. If mch_stat() returns the | |
4791 * same device and inode they are the same file. | |
4792 */ | |
4793 if (mch_fstat(f1, &s1) != -1 | |
4794 && mch_fstat(f2, &s2) != -1 | |
4795 && s1.st_dev == s2.st_dev | |
4796 && s1.st_ino == s2.st_ino) | |
4797 same = TRUE; | |
4798 close(f2); | |
4799 if (created2) | |
4800 mch_remove(fname2); | |
4801 } | |
4802 close(f1); | |
4803 if (created1) | |
4804 mch_remove(fname); | |
4805 } | |
4806 vim_free(fname2); | |
4807 if (same) | |
4808 { | |
4809 buf->b_shortname = TRUE; | |
4810 vim_free(fname); | |
5432 | 4811 fname = makeswapname(buf_fname, buf->b_ffname, |
460 | 4812 buf, dir_name); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4813 continue; // try again with b_shortname set |
7 | 4814 } |
4815 } | |
4816 } | |
4817 } | |
4818 #endif | |
4819 /* | |
4820 * check if the swapfile already exists | |
4821 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4822 if (mch_getperm(fname) < 0) // it does not exist |
7 | 4823 { |
4824 #ifdef HAVE_LSTAT | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
4825 stat_T sb; |
7 | 4826 |
4827 /* | |
4828 * Extra security check: When a swap file is a symbolic link, this | |
4829 * is most likely a symlink attack. | |
4830 */ | |
4831 if (mch_lstat((char *)fname, &sb) < 0) | |
4832 #else | |
4833 # ifdef AMIGA | |
4834 fh = Open((UBYTE *)fname, (long)MODE_NEWFILE); | |
4835 /* | |
4836 * on the Amiga mch_getperm() will return -1 when the file exists | |
4837 * but is being used by another program. This happens if you edit | |
4838 * a file twice. | |
4839 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4840 if (fh != (BPTR)NULL) // can open file, OK |
7 | 4841 { |
4842 Close(fh); | |
4843 mch_remove(fname); | |
4844 break; | |
4845 } | |
4846 if (IoErr() != ERROR_OBJECT_IN_USE | |
4847 && IoErr() != ERROR_OBJECT_EXISTS) | |
4848 # endif | |
4849 #endif | |
4850 break; | |
4851 } | |
4852 | |
4853 /* | |
4854 * A file name equal to old_fname is OK to use. | |
4855 */ | |
4856 if (old_fname != NULL && fnamecmp(fname, old_fname) == 0) | |
4857 break; | |
4858 | |
4859 /* | |
4860 * get here when file already exists | |
4861 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4862 if (fname[n - 2] == 'w' && fname[n - 1] == 'p') // first try |
7 | 4863 { |
4864 /* | |
4865 * on MS-DOS compatible filesystems (e.g. messydos) file.doc.swp | |
4866 * and file.doc are the same file. To guess if this problem is | |
4867 * present try if file.doc.swx exists. If it does, we set | |
4868 * buf->b_shortname and try file_doc.swp (dots replaced by | |
4869 * underscores for this file), and try again. If it doesn't we | |
4870 * assume that "file.doc.swp" already exists. | |
4871 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4872 if (!(buf->b_p_sn || buf->b_shortname)) // not tried yet |
7 | 4873 { |
4874 fname[n - 1] = 'x'; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4875 r = mch_getperm(fname); // try "file.swx" |
7 | 4876 fname[n - 1] = 'p'; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4877 if (r >= 0) // "file.swx" seems to exist |
7 | 4878 { |
4879 buf->b_shortname = TRUE; | |
4880 vim_free(fname); | |
5432 | 4881 fname = makeswapname(buf_fname, buf->b_ffname, |
460 | 4882 buf, dir_name); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4883 continue; // try again with '.' replaced with '_' |
7 | 4884 } |
4885 } | |
4886 /* | |
4887 * If we get here the ".swp" file really exists. | |
4888 * Give an error message, unless recovering, no file name, we are | |
4889 * viewing a help file or when the path of the file is different | |
4890 * (happens when all .swp files are in one directory). | |
4891 */ | |
5432 | 4892 if (!recoverymode && buf_fname != NULL |
17632
5278e5a2a4e3
patch 8.1.1813: ATTENTION prompt for a preview popup window
Bram Moolenaar <Bram@vim.org>
parents:
17454
diff
changeset
|
4893 && !buf->b_help |
5278e5a2a4e3
patch 8.1.1813: ATTENTION prompt for a preview popup window
Bram Moolenaar <Bram@vim.org>
parents:
17454
diff
changeset
|
4894 && !(buf->b_flags & (BF_DUMMY | BF_NO_SEA))) |
7 | 4895 { |
4896 int fd; | |
4897 struct block0 b0; | |
4898 int differ = FALSE; | |
4899 | |
4900 /* | |
4901 * Try to read block 0 from the swap file to get the original | |
4902 * file name (and inode number). | |
4903 */ | |
4904 fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0); | |
4905 if (fd >= 0) | |
4906 { | |
2664 | 4907 if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0)) |
7 | 4908 { |
4909 /* | |
39 | 4910 * If the swapfile has the same directory as the |
4911 * buffer don't compare the directory names, they can | |
4912 * have a different mountpoint. | |
7 | 4913 */ |
39 | 4914 if (b0.b0_flags & B0_SAME_DIR) |
4915 { | |
4916 if (fnamecmp(gettail(buf->b_ffname), | |
4917 gettail(b0.b0_fname)) != 0 | |
4918 || !same_directory(fname, buf->b_ffname)) | |
594 | 4919 { |
4920 #ifdef CHECK_INODE | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4921 // Symlinks may point to the same file even |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4922 // when the name differs, need to check the |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4923 // inode too. |
594 | 4924 expand_env(b0.b0_fname, NameBuff, MAXPATHL); |
4925 if (fnamecmp_ino(buf->b_ffname, NameBuff, | |
4926 char_to_long(b0.b0_ino))) | |
4927 #endif | |
4928 differ = TRUE; | |
4929 } | |
39 | 4930 } |
4931 else | |
4932 { | |
4933 /* | |
4934 * The name in the swap file may be | |
4935 * "~user/path/file". Expand it first. | |
4936 */ | |
4937 expand_env(b0.b0_fname, NameBuff, MAXPATHL); | |
7 | 4938 #ifdef CHECK_INODE |
39 | 4939 if (fnamecmp_ino(buf->b_ffname, NameBuff, |
594 | 4940 char_to_long(b0.b0_ino))) |
39 | 4941 differ = TRUE; |
7 | 4942 #else |
39 | 4943 if (fnamecmp(NameBuff, buf->b_ffname) != 0) |
4944 differ = TRUE; | |
7 | 4945 #endif |
39 | 4946 } |
7 | 4947 } |
4948 close(fd); | |
4949 } | |
4950 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4951 // give the ATTENTION message when there is an old swap file |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4952 // for the current file, and the buffer was not recovered. |
7 | 4953 if (differ == FALSE && !(curbuf->b_flags & BF_RECOVERED) |
4954 && vim_strchr(p_shm, SHM_ATTENTION) == NULL) | |
4955 { | |
580 | 4956 int choice = 0; |
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4957 stat_T st; |
7 | 4958 #ifdef CREATE_DUMMY_FILE |
4959 int did_use_dummy = FALSE; | |
4960 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4961 // Avoid getting a warning for the file being created |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4962 // outside of Vim, it was created at the start of this |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4963 // function. Delete the file now, because Vim might exit |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4964 // here if the window is closed. |
7 | 4965 if (dummyfd != NULL) |
4966 { | |
4967 fclose(dummyfd); | |
4968 dummyfd = NULL; | |
5432 | 4969 mch_remove(buf_fname); |
7 | 4970 did_use_dummy = TRUE; |
4971 } | |
4972 #endif | |
4973 | |
16455
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
4974 #ifdef HAVE_PROCESS_STILL_RUNNING |
7 | 4975 process_still_running = FALSE; |
4976 #endif | |
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4977 // It's safe to delete the swap file if all these are true: |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4978 // - the edited file exists |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4979 // - the swap file has no changes and looks OK |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4980 if (mch_stat((char *)buf->b_fname, &st) == 0 |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4981 && swapfile_unchanged(fname)) |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4982 { |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4983 choice = 4; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4984 if (p_verbose > 0) |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4985 verb_msg(_("Found a swap file that is not useful, deleting it")); |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4986 } |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4987 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
4988 #if defined(FEAT_EVAL) |
580 | 4989 /* |
4990 * If there is an SwapExists autocommand and we can handle | |
4991 * the response, trigger it. It may return 0 to ask the | |
4992 * user anyway. | |
4993 */ | |
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4994 if (choice == 0 |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
4995 && swap_exists_action != SEA_NONE |
5432 | 4996 && has_autocmd(EVENT_SWAPEXISTS, buf_fname, buf)) |
580 | 4997 choice = do_swapexists(buf, fname); |
4998 | |
4999 if (choice == 0) | |
5000 #endif | |
7 | 5001 { |
580 | 5002 #ifdef FEAT_GUI |
14903
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5003 // If we are supposed to start the GUI but it wasn't |
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5004 // completely started yet, start it now. This makes |
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5005 // the messages displayed in the Vim window when |
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5006 // loading a session from the .gvimrc file. |
580 | 5007 if (gui.starting && !gui.in_use) |
16451
7ae2396cef62
patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5008 gui_start(NULL); |
580 | 5009 #endif |
14903
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5010 // Show info about the existing swap file. |
580 | 5011 attention_message(buf, fname); |
5012 | |
14903
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5013 // We don't want a 'q' typed at the more-prompt |
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5014 // interrupt loading a file. |
580 | 5015 got_int = FALSE; |
14903
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5016 |
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5017 // If vimrc has "simalt ~x" we don't want it to |
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5018 // interfere with the prompt here. |
14909
c97b4b537572
patch 8.1.0466: autocmd test fails
Bram Moolenaar <Bram@vim.org>
parents:
14903
diff
changeset
|
5019 flush_buffers(FLUSH_TYPEAHEAD); |
7 | 5020 } |
5021 | |
5022 #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) | |
580 | 5023 if (swap_exists_action != SEA_NONE && choice == 0) |
7 | 5024 { |
5025 char_u *name; | |
5026 | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
5027 name = alloc(STRLEN(fname) |
7 | 5028 + STRLEN(_("Swap file \"")) |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
5029 + STRLEN(_("\" already exists!")) + 5); |
7 | 5030 if (name != NULL) |
5031 { | |
5032 STRCPY(name, _("Swap file \"")); | |
5033 home_replace(NULL, fname, name + STRLEN(name), | |
5034 1000, TRUE); | |
5035 STRCAT(name, _("\" already exists!")); | |
5036 } | |
580 | 5037 choice = do_dialog(VIM_WARNING, |
7 | 5038 (char_u *)_("VIM - ATTENTION"), |
5039 name == NULL | |
5040 ? (char_u *)_("Swap file already exists!") | |
5041 : name, | |
16455
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
5042 # ifdef HAVE_PROCESS_STILL_RUNNING |
7 | 5043 process_still_running |
5044 ? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") : | |
5045 # endif | |
2684 | 5046 (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL, FALSE); |
580 | 5047 |
16455
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
5048 # ifdef HAVE_PROCESS_STILL_RUNNING |
580 | 5049 if (process_still_running && choice >= 4) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5050 choice++; // Skip missing "Delete it" button |
580 | 5051 # endif |
5052 vim_free(name); | |
5053 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5054 // pretend screen didn't scroll, need redraw anyway |
580 | 5055 msg_scrolled = 0; |
5056 redraw_all_later(NOT_VALID); | |
5057 } | |
5058 #endif | |
5059 | |
5060 if (choice > 0) | |
5061 { | |
5062 switch (choice) | |
7 | 5063 { |
5064 case 1: | |
5065 buf->b_p_ro = TRUE; | |
5066 break; | |
5067 case 2: | |
5068 break; | |
5069 case 3: | |
5070 swap_exists_action = SEA_RECOVER; | |
5071 break; | |
5072 case 4: | |
580 | 5073 mch_remove(fname); |
5074 break; | |
5075 case 5: | |
7 | 5076 swap_exists_action = SEA_QUIT; |
5077 break; | |
580 | 5078 case 6: |
7 | 5079 swap_exists_action = SEA_QUIT; |
5080 got_int = TRUE; | |
5081 break; | |
5082 } | |
5083 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5084 // If the file was deleted this fname can be used. |
7 | 5085 if (mch_getperm(fname) < 0) |
5086 break; | |
5087 } | |
5088 else | |
5089 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5090 msg_puts("\n"); |
625 | 5091 if (msg_silent == 0) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5092 // call wait_return() later |
625 | 5093 need_wait_return = TRUE; |
7 | 5094 } |
5095 | |
5096 #ifdef CREATE_DUMMY_FILE | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5097 // Going to try another name, need the dummy file again. |
7 | 5098 if (did_use_dummy) |
5432 | 5099 dummyfd = mch_fopen((char *)buf_fname, "w"); |
7 | 5100 #endif |
5101 } | |
5102 } | |
5103 } | |
5104 | |
5105 /* | |
5106 * Change the ".swp" extension to find another file that can be used. | |
5107 * First decrement the last char: ".swo", ".swn", etc. | |
5108 * If that still isn't enough decrement the last but one char: ".svz" | |
9 | 5109 * Can happen when editing many "No Name" buffers. |
7 | 5110 */ |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5111 if (fname[n - 1] == 'a') // ".s?a" |
7 | 5112 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5113 if (fname[n - 2] == 'a') // ".saa": tried enough, give up |
7 | 5114 { |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
5115 emsg(_("E326: Too many swap files found")); |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12975
diff
changeset
|
5116 VIM_CLEAR(fname); |
7 | 5117 break; |
5118 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5119 --fname[n - 2]; // ".svz", ".suz", etc. |
7 | 5120 fname[n - 1] = 'z' + 1; |
5121 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5122 --fname[n - 1]; // ".swo", ".swn", etc. |
7 | 5123 } |
5124 | |
5125 vim_free(dir_name); | |
5126 #ifdef CREATE_DUMMY_FILE | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5127 if (dummyfd != NULL) // file has been created temporarily |
7 | 5128 { |
5129 fclose(dummyfd); | |
5432 | 5130 mch_remove(buf_fname); |
7 | 5131 } |
5132 #endif | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
5133 #ifdef MSWIN |
5432 | 5134 if (buf_fname != buf->b_fname) |
5135 vim_free(buf_fname); | |
5136 #endif | |
7 | 5137 return fname; |
5138 } | |
5139 | |
5140 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5141 b0_magic_wrong(ZERO_BL *b0p) |
7 | 5142 { |
5143 return (b0p->b0_magic_long != (long)B0_MAGIC_LONG | |
5144 || b0p->b0_magic_int != (int)B0_MAGIC_INT | |
5145 || b0p->b0_magic_short != (short)B0_MAGIC_SHORT | |
5146 || b0p->b0_magic_char != B0_MAGIC_CHAR); | |
5147 } | |
5148 | |
5149 #ifdef CHECK_INODE | |
5150 /* | |
5151 * Compare current file name with file name from swap file. | |
5152 * Try to use inode numbers when possible. | |
5153 * Return non-zero when files are different. | |
5154 * | |
5155 * When comparing file names a few things have to be taken into consideration: | |
5156 * - When working over a network the full path of a file depends on the host. | |
5157 * We check the inode number if possible. It is not 100% reliable though, | |
5158 * because the device number cannot be used over a network. | |
5159 * - When a file does not exist yet (editing a new file) there is no inode | |
5160 * number. | |
5161 * - The file name in a swap file may not be valid on the current host. The | |
5162 * "~user" form is used whenever possible to avoid this. | |
5163 * | |
5164 * This is getting complicated, let's make a table: | |
5165 * | |
5166 * ino_c ino_s fname_c fname_s differ = | |
5167 * | |
5168 * both files exist -> compare inode numbers: | |
5169 * != 0 != 0 X X ino_c != ino_s | |
5170 * | |
5171 * inode number(s) unknown, file names available -> compare file names | |
5172 * == 0 X OK OK fname_c != fname_s | |
5173 * X == 0 OK OK fname_c != fname_s | |
5174 * | |
5175 * current file doesn't exist, file for swap file exist, file name(s) not | |
5176 * available -> probably different | |
5177 * == 0 != 0 FAIL X TRUE | |
5178 * == 0 != 0 X FAIL TRUE | |
5179 * | |
5180 * current file exists, inode for swap unknown, file name(s) not | |
5181 * available -> probably different | |
5182 * != 0 == 0 FAIL X TRUE | |
5183 * != 0 == 0 X FAIL TRUE | |
5184 * | |
5185 * current file doesn't exist, inode for swap unknown, one file name not | |
5186 * available -> probably different | |
5187 * == 0 == 0 FAIL OK TRUE | |
5188 * == 0 == 0 OK FAIL TRUE | |
5189 * | |
5190 * current file doesn't exist, inode for swap unknown, both file names not | |
13896
4d5a1ada407e
patch 8.0.1819: swap file warning for file with non-existing directory
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
5191 * available -> compare file names |
4d5a1ada407e
patch 8.0.1819: swap file warning for file with non-existing directory
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
5192 * == 0 == 0 FAIL FAIL fname_c != fname_s |
7 | 5193 * |
5194 * Note that when the ino_t is 64 bits, only the last 32 will be used. This | |
5195 * can't be changed without making the block 0 incompatible with 32 bit | |
5196 * versions. | |
5197 */ | |
5198 | |
5199 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5200 fnamecmp_ino( |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5201 char_u *fname_c, // current file name |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5202 char_u *fname_s, // file name from swap file |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5203 long ino_block0) |
7 | 5204 { |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
5205 stat_T st; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5206 ino_t ino_c = 0; // ino of current file |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5207 ino_t ino_s; // ino of file from swap file |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5208 char_u buf_c[MAXPATHL]; // full path of fname_c |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5209 char_u buf_s[MAXPATHL]; // full path of fname_s |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5210 int retval_c; // flag: buf_c valid |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5211 int retval_s; // flag: buf_s valid |
7 | 5212 |
5213 if (mch_stat((char *)fname_c, &st) == 0) | |
5214 ino_c = (ino_t)st.st_ino; | |
5215 | |
5216 /* | |
5217 * First we try to get the inode from the file name, because the inode in | |
5218 * the swap file may be outdated. If that fails (e.g. this path is not | |
5219 * valid on this machine), use the inode from block 0. | |
5220 */ | |
5221 if (mch_stat((char *)fname_s, &st) == 0) | |
5222 ino_s = (ino_t)st.st_ino; | |
5223 else | |
5224 ino_s = (ino_t)ino_block0; | |
5225 | |
5226 if (ino_c && ino_s) | |
5227 return (ino_c != ino_s); | |
5228 | |
5229 /* | |
5230 * One of the inode numbers is unknown, try a forced vim_FullName() and | |
5231 * compare the file names. | |
5232 */ | |
5233 retval_c = vim_FullName(fname_c, buf_c, MAXPATHL, TRUE); | |
5234 retval_s = vim_FullName(fname_s, buf_s, MAXPATHL, TRUE); | |
5235 if (retval_c == OK && retval_s == OK) | |
13896
4d5a1ada407e
patch 8.0.1819: swap file warning for file with non-existing directory
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
5236 return STRCMP(buf_c, buf_s) != 0; |
7 | 5237 |
5238 /* | |
5239 * Can't compare inodes or file names, guess that the files are different, | |
13896
4d5a1ada407e
patch 8.0.1819: swap file warning for file with non-existing directory
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
5240 * unless both appear not to exist at all, then compare with the file name |
4d5a1ada407e
patch 8.0.1819: swap file warning for file with non-existing directory
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
5241 * in the swap file. |
7 | 5242 */ |
5243 if (ino_s == 0 && ino_c == 0 && retval_c == FAIL && retval_s == FAIL) | |
13896
4d5a1ada407e
patch 8.0.1819: swap file warning for file with non-existing directory
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
5244 return STRCMP(fname_c, fname_s) != 0; |
7 | 5245 return TRUE; |
5246 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5247 #endif // CHECK_INODE |
7 | 5248 |
5249 /* | |
5250 * Move a long integer into a four byte character array. | |
5251 * Used for machine independency in block zero. | |
5252 */ | |
5253 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5254 long_to_char(long n, char_u *s) |
7 | 5255 { |
5256 s[0] = (char_u)(n & 0xff); | |
5257 n = (unsigned)n >> 8; | |
5258 s[1] = (char_u)(n & 0xff); | |
5259 n = (unsigned)n >> 8; | |
5260 s[2] = (char_u)(n & 0xff); | |
5261 n = (unsigned)n >> 8; | |
5262 s[3] = (char_u)(n & 0xff); | |
5263 } | |
5264 | |
5265 static long | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5266 char_to_long(char_u *s) |
7 | 5267 { |
5268 long retval; | |
5269 | |
5270 retval = s[3]; | |
5271 retval <<= 8; | |
5272 retval |= s[2]; | |
5273 retval <<= 8; | |
5274 retval |= s[1]; | |
5275 retval <<= 8; | |
5276 retval |= s[0]; | |
5277 | |
5278 return retval; | |
5279 } | |
5280 | |
39 | 5281 /* |
5282 * Set the flags in the first block of the swap file: | |
5283 * - file is modified or not: buf->b_changed | |
5284 * - 'fileformat' | |
5285 * - 'fileencoding' | |
5286 */ | |
7 | 5287 void |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5288 ml_setflags(buf_T *buf) |
7 | 5289 { |
5290 bhdr_T *hp; | |
5291 ZERO_BL *b0p; | |
5292 | |
5293 if (!buf->b_ml.ml_mfp) | |
5294 return; | |
5295 for (hp = buf->b_ml.ml_mfp->mf_used_last; hp != NULL; hp = hp->bh_prev) | |
5296 { | |
5297 if (hp->bh_bnum == 0) | |
5298 { | |
5299 b0p = (ZERO_BL *)(hp->bh_data); | |
39 | 5300 b0p->b0_dirty = buf->b_changed ? B0_DIRTY : 0; |
5301 b0p->b0_flags = (b0p->b0_flags & ~B0_FF_MASK) | |
5302 | (get_fileformat(buf) + 1); | |
5303 add_b0_fenc(b0p, buf); | |
7 | 5304 hp->bh_flags |= BH_DIRTY; |
5305 mf_sync(buf->b_ml.ml_mfp, MFS_ZERO); | |
5306 break; | |
5307 } | |
5308 } | |
5309 } | |
5310 | |
2267 | 5311 #if defined(FEAT_CRYPT) || defined(PROTO) |
5312 /* | |
5313 * If "data" points to a data block encrypt the text in it and return a copy | |
5314 * in allocated memory. Return NULL when out of memory. | |
5315 * Otherwise return "data". | |
5316 */ | |
5317 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5318 ml_encrypt_data( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5319 memfile_T *mfp, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5320 char_u *data, |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
5321 off_T offset, |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5322 unsigned size) |
2267 | 5323 { |
5324 DATA_BL *dp = (DATA_BL *)data; | |
5325 char_u *head_end; | |
5326 char_u *text_start; | |
5327 char_u *new_data; | |
5328 int text_len; | |
6122 | 5329 cryptstate_T *state; |
2267 | 5330 |
5331 if (dp->db_id != DATA_ID) | |
5332 return data; | |
5333 | |
6817 | 5334 state = ml_crypt_prepare(mfp, offset, FALSE); |
5335 if (state == NULL) | |
5336 return data; | |
5337 | |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16786
diff
changeset
|
5338 new_data = alloc(size); |
2267 | 5339 if (new_data == NULL) |
5340 return NULL; | |
5341 head_end = (char_u *)(&dp->db_index[dp->db_line_count]); | |
5342 text_start = (char_u *)dp + dp->db_txt_start; | |
5343 text_len = size - dp->db_txt_start; | |
5344 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5345 // Copy the header and the text. |
2267 | 5346 mch_memmove(new_data, dp, head_end - (char_u *)dp); |
5347 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5348 // Encrypt the text. |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
5349 crypt_encode(state, text_start, text_len, new_data + dp->db_txt_start, |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
5350 FALSE); |
6122 | 5351 crypt_free_state(state); |
2267 | 5352 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5353 // Clear the gap. |
2267 | 5354 if (head_end < text_start) |
5355 vim_memset(new_data + (head_end - data), 0, text_start - head_end); | |
5356 | |
5357 return new_data; | |
5358 } | |
5359 | |
5360 /* | |
6817 | 5361 * Decrypt the text in "data" if it points to an encrypted data block. |
2267 | 5362 */ |
5363 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5364 ml_decrypt_data( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5365 memfile_T *mfp, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5366 char_u *data, |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
5367 off_T offset, |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5368 unsigned size) |
2267 | 5369 { |
5370 DATA_BL *dp = (DATA_BL *)data; | |
5371 char_u *head_end; | |
5372 char_u *text_start; | |
5373 int text_len; | |
6122 | 5374 cryptstate_T *state; |
2267 | 5375 |
5376 if (dp->db_id == DATA_ID) | |
5377 { | |
5378 head_end = (char_u *)(&dp->db_index[dp->db_line_count]); | |
5379 text_start = (char_u *)dp + dp->db_txt_start; | |
5380 text_len = dp->db_txt_end - dp->db_txt_start; | |
5381 | |
5382 if (head_end > text_start || dp->db_txt_start > size | |
5383 || dp->db_txt_end > size) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5384 return; // data was messed up |
2267 | 5385 |
6122 | 5386 state = ml_crypt_prepare(mfp, offset, TRUE); |
6817 | 5387 if (state != NULL) |
5388 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5389 // Decrypt the text in place. |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
5390 crypt_decode_inplace(state, text_start, text_len, FALSE); |
6817 | 5391 crypt_free_state(state); |
5392 } | |
2267 | 5393 } |
5394 } | |
5395 | |
5396 /* | |
5397 * Prepare for encryption/decryption, using the key, seed and offset. | |
6122 | 5398 * Return an allocated cryptstate_T *. |
2267 | 5399 */ |
6122 | 5400 static cryptstate_T * |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
5401 ml_crypt_prepare(memfile_T *mfp, off_T offset, int reading) |
2267 | 5402 { |
5403 buf_T *buf = mfp->mf_buffer; | |
5404 char_u salt[50]; | |
6122 | 5405 int method_nr; |
2267 | 5406 char_u *key; |
5407 char_u *seed; | |
5408 | |
5409 if (reading && mfp->mf_old_key != NULL) | |
5410 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5411 // Reading back blocks with the previous key/method/seed. |
6122 | 5412 method_nr = mfp->mf_old_cm; |
2267 | 5413 key = mfp->mf_old_key; |
5414 seed = mfp->mf_old_seed; | |
5415 } | |
5416 else | |
5417 { | |
6122 | 5418 method_nr = crypt_get_method_nr(buf); |
2267 | 5419 key = buf->b_p_key; |
5420 seed = mfp->mf_seed; | |
5421 } | |
6817 | 5422 if (*key == NUL) |
5423 return NULL; | |
2267 | 5424 |
6122 | 5425 if (method_nr == CRYPT_M_ZIP) |
2267 | 5426 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5427 // For PKzip: Append the offset to the key, so that we use a different |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5428 // key for every block. |
2267 | 5429 vim_snprintf((char *)salt, sizeof(salt), "%s%ld", key, (long)offset); |
6122 | 5430 return crypt_create(method_nr, salt, NULL, 0, NULL, 0); |
2267 | 5431 } |
6122 | 5432 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5433 // Using blowfish or better: add salt and seed. We use the byte offset |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5434 // of the block for the salt. |
6122 | 5435 vim_snprintf((char *)salt, sizeof(salt), "%ld", (long)offset); |
5436 return crypt_create(method_nr, key, salt, (int)STRLEN(salt), | |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
5437 seed, MF_SEED_LEN); |
2267 | 5438 } |
5439 | |
5440 #endif | |
5441 | |
5442 | |
7 | 5443 #if defined(FEAT_BYTEOFF) || defined(PROTO) |
5444 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5445 #define MLCS_MAXL 800 // max no of lines in chunk |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5446 #define MLCS_MINL 400 // should be half of MLCS_MAXL |
7 | 5447 |
5448 /* | |
2407
6bc102a4bff8
Fix memory access to 'cryptmethod' during recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2394
diff
changeset
|
5449 * Keep information for finding byte offset of a line, updtype may be one of: |
7 | 5450 * ML_CHNK_ADDLINE: Add len to parent chunk, possibly splitting it |
5451 * Careful: ML_CHNK_ADDLINE may cause ml_find_line() to be called. | |
5452 * ML_CHNK_DELLINE: Subtract len from parent chunk, possibly deleting it | |
5453 * ML_CHNK_UPDLINE: Add len to parent chunk, as a signed entity. | |
5454 */ | |
5455 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5456 ml_updatechunk( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5457 buf_T *buf, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5458 linenr_T line, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5459 long len, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5460 int updtype) |
7 | 5461 { |
5462 static buf_T *ml_upd_lastbuf = NULL; | |
5463 static linenr_T ml_upd_lastline; | |
5464 static linenr_T ml_upd_lastcurline; | |
5465 static int ml_upd_lastcurix; | |
5466 | |
5467 linenr_T curline = ml_upd_lastcurline; | |
5468 int curix = ml_upd_lastcurix; | |
5469 long size; | |
5470 chunksize_T *curchnk; | |
5471 int rest; | |
5472 bhdr_T *hp; | |
5473 DATA_BL *dp; | |
5474 | |
5475 if (buf->b_ml.ml_usedchunks == -1 || len == 0) | |
5476 return; | |
5477 if (buf->b_ml.ml_chunksize == NULL) | |
5478 { | |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16786
diff
changeset
|
5479 buf->b_ml.ml_chunksize = ALLOC_MULT(chunksize_T, 100); |
7 | 5480 if (buf->b_ml.ml_chunksize == NULL) |
5481 { | |
5482 buf->b_ml.ml_usedchunks = -1; | |
5483 return; | |
5484 } | |
5485 buf->b_ml.ml_numchunks = 100; | |
5486 buf->b_ml.ml_usedchunks = 1; | |
5487 buf->b_ml.ml_chunksize[0].mlcs_numlines = 1; | |
5488 buf->b_ml.ml_chunksize[0].mlcs_totalsize = 1; | |
5489 } | |
5490 | |
5491 if (updtype == ML_CHNK_UPDLINE && buf->b_ml.ml_line_count == 1) | |
5492 { | |
5493 /* | |
5494 * First line in empty buffer from ml_flush_line() -- reset | |
5495 */ | |
5496 buf->b_ml.ml_usedchunks = 1; | |
5497 buf->b_ml.ml_chunksize[0].mlcs_numlines = 1; | |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
5498 buf->b_ml.ml_chunksize[0].mlcs_totalsize = (long)buf->b_ml.ml_line_len; |
7 | 5499 return; |
5500 } | |
5501 | |
5502 /* | |
5503 * Find chunk that our line belongs to, curline will be at start of the | |
5504 * chunk. | |
5505 */ | |
5506 if (buf != ml_upd_lastbuf || line != ml_upd_lastline + 1 | |
5507 || updtype != ML_CHNK_ADDLINE) | |
5508 { | |
5509 for (curline = 1, curix = 0; | |
5510 curix < buf->b_ml.ml_usedchunks - 1 | |
5511 && line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines; | |
5512 curix++) | |
5513 curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines; | |
5514 } | |
14980
c98810dfebaf
patch 8.1.0501: cppcheck warns for using array index before bounds check
Bram Moolenaar <Bram@vim.org>
parents:
14923
diff
changeset
|
5515 else if (curix < buf->b_ml.ml_usedchunks - 1 |
c98810dfebaf
patch 8.1.0501: cppcheck warns for using array index before bounds check
Bram Moolenaar <Bram@vim.org>
parents:
14923
diff
changeset
|
5516 && line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines) |
7 | 5517 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5518 // Adjust cached curix & curline |
7 | 5519 curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines; |
5520 curix++; | |
5521 } | |
5522 curchnk = buf->b_ml.ml_chunksize + curix; | |
5523 | |
5524 if (updtype == ML_CHNK_DELLINE) | |
1030 | 5525 len = -len; |
7 | 5526 curchnk->mlcs_totalsize += len; |
5527 if (updtype == ML_CHNK_ADDLINE) | |
5528 { | |
5529 curchnk->mlcs_numlines++; | |
5530 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5531 // May resize here so we don't have to do it in both cases below |
7 | 5532 if (buf->b_ml.ml_usedchunks + 1 >= buf->b_ml.ml_numchunks) |
5533 { | |
6596 | 5534 chunksize_T *t_chunksize = buf->b_ml.ml_chunksize; |
5535 | |
7 | 5536 buf->b_ml.ml_numchunks = buf->b_ml.ml_numchunks * 3 / 2; |
21915
2559dc02bd64
patch 8.2.1507: using malloc() directly
Bram Moolenaar <Bram@vim.org>
parents:
21337
diff
changeset
|
5537 buf->b_ml.ml_chunksize = vim_realloc(buf->b_ml.ml_chunksize, |
7 | 5538 sizeof(chunksize_T) * buf->b_ml.ml_numchunks); |
5539 if (buf->b_ml.ml_chunksize == NULL) | |
5540 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5541 // Hmmmm, Give up on offset for this buffer |
6596 | 5542 vim_free(t_chunksize); |
7 | 5543 buf->b_ml.ml_usedchunks = -1; |
5544 return; | |
5545 } | |
5546 } | |
5547 | |
5548 if (buf->b_ml.ml_chunksize[curix].mlcs_numlines >= MLCS_MAXL) | |
5549 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5550 int count; // number of entries in block |
7 | 5551 int idx; |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5552 int end_idx; |
7 | 5553 int text_end; |
5554 int linecnt; | |
5555 | |
5556 mch_memmove(buf->b_ml.ml_chunksize + curix + 1, | |
5557 buf->b_ml.ml_chunksize + curix, | |
5558 (buf->b_ml.ml_usedchunks - curix) * | |
5559 sizeof(chunksize_T)); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5560 // Compute length of first half of lines in the split chunk |
7 | 5561 size = 0; |
5562 linecnt = 0; | |
5563 while (curline < buf->b_ml.ml_line_count | |
5564 && linecnt < MLCS_MINL) | |
5565 { | |
5566 if ((hp = ml_find_line(buf, curline, ML_FIND)) == NULL) | |
5567 { | |
5568 buf->b_ml.ml_usedchunks = -1; | |
5569 return; | |
5570 } | |
5571 dp = (DATA_BL *)(hp->bh_data); | |
5572 count = (long)(buf->b_ml.ml_locked_high) - | |
5573 (long)(buf->b_ml.ml_locked_low) + 1; | |
5574 idx = curline - buf->b_ml.ml_locked_low; | |
5575 curline = buf->b_ml.ml_locked_high + 1; | |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5576 |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5577 // compute index of last line to use in this MEMLINE |
7 | 5578 rest = count - idx; |
5579 if (linecnt + rest > MLCS_MINL) | |
5580 { | |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5581 end_idx = idx + MLCS_MINL - linecnt - 1; |
7 | 5582 linecnt = MLCS_MINL; |
5583 } | |
5584 else | |
5585 { | |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5586 end_idx = count - 1; |
7 | 5587 linecnt += rest; |
5588 } | |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5589 #ifdef FEAT_PROP_POPUP |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5590 if (buf->b_has_textprop) |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5591 { |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5592 int i; |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5593 |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5594 // We cannot use the text pointers to get the text length, |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5595 // the text prop info would also be counted. Go over the |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5596 // lines. |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5597 for (i = end_idx; i < idx; ++i) |
15353
21580db06cf3
patch 8.1.0684: warnings from 64-bit compiler
Bram Moolenaar <Bram@vim.org>
parents:
15294
diff
changeset
|
5598 size += (int)STRLEN((char_u *)dp + (dp->db_index[i] & DB_INDEX_MASK)) + 1; |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5599 } |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5600 else |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5601 #endif |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5602 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5603 if (idx == 0)// first line in block, text at the end |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5604 text_end = dp->db_txt_end; |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5605 else |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5606 text_end = ((dp->db_index[idx - 1]) & DB_INDEX_MASK); |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5607 size += text_end - ((dp->db_index[end_idx]) & DB_INDEX_MASK); |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5608 } |
7 | 5609 } |
5610 buf->b_ml.ml_chunksize[curix].mlcs_numlines = linecnt; | |
5611 buf->b_ml.ml_chunksize[curix + 1].mlcs_numlines -= linecnt; | |
5612 buf->b_ml.ml_chunksize[curix].mlcs_totalsize = size; | |
5613 buf->b_ml.ml_chunksize[curix + 1].mlcs_totalsize -= size; | |
5614 buf->b_ml.ml_usedchunks++; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5615 ml_upd_lastbuf = NULL; // Force recalc of curix & curline |
7 | 5616 return; |
5617 } | |
5618 else if (buf->b_ml.ml_chunksize[curix].mlcs_numlines >= MLCS_MINL | |
5619 && curix == buf->b_ml.ml_usedchunks - 1 | |
5620 && buf->b_ml.ml_line_count - line <= 1) | |
5621 { | |
5622 /* | |
23229
b545334ae654
patch 8.2.2160: various typos
Bram Moolenaar <Bram@vim.org>
parents:
22959
diff
changeset
|
5623 * We are in the last chunk and it is cheap to create a new one |
7 | 5624 * after this. Do it now to avoid the loop above later on |
5625 */ | |
5626 curchnk = buf->b_ml.ml_chunksize + curix + 1; | |
5627 buf->b_ml.ml_usedchunks++; | |
5628 if (line == buf->b_ml.ml_line_count) | |
5629 { | |
5630 curchnk->mlcs_numlines = 0; | |
5631 curchnk->mlcs_totalsize = 0; | |
5632 } | |
5633 else | |
5634 { | |
5635 /* | |
5636 * Line is just prior to last, move count for last | |
5637 * This is the common case when loading a new file | |
5638 */ | |
5639 hp = ml_find_line(buf, buf->b_ml.ml_line_count, ML_FIND); | |
5640 if (hp == NULL) | |
5641 { | |
5642 buf->b_ml.ml_usedchunks = -1; | |
5643 return; | |
5644 } | |
5645 dp = (DATA_BL *)(hp->bh_data); | |
5646 if (dp->db_line_count == 1) | |
5647 rest = dp->db_txt_end - dp->db_txt_start; | |
5648 else | |
5649 rest = | |
5650 ((dp->db_index[dp->db_line_count - 2]) & DB_INDEX_MASK) | |
5651 - dp->db_txt_start; | |
5652 curchnk->mlcs_totalsize = rest; | |
5653 curchnk->mlcs_numlines = 1; | |
5654 curchnk[-1].mlcs_totalsize -= rest; | |
5655 curchnk[-1].mlcs_numlines -= 1; | |
5656 } | |
5657 } | |
5658 } | |
5659 else if (updtype == ML_CHNK_DELLINE) | |
5660 { | |
5661 curchnk->mlcs_numlines--; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5662 ml_upd_lastbuf = NULL; // Force recalc of curix & curline |
7 | 5663 if (curix < (buf->b_ml.ml_usedchunks - 1) |
5664 && (curchnk->mlcs_numlines + curchnk[1].mlcs_numlines) | |
5665 <= MLCS_MINL) | |
5666 { | |
5667 curix++; | |
5668 curchnk = buf->b_ml.ml_chunksize + curix; | |
5669 } | |
5670 else if (curix == 0 && curchnk->mlcs_numlines <= 0) | |
5671 { | |
5672 buf->b_ml.ml_usedchunks--; | |
5673 mch_memmove(buf->b_ml.ml_chunksize, buf->b_ml.ml_chunksize + 1, | |
5674 buf->b_ml.ml_usedchunks * sizeof(chunksize_T)); | |
5675 return; | |
5676 } | |
5677 else if (curix == 0 || (curchnk->mlcs_numlines > 10 | |
5678 && (curchnk->mlcs_numlines + curchnk[-1].mlcs_numlines) | |
5679 > MLCS_MINL)) | |
5680 { | |
5681 return; | |
5682 } | |
5683 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5684 // Collapse chunks |
7 | 5685 curchnk[-1].mlcs_numlines += curchnk->mlcs_numlines; |
5686 curchnk[-1].mlcs_totalsize += curchnk->mlcs_totalsize; | |
5687 buf->b_ml.ml_usedchunks--; | |
5688 if (curix < buf->b_ml.ml_usedchunks) | |
5689 { | |
5690 mch_memmove(buf->b_ml.ml_chunksize + curix, | |
5691 buf->b_ml.ml_chunksize + curix + 1, | |
5692 (buf->b_ml.ml_usedchunks - curix) * | |
5693 sizeof(chunksize_T)); | |
5694 } | |
5695 return; | |
5696 } | |
5697 ml_upd_lastbuf = buf; | |
5698 ml_upd_lastline = line; | |
5699 ml_upd_lastcurline = curline; | |
5700 ml_upd_lastcurix = curix; | |
5701 } | |
5702 | |
5703 /* | |
5704 * Find offset for line or line with offset. | |
169 | 5705 * Find line with offset if "lnum" is 0; return remaining offset in offp |
5706 * Find offset of line if "lnum" > 0 | |
7 | 5707 * return -1 if information is not available |
5708 */ | |
5709 long | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5710 ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp) |
7 | 5711 { |
5712 linenr_T curline; | |
5713 int curix; | |
5714 long size; | |
5715 bhdr_T *hp; | |
5716 DATA_BL *dp; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5717 int count; // number of entries in block |
7 | 5718 int idx; |
5719 int start_idx; | |
5720 int text_end; | |
5721 long offset; | |
5722 int len; | |
5723 int ffdos = (get_fileformat(buf) == EOL_DOS); | |
5724 int extra = 0; | |
5725 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5726 // take care of cached line first |
169 | 5727 ml_flush_line(curbuf); |
5728 | |
7 | 5729 if (buf->b_ml.ml_usedchunks == -1 |
5730 || buf->b_ml.ml_chunksize == NULL | |
169 | 5731 || lnum < 0) |
7 | 5732 return -1; |
5733 | |
5734 if (offp == NULL) | |
5735 offset = 0; | |
5736 else | |
5737 offset = *offp; | |
169 | 5738 if (lnum == 0 && offset <= 0) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5739 return 1; // Not a "find offset" and offset 0 _must_ be in line 1 |
7 | 5740 /* |
5741 * Find the last chunk before the one containing our line. Last chunk is | |
5742 * special because it will never qualify | |
5743 */ | |
5744 curline = 1; | |
5745 curix = size = 0; | |
5746 while (curix < buf->b_ml.ml_usedchunks - 1 | |
169 | 5747 && ((lnum != 0 |
5748 && lnum >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines) | |
7 | 5749 || (offset != 0 |
5750 && offset > size + buf->b_ml.ml_chunksize[curix].mlcs_totalsize | |
5751 + ffdos * buf->b_ml.ml_chunksize[curix].mlcs_numlines))) | |
5752 { | |
5753 curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines; | |
5754 size += buf->b_ml.ml_chunksize[curix].mlcs_totalsize; | |
5755 if (offset && ffdos) | |
5756 size += buf->b_ml.ml_chunksize[curix].mlcs_numlines; | |
5757 curix++; | |
5758 } | |
5759 | |
169 | 5760 while ((lnum != 0 && curline < lnum) || (offset != 0 && size < offset)) |
7 | 5761 { |
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5762 #ifdef FEAT_PROP_POPUP |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5763 size_t textprop_total = 0; |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5764 #endif |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5765 |
7 | 5766 if (curline > buf->b_ml.ml_line_count |
5767 || (hp = ml_find_line(buf, curline, ML_FIND)) == NULL) | |
5768 return -1; | |
5769 dp = (DATA_BL *)(hp->bh_data); | |
5770 count = (long)(buf->b_ml.ml_locked_high) - | |
5771 (long)(buf->b_ml.ml_locked_low) + 1; | |
5772 start_idx = idx = curline - buf->b_ml.ml_locked_low; | |
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5773 if (idx == 0) // first line in block, text at the end |
7 | 5774 text_end = dp->db_txt_end; |
5775 else | |
5776 text_end = ((dp->db_index[idx - 1]) & DB_INDEX_MASK); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5777 // Compute index of last line to use in this MEMLINE |
169 | 5778 if (lnum != 0) |
7 | 5779 { |
169 | 5780 if (curline + (count - idx) >= lnum) |
5781 idx += lnum - curline - 1; | |
7 | 5782 else |
5783 idx = count - 1; | |
5784 } | |
5785 else | |
5786 { | |
5787 extra = 0; | |
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5788 for (;;) |
7 | 5789 { |
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5790 #ifdef FEAT_PROP_POPUP |
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5791 size_t textprop_size = 0; |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5792 |
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5793 if (buf->b_has_textprop) |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5794 { |
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5795 char_u *l1, *l2; |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5796 |
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5797 // compensate for the extra bytes taken by textprops |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5798 l1 = (char_u *)dp + ((dp->db_index[idx]) & DB_INDEX_MASK); |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5799 l2 = (char_u *)dp + (idx == 0 ? dp->db_txt_end |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5800 : ((dp->db_index[idx - 1]) & DB_INDEX_MASK)); |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5801 textprop_size = (l2 - l1) - (STRLEN(l1) + 1); |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5802 } |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5803 #endif |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5804 if (!(offset >= size |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5805 + text_end - (int)((dp->db_index[idx]) & DB_INDEX_MASK) |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5806 #ifdef FEAT_PROP_POPUP |
19133
dc6a0b05b082
patch 8.2.0126: textprop test fails
Bram Moolenaar <Bram@vim.org>
parents:
19129
diff
changeset
|
5807 - (long)(textprop_total + textprop_size) |
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5808 #endif |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5809 + ffdos)) |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5810 break; |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5811 |
7 | 5812 if (ffdos) |
5813 size++; | |
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5814 #ifdef FEAT_PROP_POPUP |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5815 textprop_total += textprop_size; |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5816 #endif |
7 | 5817 if (idx == count - 1) |
5818 { | |
5819 extra = 1; | |
5820 break; | |
5821 } | |
5822 idx++; | |
5823 } | |
5824 } | |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5825 #ifdef FEAT_PROP_POPUP |
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5826 if (buf->b_has_textprop && lnum != 0) |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5827 { |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5828 int i; |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5829 |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5830 // cannot use the db_index pointer, need to get the actual text |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5831 // lengths. |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5832 len = 0; |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5833 for (i = start_idx; i <= idx; ++i) |
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5834 { |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5835 char_u *p = (char_u *)dp + ((dp->db_index[i]) & DB_INDEX_MASK); |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5836 len += (int)STRLEN(p) + 1; |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5837 } |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5838 } |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5839 else |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5840 #endif |
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5841 len = text_end - ((dp->db_index[idx]) & DB_INDEX_MASK) |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5842 #ifdef FEAT_PROP_POPUP |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5843 - (long)textprop_total |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5844 #endif |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5845 ; |
7 | 5846 size += len; |
5847 if (offset != 0 && size >= offset) | |
5848 { | |
5849 if (size + ffdos == offset) | |
5850 *offp = 0; | |
5851 else if (idx == start_idx) | |
5852 *offp = offset - size + len; | |
5853 else | |
5854 *offp = offset - size + len | |
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5855 - (text_end - ((dp->db_index[idx - 1]) & DB_INDEX_MASK)) |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5856 #ifdef FEAT_PROP_POPUP |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5857 + (long)textprop_total |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5858 #endif |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5859 ; |
7 | 5860 curline += idx - start_idx + extra; |
5861 if (curline > buf->b_ml.ml_line_count) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5862 return -1; // exactly one byte beyond the end |
7 | 5863 return curline; |
5864 } | |
5865 curline = buf->b_ml.ml_locked_high + 1; | |
5866 } | |
5867 | |
169 | 5868 if (lnum != 0) |
20 | 5869 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5870 // Count extra CR characters. |
20 | 5871 if (ffdos) |
169 | 5872 size += lnum - 1; |
20 | 5873 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5874 // Don't count the last line break if 'noeol' and ('bin' or |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5875 // 'nofixeol'). |
6933 | 5876 if ((!buf->b_p_fixeol || buf->b_p_bin) && !buf->b_p_eol |
14579
23d6d9e9ae3e
patch 8.1.0303: line2byte() is wrong for last line with 'noeol'
Christian Brabandt <cb@256bit.org>
parents:
14475
diff
changeset
|
5877 && lnum > buf->b_ml.ml_line_count) |
20 | 5878 size -= ffdos + 1; |
5879 } | |
5880 | |
7 | 5881 return size; |
5882 } | |
5883 | |
5884 /* | |
5885 * Goto byte in buffer with offset 'cnt'. | |
5886 */ | |
5887 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5888 goto_byte(long cnt) |
7 | 5889 { |
5890 long boff = cnt; | |
5891 linenr_T lnum; | |
5892 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5893 ml_flush_line(curbuf); // cached line may be dirty |
7 | 5894 setpcmark(); |
5895 if (boff) | |
5896 --boff; | |
5897 lnum = ml_find_line_or_offset(curbuf, (linenr_T)0, &boff); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5898 if (lnum < 1) // past the end |
7 | 5899 { |
5900 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
5901 curwin->w_curswant = MAXCOL; | |
5902 coladvance((colnr_T)MAXCOL); | |
5903 } | |
5904 else | |
5905 { | |
5906 curwin->w_cursor.lnum = lnum; | |
5907 curwin->w_cursor.col = (colnr_T)boff; | |
572 | 5908 curwin->w_cursor.coladd = 0; |
7 | 5909 curwin->w_set_curswant = TRUE; |
5910 } | |
5911 check_cursor(); | |
5912 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5913 // Make sure the cursor is on the first byte of a multi-byte char. |
7 | 5914 if (has_mbyte) |
5915 mb_adjust_cursor(); | |
5916 } | |
5917 #endif |