Mercurial > vim
annotate src/memline.c @ 32164:673dcbaded32 v9.0.1413
patch 9.0.1413: compiler warning for unused variable
Commit: https://github.com/vim/vim/commit/2a003177eb3cee535bb8a384b4b87db13f0486ae
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Mar 17 18:50:48 2023 +0000
patch 9.0.1413: compiler warning for unused variable
Problem: Compiler warning for unused variable.
Solution: Move variable declaration. (John Marriott)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 17 Mar 2023 20:00:06 +0100 |
parents | 9f28cca2410a |
children | 9b0c304500cc |
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 | |
1030 | 51 #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
|
52 # include <proto/dos.h> // for Open() and Close() |
7 | 53 #endif |
54 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
55 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
|
56 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
|
57 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
|
58 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
|
59 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
60 #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
|
61 #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
|
62 #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
|
63 #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
|
64 #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
|
65 #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
|
66 #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
|
67 #define BLOCK0_ID1_C3 'S' // block 0 id 1 'cm' 3 - but not actually used |
6122 | 68 |
69 #if defined(FEAT_CRYPT) | |
70 static int id1_codes[] = { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
71 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
|
72 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
|
73 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
|
74 BLOCK0_ID1_C3, // CRYPT_M_SOD - Unused! |
6122 | 75 }; |
76 #endif | |
7 | 77 |
78 /* | |
79 * pointer to a block, used in a pointer block | |
80 */ | |
81 struct pointer_entry | |
82 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
83 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
|
84 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
|
85 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
|
86 int pe_page_count; // number of pages in block pe_bnum |
7 | 87 }; |
88 | |
89 /* | |
90 * A pointer block contains a list of branches in the tree. | |
91 */ | |
92 struct pointer_block | |
93 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
94 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
|
95 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
|
96 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
|
97 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
|
98 // followed by empty space until end of page |
7 | 99 }; |
100 | |
101 /* | |
102 * A data block is a leaf in the tree. | |
103 * | |
104 * The text of the lines is at the end of the block. The text of the first line | |
105 * in the block is put at the end, the text of the second line in front of it, | |
106 * etc. Thus the order of the lines is the opposite of the line number. | |
107 */ | |
108 struct data_block | |
109 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
110 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
|
111 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
|
112 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
|
113 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
|
114 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
|
115 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
|
116 // 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
|
117 // 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
|
118 // end of page |
7 | 119 }; |
120 | |
121 /* | |
122 * The low bits of db_index hold the actual index. The topmost bit is | |
123 * used for the global command to be able to mark a line. | |
124 * This method is not clean, but otherwise there would be at least one extra | |
125 * byte used for each line. | |
126 * The mark has to be in this place to keep it with the correct line when other | |
127 * lines are inserted or deleted. | |
128 */ | |
129 #define DB_MARKED ((unsigned)1 << ((sizeof(unsigned) * 8) - 1)) | |
130 #define DB_INDEX_MASK (~DB_MARKED) | |
131 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
132 #define INDEX_SIZE (sizeof(unsigned)) // size of one db_index entry |
31877
9f28cca2410a
patch 9.0.1271: using sizeof() and subtract array size is tricky
Bram Moolenaar <Bram@vim.org>
parents:
31728
diff
changeset
|
133 #define HEADER_SIZE (offsetof(DATA_BL, db_index)) // size of data block header |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
134 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
135 #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
|
136 #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
|
137 #define B0_FNAME_SIZE_CRYPT 890 // 10 bytes used for other things |
39 | 138 #define B0_UNAME_SIZE 40 |
139 #define B0_HNAME_SIZE 40 | |
7 | 140 /* |
141 * Restrict the numbers to 32 bits, otherwise most compilers will complain. | |
142 * This won't detect a 64 bit machine that only swaps a byte in the top 32 | |
143 * bits, but that is crazy anyway. | |
144 */ | |
145 #define B0_MAGIC_LONG 0x30313233L | |
146 #define B0_MAGIC_INT 0x20212223L | |
147 #define B0_MAGIC_SHORT 0x10111213L | |
148 #define B0_MAGIC_CHAR 0x55 | |
149 | |
150 /* | |
151 * Block zero holds all info about the swap file. | |
152 * | |
153 * NOTE: DEFINITION OF BLOCK 0 SHOULD NOT CHANGE! It would make all existing | |
154 * swap files unusable! | |
155 * | |
156 * If size of block0 changes anyway, adjust MIN_SWAP_PAGE_SIZE in vim.h!! | |
157 * | |
1228 | 158 * This block is built up of single bytes, to make it portable across |
7 | 159 * different machines. b0_magic_* is used to check the byte order and size of |
160 * variables, because the rest of the swap file is not portable. | |
161 */ | |
162 struct block0 | |
163 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
164 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
|
165 // 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
|
166 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
|
167 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
|
168 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
|
169 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
|
170 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
|
171 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
|
172 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
|
173 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
|
174 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
|
175 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
|
176 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
|
177 char_u b0_magic_char; // check for last char |
7 | 178 }; |
39 | 179 |
180 /* | |
625 | 181 * Note: b0_dirty and b0_flags are put at the end of the file name. For very |
39 | 182 * long file names in older versions of Vim they are invalid. |
183 * The 'fileencoding' comes before b0_flags, with a NUL in front. But only | |
184 * when there is room, for very long file names it's omitted. | |
185 */ | |
186 #define B0_DIRTY 0x55 | |
2267 | 187 #define b0_dirty b0_fname[B0_FNAME_SIZE_ORG - 1] |
39 | 188 |
189 /* | |
190 * The b0_flags field is new in Vim 7.0. | |
191 */ | |
2267 | 192 #define b0_flags b0_fname[B0_FNAME_SIZE_ORG - 2] |
193 | |
194 /* | |
195 * Crypt seed goes here, 8 bytes. New in Vim 7.3. | |
196 * Without encryption these bytes may be used for 'fenc'. | |
197 */ | |
198 #define b0_seed b0_fname[B0_FNAME_SIZE_ORG - 2 - MF_SEED_LEN] | |
39 | 199 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
200 // 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
|
201 // (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
|
202 // EOL_MAC + 1. |
39 | 203 #define B0_FF_MASK 3 |
204 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
205 // 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
|
206 // different mount points. |
39 | 207 #define B0_SAME_DIR 4 |
208 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
209 // 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
|
210 // When empty there is only the NUL. |
39 | 211 #define B0_HAS_FENC 8 |
7 | 212 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
213 #define STACK_INCR 5 // nr of entries added to ml_stack at a time |
7 | 214 |
215 /* | |
216 * The line number where the first mark may be is remembered. | |
217 * If it is 0 there are no marks at all. | |
218 * (always used for the current buffer only, no buffer change possible while | |
219 * executing a global command). | |
220 */ | |
221 static linenr_T lowest_marked = 0; | |
222 | |
223 /* | |
224 * arguments for ml_find_line() | |
225 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
226 #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
|
227 #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
|
228 #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
|
229 #define ML_FLUSH 0x02 // flush locked block |
27752
c1d1639b52dd
patch 8.2.4402: missing parenthesis may cause unexpected problems
Bram Moolenaar <Bram@vim.org>
parents:
27746
diff
changeset
|
230 #define ML_SIMPLE(x) ((x) & 0x10) // DEL, INS or FIND |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
231 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
232 // argument for ml_upd_block0() |
2267 | 233 typedef enum { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
234 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
|
235 , 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
|
236 , UB_CRYPT // update crypt key |
2267 | 237 } upd_block0_T; |
238 | |
239 #ifdef FEAT_CRYPT | |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
240 static void ml_set_b0_crypt(buf_T *buf, ZERO_BL *b0p); |
2267 | 241 #endif |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
242 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
|
243 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
|
244 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
|
245 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
|
246 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
|
247 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
|
248 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
|
249 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
|
250 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
|
251 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
|
252 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
|
253 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
|
254 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
|
255 static int b0_magic_wrong(ZERO_BL *); |
7 | 256 #ifdef CHECK_INODE |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
257 static int fnamecmp_ino(char_u *, char_u *, long); |
7 | 258 #endif |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
259 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
|
260 static long char_to_long(char_u *); |
2267 | 261 #ifdef FEAT_CRYPT |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
262 static cryptstate_T *ml_crypt_prepare(memfile_T *mfp, off_T offset, int reading); |
2267 | 263 #endif |
7 | 264 #ifdef FEAT_BYTEOFF |
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
265 static void ml_updatechunk(buf_T *buf, long line, long len, int updtype); |
7 | 266 #endif |
267 | |
268 /* | |
625 | 269 * Open a new memline for "buf". |
7 | 270 * |
625 | 271 * Return FAIL for failure, OK otherwise. |
7 | 272 */ |
273 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
274 ml_open(buf_T *buf) |
7 | 275 { |
276 memfile_T *mfp; | |
277 bhdr_T *hp = NULL; | |
278 ZERO_BL *b0p; | |
279 PTR_BL *pp; | |
280 DATA_BL *dp; | |
281 | |
625 | 282 /* |
283 * init fields in memline struct | |
284 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
285 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
|
286 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
|
287 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
|
288 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
|
289 buf->b_ml.ml_line_lnum = 0; // no cached line |
7 | 290 #ifdef FEAT_BYTEOFF |
625 | 291 buf->b_ml.ml_chunksize = NULL; |
25678
4da50e168dc9
patch 8.2.3375: using uninitialized memory
Bram Moolenaar <Bram@vim.org>
parents:
25672
diff
changeset
|
292 buf->b_ml.ml_usedchunks = 0; |
7 | 293 #endif |
294 | |
22699
e82579016863
patch 8.2.1898: command modifier parsing always uses global cmdmod
Bram Moolenaar <Bram@vim.org>
parents:
22242
diff
changeset
|
295 if (cmdmod.cmod_flags & CMOD_NOSWAPFILE) |
5737 | 296 buf->b_p_swf = FALSE; |
297 | |
625 | 298 /* |
299 * When 'updatecount' is non-zero swap file may be opened later. | |
300 */ | |
301 if (p_uc && buf->b_p_swf) | |
302 buf->b_may_swap = TRUE; | |
7 | 303 else |
625 | 304 buf->b_may_swap = FALSE; |
305 | |
306 /* | |
307 * Open the memfile. No swap file is created yet. | |
308 */ | |
7 | 309 mfp = mf_open(NULL, 0); |
310 if (mfp == NULL) | |
311 goto error; | |
312 | |
625 | 313 buf->b_ml.ml_mfp = mfp; |
2267 | 314 #ifdef FEAT_CRYPT |
315 mfp->mf_buffer = buf; | |
316 #endif | |
625 | 317 buf->b_ml.ml_flags = ML_EMPTY; |
318 buf->b_ml.ml_line_count = 1; | |
7 | 319 |
320 /* | |
321 * fill block0 struct and write page 0 | |
322 */ | |
323 if ((hp = mf_new(mfp, FALSE, 1)) == NULL) | |
324 goto error; | |
325 if (hp->bh_bnum != 0) | |
326 { | |
26897
d02d40f0261c
patch 8.2.3977: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
327 iemsg(_(e_didnt_get_block_nr_zero)); |
7 | 328 goto error; |
329 } | |
330 b0p = (ZERO_BL *)(hp->bh_data); | |
331 | |
332 b0p->b0_id[0] = BLOCK0_ID0; | |
333 b0p->b0_id[1] = BLOCK0_ID1; | |
334 b0p->b0_magic_long = (long)B0_MAGIC_LONG; | |
335 b0p->b0_magic_int = (int)B0_MAGIC_INT; | |
336 b0p->b0_magic_short = (short)B0_MAGIC_SHORT; | |
337 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
|
338 mch_memmove(b0p->b0_version, "VIM ", 4); |
7 | 339 STRNCPY(b0p->b0_version + 4, Version, 6); |
340 long_to_char((long)mfp->mf_page_size, b0p->b0_page_size); | |
625 | 341 |
800 | 342 #ifdef FEAT_SPELL |
343 if (!buf->b_spell) | |
344 #endif | |
625 | 345 { |
346 b0p->b0_dirty = buf->b_changed ? B0_DIRTY : 0; | |
347 b0p->b0_flags = get_fileformat(buf) + 1; | |
348 set_b0_fname(b0p, buf); | |
349 (void)get_user_name(b0p->b0_uname, B0_UNAME_SIZE); | |
350 b0p->b0_uname[B0_UNAME_SIZE - 1] = NUL; | |
351 mch_get_host_name(b0p->b0_hname, B0_HNAME_SIZE); | |
352 b0p->b0_hname[B0_HNAME_SIZE - 1] = NUL; | |
353 long_to_char(mch_get_pid(), b0p->b0_pid); | |
2267 | 354 #ifdef FEAT_CRYPT |
6122 | 355 ml_set_b0_crypt(buf, b0p); |
2267 | 356 #endif |
625 | 357 } |
7 | 358 |
359 /* | |
360 * Always sync block number 0 to disk, so we can check the file name in | |
2267 | 361 * the swap file in findswapname(). Don't do this for a help files or |
362 * a spell buffer though. | |
7 | 363 * Only works when there's a swapfile, otherwise it's done when the file |
364 * is created. | |
365 */ | |
366 mf_put(mfp, hp, TRUE, FALSE); | |
625 | 367 if (!buf->b_help && !B_SPELL(buf)) |
7 | 368 (void)mf_sync(mfp, 0); |
369 | |
625 | 370 /* |
371 * Fill in root pointer block and write page 1. | |
372 */ | |
7 | 373 if ((hp = ml_new_ptr(mfp)) == NULL) |
374 goto error; | |
375 if (hp->bh_bnum != 1) | |
376 { | |
26897
d02d40f0261c
patch 8.2.3977: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
377 iemsg(_(e_didnt_get_block_nr_one)); |
7 | 378 goto error; |
379 } | |
380 pp = (PTR_BL *)(hp->bh_data); | |
381 pp->pb_count = 1; | |
382 pp->pb_pointer[0].pe_bnum = 2; | |
383 pp->pb_pointer[0].pe_page_count = 1; | |
384 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
|
385 pp->pb_pointer[0].pe_line_count = 1; // line count after insertion |
7 | 386 mf_put(mfp, hp, TRUE, FALSE); |
387 | |
625 | 388 /* |
389 * Allocate first data block and create an empty line 1. | |
390 */ | |
7 | 391 if ((hp = ml_new_data(mfp, FALSE, 1)) == NULL) |
392 goto error; | |
393 if (hp->bh_bnum != 2) | |
394 { | |
26897
d02d40f0261c
patch 8.2.3977: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
395 iemsg(_(e_didnt_get_block_nr_two)); |
7 | 396 goto error; |
397 } | |
398 | |
399 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
|
400 dp->db_index[0] = --dp->db_txt_start; // at end of block |
7 | 401 dp->db_free -= 1 + INDEX_SIZE; |
402 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
|
403 *((char_u *)dp + dp->db_txt_start) = NUL; // empty line |
7 | 404 |
405 return OK; | |
406 | |
407 error: | |
408 if (mfp != NULL) | |
409 { | |
410 if (hp) | |
411 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
|
412 mf_close(mfp, TRUE); // will also free(mfp->mf_fname) |
7 | 413 } |
625 | 414 buf->b_ml.ml_mfp = NULL; |
7 | 415 return FAIL; |
416 } | |
417 | |
2267 | 418 #if defined(FEAT_CRYPT) || defined(PROTO) |
419 /* | |
6130 | 420 * Prepare encryption for "buf" for the current key and method. |
421 */ | |
422 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
423 ml_set_mfp_crypt(buf_T *buf) |
6130 | 424 { |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
425 if (*buf->b_p_key == NUL) |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
426 return; |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
427 |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
428 int method_nr = crypt_get_method_nr(buf); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
429 |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
430 if (method_nr > CRYPT_M_ZIP && method_nr < CRYPT_M_SOD) |
6130 | 431 { |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
432 // Generate a seed and store it in the memfile. |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
433 sha2_seed(buf->b_ml.ml_mfp->mf_seed, MF_SEED_LEN, NULL, 0); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
434 } |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
435 #ifdef FEAT_SODIUM |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
436 else if (method_nr == CRYPT_M_SOD) |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
437 crypt_sodium_randombytes_buf(buf->b_ml.ml_mfp->mf_seed, |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
438 MF_SEED_LEN); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
439 #endif |
6130 | 440 } |
441 | |
442 /* | |
2267 | 443 * Prepare encryption for "buf" with block 0 "b0p". |
444 */ | |
445 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
446 ml_set_b0_crypt(buf_T *buf, ZERO_BL *b0p) |
2267 | 447 { |
448 if (*buf->b_p_key == NUL) | |
449 b0p->b0_id[1] = BLOCK0_ID1; | |
450 else | |
451 { | |
6122 | 452 int method_nr = crypt_get_method_nr(buf); |
453 | |
454 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
|
455 if (method_nr > CRYPT_M_ZIP && method_nr < CRYPT_M_SOD) |
2267 | 456 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
457 // Generate a seed and store it in block 0 and in the memfile. |
2267 | 458 sha2_seed(&b0p->b0_seed, MF_SEED_LEN, NULL, 0); |
459 mch_memmove(buf->b_ml.ml_mfp->mf_seed, &b0p->b0_seed, MF_SEED_LEN); | |
460 } | |
461 } | |
462 } | |
463 | |
464 /* | |
465 * Called after the crypt key or 'cryptmethod' was changed for "buf". | |
466 * Will apply this to the swapfile. | |
467 * "old_key" is the previous key. It is equal to buf->b_p_key when | |
468 * '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
|
469 * "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
|
470 * 'cryptmethod' when 'key' is changed. |
2267 | 471 */ |
472 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
473 ml_set_crypt_key( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
474 buf_T *buf, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
475 char_u *old_key, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
476 char_u *old_cm) |
2267 | 477 { |
478 memfile_T *mfp = buf->b_ml.ml_mfp; | |
479 bhdr_T *hp; | |
480 int page_count; | |
481 int idx; | |
482 long error; | |
483 infoptr_T *ip; | |
484 PTR_BL *pp; | |
485 DATA_BL *dp; | |
486 blocknr_T bnum; | |
487 int top; | |
6817 | 488 int old_method; |
2267 | 489 |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
490 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
|
491 return; // no memfile yet, nothing to do |
6817 | 492 old_method = crypt_method_nr_from_name(old_cm); |
493 | |
24990
85d1e82ed134
patch 8.2.3032: build problems with MSVC, other crypt issues with libsodium
Bram Moolenaar <Bram@vim.org>
parents:
24970
diff
changeset
|
494 // 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
|
495 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
|
496 { |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
497 // close the swapfile |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
498 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
|
499 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
|
500 return; |
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
501 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
502 // 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
|
503 // key and method. |
6817 | 504 { |
505 char_u *new_key = buf->b_p_key; | |
506 char_u *new_buf_cm = buf->b_p_cm; | |
507 | |
508 buf->b_p_key = old_key; | |
509 buf->b_p_cm = old_cm; | |
510 ml_preserve(buf, FALSE); | |
511 buf->b_p_key = new_key; | |
512 buf->b_p_cm = new_buf_cm; | |
513 } | |
2267 | 514 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
515 // 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
|
516 // old values. |
2267 | 517 mfp->mf_old_key = old_key; |
6817 | 518 mfp->mf_old_cm = old_method; |
519 if (old_method > 0 && *old_key != NUL) | |
2267 | 520 mch_memmove(mfp->mf_old_seed, mfp->mf_seed, MF_SEED_LEN); |
521 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
522 // Update block 0 with the crypt flag and may set a new seed. |
2267 | 523 ml_upd_block0(buf, UB_CRYPT); |
524 | |
525 if (mfp->mf_infile_count > 2) | |
526 { | |
527 /* | |
528 * Need to read back all data blocks from disk, decrypt them with the | |
529 * old key/method and mark them to be written. The algorithm is | |
530 * similar to what happens in ml_recover(), but we skip negative block | |
531 * numbers. | |
532 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
533 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
|
534 (void)ml_find_line(buf, (linenr_T)0, ML_FLUSH); // flush locked block |
2267 | 535 |
536 hp = NULL; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
537 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
|
538 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
|
539 idx = 0; // start with first index in block 1 |
2267 | 540 error = 0; |
541 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
|
542 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
|
543 buf->b_ml.ml_stack_size = 0; // no stack yet |
2267 | 544 |
545 for ( ; !got_int; line_breakcheck()) | |
546 { | |
547 if (hp != NULL) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
548 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
|
549 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
550 // get the block (pointer or data) |
27426
41e0dcf38521
patch 8.2.4241: some type casts are redundant
Bram Moolenaar <Bram@vim.org>
parents:
27231
diff
changeset
|
551 if ((hp = mf_get(mfp, bnum, page_count)) == NULL) |
2267 | 552 { |
553 if (bnum == 1) | |
554 break; | |
555 ++error; | |
556 } | |
557 else | |
558 { | |
559 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
|
560 if (pp->pb_id == PTR_ID) // it is a pointer block |
2267 | 561 { |
562 if (pp->pb_count == 0) | |
563 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
564 // empty block? |
2267 | 565 ++error; |
566 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
567 else if (idx < (int)pp->pb_count) // go a block deeper |
2267 | 568 { |
569 if (pp->pb_pointer[idx].pe_bnum < 0) | |
570 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
571 // 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
|
572 // 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
|
573 // 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
|
574 ++idx; |
2267 | 575 continue; |
576 } | |
577 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
578 // 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
|
579 // stack |
2267 | 580 if ((top = ml_add_stack(buf)) < 0) |
581 { | |
582 ++error; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
583 break; // out of memory |
2267 | 584 } |
585 ip = &(buf->b_ml.ml_stack[top]); | |
586 ip->ip_bnum = bnum; | |
587 ip->ip_index = idx; | |
588 | |
589 bnum = pp->pb_pointer[idx].pe_bnum; | |
590 page_count = pp->pb_pointer[idx].pe_page_count; | |
6817 | 591 idx = 0; |
2267 | 592 continue; |
593 } | |
594 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
595 else // not a pointer block |
2267 | 596 { |
597 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
|
598 if (dp->db_id != DATA_ID) // block id wrong |
2267 | 599 ++error; |
600 else | |
601 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
602 // It is a data block, need to write it back to disk. |
2267 | 603 mf_put(mfp, hp, TRUE, FALSE); |
604 hp = NULL; | |
605 } | |
606 } | |
607 } | |
608 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
609 if (buf->b_ml.ml_stack_top == 0) // finished |
2267 | 610 break; |
611 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
612 // go one block up in the tree |
2267 | 613 ip = &(buf->b_ml.ml_stack[--(buf->b_ml.ml_stack_top)]); |
614 bnum = ip->ip_bnum; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
615 idx = ip->ip_index + 1; // go to next index |
2267 | 616 page_count = 1; |
617 } | |
6817 | 618 if (hp != NULL) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
619 mf_put(mfp, hp, FALSE, FALSE); // release previous block |
2657 | 620 |
621 if (error > 0) | |
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
622 emsg(_(e_error_while_updating_swap_file_crypt)); |
2267 | 623 } |
624 | |
625 mfp->mf_old_key = NULL; | |
626 } | |
627 #endif | |
628 | |
7 | 629 /* |
630 * ml_setname() is called when the file name of "buf" has been changed. | |
631 * It may rename the swap file. | |
632 */ | |
633 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
634 ml_setname(buf_T *buf) |
7 | 635 { |
636 int success = FALSE; | |
637 memfile_T *mfp; | |
638 char_u *fname; | |
639 char_u *dirp; | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
640 #if defined(MSWIN) |
7 | 641 char_u *p; |
642 #endif | |
643 | |
644 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
|
645 if (mfp->mf_fd < 0) // there is no swap file yet |
7 | 646 { |
647 /* | |
648 * When 'updatecount' is 0 and 'noswapfile' there is no swap file. | |
649 * For help files we will make a swap file now. | |
650 */ | |
22699
e82579016863
patch 8.2.1898: command modifier parsing always uses global cmdmod
Bram Moolenaar <Bram@vim.org>
parents:
22242
diff
changeset
|
651 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
|
652 ml_open_file(buf); // create a swap file |
7 | 653 return; |
654 } | |
655 | |
656 /* | |
657 * Try all directories in the 'directory' option. | |
658 */ | |
659 dirp = p_dir; | |
660 for (;;) | |
661 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
662 if (*dirp == NUL) // tried all directories, fail |
7 | 663 break; |
43 | 664 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
|
665 // alloc's fname |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
666 if (dirp == NULL) // out of memory |
3158 | 667 break; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
668 if (fname == NULL) // no file name found for this dir |
7 | 669 continue; |
670 | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
671 #if defined(MSWIN) |
7 | 672 /* |
673 * Set full pathname for swap file now, because a ":!cd dir" may | |
674 * change directory without us knowing it. | |
675 */ | |
676 p = FullName_save(fname, FALSE); | |
677 vim_free(fname); | |
678 fname = p; | |
679 if (fname == NULL) | |
680 continue; | |
681 #endif | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
682 // if the file name is the same we don't have to do anything |
7 | 683 if (fnamecmp(fname, mfp->mf_fname) == 0) |
684 { | |
685 vim_free(fname); | |
686 success = TRUE; | |
687 break; | |
688 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
689 // need to close the swap file before renaming |
7 | 690 if (mfp->mf_fd >= 0) |
691 { | |
692 close(mfp->mf_fd); | |
693 mfp->mf_fd = -1; | |
694 } | |
695 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
696 // try to rename the swap file |
7 | 697 if (vim_rename(mfp->mf_fname, fname) == 0) |
698 { | |
699 success = TRUE; | |
700 vim_free(mfp->mf_fname); | |
701 mfp->mf_fname = fname; | |
702 vim_free(mfp->mf_ffname); | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
703 #if defined(MSWIN) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
704 mfp->mf_ffname = NULL; // mf_fname is full pathname already |
7 | 705 #else |
706 mf_set_ffname(mfp); | |
707 #endif | |
2267 | 708 ml_upd_block0(buf, UB_SAME_DIR); |
7 | 709 break; |
710 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
711 vim_free(fname); // this fname didn't work, try another |
7 | 712 } |
713 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
714 if (mfp->mf_fd == -1) // need to (re)open the swap file |
7 | 715 { |
716 mfp->mf_fd = mch_open((char *)mfp->mf_fname, O_RDWR | O_EXTRA, 0); | |
717 if (mfp->mf_fd < 0) | |
718 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
719 // could not (re)open the swap file, what can we do???? |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
720 emsg(_(e_oops_lost_the_swap_file)); |
7 | 721 return; |
722 } | |
2003 | 723 #ifdef HAVE_FD_CLOEXEC |
724 { | |
725 int fdflags = fcntl(mfp->mf_fd, F_GETFD); | |
726 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
|
727 (void)fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC); |
2003 | 728 } |
729 #endif | |
7 | 730 } |
731 if (!success) | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
732 emsg(_(e_could_not_rename_swap_file)); |
7 | 733 } |
734 | |
735 /* | |
736 * Open a file for the memfile for all buffers that are not readonly or have | |
737 * been modified. | |
738 * Used when 'updatecount' changes from zero to non-zero. | |
739 */ | |
740 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
741 ml_open_files(void) |
7 | 742 { |
743 buf_T *buf; | |
744 | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
745 FOR_ALL_BUFFERS(buf) |
7 | 746 if (!buf->b_p_ro || buf->b_changed) |
747 ml_open_file(buf); | |
748 } | |
749 | |
750 /* | |
751 * Open a swap file for an existing memfile, if there is no swap file yet. | |
752 * If we are unable to find a file name, mf_fname will be NULL | |
753 * and the memfile will be in memory only (no recovery possible). | |
754 */ | |
755 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
756 ml_open_file(buf_T *buf) |
7 | 757 { |
758 memfile_T *mfp; | |
759 char_u *fname; | |
760 char_u *dirp; | |
761 | |
762 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
|
763 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
|
764 || (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
|
765 return; // nothing to do |
7 | 766 |
748 | 767 #ifdef FEAT_SPELL |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
768 // For a spell buffer use a temp file name. |
625 | 769 if (buf->b_spell) |
770 { | |
6721 | 771 fname = vim_tempname('s', FALSE); |
625 | 772 if (fname != NULL) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
773 (void)mf_open_file(mfp, fname); // consumes fname! |
625 | 774 buf->b_may_swap = FALSE; |
775 return; | |
776 } | |
777 #endif | |
778 | |
7 | 779 /* |
780 * Try all directories in 'directory' option. | |
781 */ | |
782 dirp = p_dir; | |
783 for (;;) | |
784 { | |
785 if (*dirp == NUL) | |
786 break; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
787 // 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
|
788 // 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
|
789 // 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
|
790 fname = findswapname(buf, &dirp, NULL); // allocates fname |
3158 | 791 if (dirp == NULL) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
792 break; // out of memory |
7 | 793 if (fname == NULL) |
794 continue; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
795 if (mf_open_file(mfp, fname) == OK) // consumes fname! |
7 | 796 { |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
797 #if defined(MSWIN) |
7 | 798 /* |
799 * set full pathname for swap file now, because a ":!cd dir" may | |
800 * change directory without us knowing it. | |
801 */ | |
802 mf_fullname(mfp); | |
803 #endif | |
2267 | 804 ml_upd_block0(buf, UB_SAME_DIR); |
39 | 805 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
806 // Flush block zero, so others can read it |
7 | 807 if (mf_sync(mfp, MFS_ZERO) == OK) |
630 | 808 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
809 // 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
|
810 // 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
|
811 // the swap file was deleted, and then on again. |
630 | 812 mf_set_dirty(mfp); |
7 | 813 break; |
630 | 814 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
815 // Writing block 0 failed: close the file and try another dir |
7 | 816 mf_close_file(buf, FALSE); |
817 } | |
818 } | |
819 | |
18372
11394af51615
patch 8.1.2180: Error E303 is not useful when 'directory' is empty
Bram Moolenaar <Bram@vim.org>
parents:
18139
diff
changeset
|
820 if (*p_dir != NUL && mfp->mf_fname == NULL) |
7 | 821 { |
29960
4fcf816aa806
patch 9.0.0318: clearing screen causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
29940
diff
changeset
|
822 need_wait_return = TRUE; // call wait_return() later |
7 | 823 ++no_wait_return; |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
824 (void)semsg(_(e_unable_to_open_swap_file_for_str_recovery_impossible), |
3839 | 825 buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname); |
7 | 826 --no_wait_return; |
827 } | |
828 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
829 // don't try to open a swap file again |
7 | 830 buf->b_may_swap = FALSE; |
831 } | |
832 | |
833 /* | |
834 * If still need to create a swap file, and starting to edit a not-readonly | |
835 * file, or reading into an existing buffer, create a swap file now. | |
836 */ | |
837 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
838 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
|
839 int newfile) // reading file into new buffer |
7 | 840 { |
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
|
841 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
|
842 |
7 | 843 if (curbuf->b_may_swap && (!curbuf->b_p_ro || !newfile)) |
844 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
|
845 msg_silent = old_msg_silent; |
7 | 846 } |
847 | |
848 /* | |
849 * Close memline for buffer 'buf'. | |
850 * If 'del_file' is TRUE, delete the swap file | |
851 */ | |
852 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
853 ml_close(buf_T *buf, int del_file) |
7 | 854 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
855 if (buf->b_ml.ml_mfp == NULL) // not open |
7 | 856 return; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
857 mf_close(buf->b_ml.ml_mfp, del_file); // close the .swp file |
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
858 if (buf->b_ml.ml_line_lnum != 0 |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
859 && (buf->b_ml.ml_flags & (ML_LINE_DIRTY | ML_ALLOCATED))) |
7 | 860 vim_free(buf->b_ml.ml_line_ptr); |
861 vim_free(buf->b_ml.ml_stack); | |
862 #ifdef FEAT_BYTEOFF | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12975
diff
changeset
|
863 VIM_CLEAR(buf->b_ml.ml_chunksize); |
7 | 864 #endif |
865 buf->b_ml.ml_mfp = NULL; | |
866 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
867 // 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
|
868 // this buffer is loaded. |
7 | 869 buf->b_flags &= ~BF_RECOVERED; |
870 } | |
871 | |
872 /* | |
873 * Close all existing memlines and memfiles. | |
874 * Only used when exiting. | |
875 * When 'del_file' is TRUE, delete the memfiles. | |
165 | 876 * But don't delete files that were ":preserve"d when we are POSIX compatible. |
7 | 877 */ |
878 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
879 ml_close_all(int del_file) |
7 | 880 { |
881 buf_T *buf; | |
882 | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
883 FOR_ALL_BUFFERS(buf) |
165 | 884 ml_close(buf, del_file && ((buf->b_flags & BF_PRESERVED) == 0 |
885 || vim_strchr(p_cpo, CPO_PRESERVE) == NULL)); | |
5519 | 886 #ifdef FEAT_SPELL |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
887 spell_delete_wordlist(); // delete the internal wordlist |
5519 | 888 #endif |
7 | 889 #ifdef TEMPDIRNAMES |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
890 vim_deltempdir(); // delete created temp directory |
7 | 891 #endif |
892 } | |
893 | |
894 /* | |
895 * Close all memfiles for not modified buffers. | |
896 * Only use just before exiting! | |
897 */ | |
898 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
899 ml_close_notmod(void) |
7 | 900 { |
901 buf_T *buf; | |
902 | |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
903 FOR_ALL_BUFFERS(buf) |
7 | 904 if (!bufIsChanged(buf)) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
905 ml_close(buf, TRUE); // close all not-modified buffers |
7 | 906 } |
907 | |
908 /* | |
909 * Update the timestamp in the .swp file. | |
910 * Used when the file has been written. | |
911 */ | |
912 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
913 ml_timestamp(buf_T *buf) |
7 | 914 { |
2267 | 915 ml_upd_block0(buf, UB_FNAME); |
916 } | |
917 | |
918 /* | |
919 * Return FAIL when the ID of "b0p" is wrong. | |
920 */ | |
921 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
922 ml_check_b0_id(ZERO_BL *b0p) |
2267 | 923 { |
924 if (b0p->b0_id[0] != BLOCK0_ID0 | |
925 || (b0p->b0_id[1] != BLOCK0_ID1 | |
926 && b0p->b0_id[1] != BLOCK0_ID1_C0 | |
6122 | 927 && 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
|
928 && 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
|
929 && b0p->b0_id[1] != BLOCK0_ID1_C3) |
2267 | 930 ) |
931 return FAIL; | |
932 return OK; | |
39 | 933 } |
934 | |
935 /* | |
936 * Update the timestamp or the B0_SAME_DIR flag of the .swp file. | |
937 */ | |
938 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
939 ml_upd_block0(buf_T *buf, upd_block0_T what) |
39 | 940 { |
7 | 941 memfile_T *mfp; |
942 bhdr_T *hp; | |
943 ZERO_BL *b0p; | |
944 | |
945 mfp = buf->b_ml.ml_mfp; | |
6130 | 946 if (mfp == NULL) |
7 | 947 return; |
6130 | 948 hp = mf_get(mfp, (blocknr_T)0, 1); |
949 if (hp == NULL) | |
950 { | |
951 #ifdef FEAT_CRYPT | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
952 // Possibly update the seed in the memfile before there is a block0. |
6130 | 953 if (what == UB_CRYPT) |
954 ml_set_mfp_crypt(buf); | |
955 #endif | |
956 return; | |
957 } | |
958 | |
7 | 959 b0p = (ZERO_BL *)(hp->bh_data); |
2267 | 960 if (ml_check_b0_id(b0p) == FAIL) |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
961 iemsg(_(e_ml_upd_block0_didnt_get_block_zero)); |
7 | 962 else |
39 | 963 { |
2267 | 964 if (what == UB_FNAME) |
39 | 965 set_b0_fname(b0p, buf); |
2267 | 966 #ifdef FEAT_CRYPT |
967 else if (what == UB_CRYPT) | |
968 ml_set_b0_crypt(buf, b0p); | |
969 #endif | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
970 else // what == UB_SAME_DIR |
39 | 971 set_b0_dir_flag(b0p, buf); |
972 } | |
7 | 973 mf_put(mfp, hp, TRUE, FALSE); |
974 } | |
975 | |
976 /* | |
977 * Write file name and timestamp into block 0 of a swap file. | |
978 * Also set buf->b_mtime. | |
979 * Don't use NameBuff[]!!! | |
980 */ | |
981 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
982 set_b0_fname(ZERO_BL *b0p, buf_T *buf) |
7 | 983 { |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
984 stat_T st; |
7 | 985 |
986 if (buf->b_ffname == NULL) | |
987 b0p->b0_fname[0] = NUL; | |
988 else | |
989 { | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
990 #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
|
991 // 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
|
992 // 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
|
993 // portability. |
2267 | 994 vim_strncpy(b0p->b0_fname, buf->b_ffname, B0_FNAME_SIZE_CRYPT - 1); |
39 | 995 # ifdef BACKSLASH_IN_FILENAME |
996 forward_slash(b0p->b0_fname); | |
997 # endif | |
7 | 998 #else |
999 size_t flen, ulen; | |
1000 char_u uname[B0_UNAME_SIZE]; | |
1001 | |
1002 /* | |
1003 * For a file under the home directory of the current user, we try to | |
1004 * replace the home directory path with "~user". This helps when | |
1005 * editing the same file on different machines over a network. | |
1006 * First replace home dir path with "~/" with home_replace(). | |
1007 * Then insert the user name to get "~user/". | |
1008 */ | |
2267 | 1009 home_replace(NULL, buf->b_ffname, b0p->b0_fname, |
1010 B0_FNAME_SIZE_CRYPT, TRUE); | |
7 | 1011 if (b0p->b0_fname[0] == '~') |
1012 { | |
1013 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
|
1014 // If there is no user name or it is too long, don't use "~/" |
7 | 1015 if (get_user_name(uname, B0_UNAME_SIZE) == FAIL |
2267 | 1016 || (ulen = STRLEN(uname)) + flen > B0_FNAME_SIZE_CRYPT - 1) |
1017 vim_strncpy(b0p->b0_fname, buf->b_ffname, | |
1018 B0_FNAME_SIZE_CRYPT - 1); | |
7 | 1019 else |
1020 { | |
1021 mch_memmove(b0p->b0_fname + ulen + 1, b0p->b0_fname + 1, flen); | |
1022 mch_memmove(b0p->b0_fname + 1, uname, ulen); | |
1023 } | |
1024 } | |
1025 #endif | |
1026 if (mch_stat((char *)buf->b_ffname, &st) >= 0) | |
1027 { | |
1028 long_to_char((long)st.st_mtime, b0p->b0_mtime); | |
1029 #ifdef CHECK_INODE | |
1030 long_to_char((long)st.st_ino, b0p->b0_ino); | |
1031 #endif | |
1032 buf_store_time(buf, &st, buf->b_ffname); | |
1033 buf->b_mtime_read = buf->b_mtime; | |
25953
d7e1cf30728c
patch 8.2.3510: changes are only detected with one second accuracy
Bram Moolenaar <Bram@vim.org>
parents:
25913
diff
changeset
|
1034 buf->b_mtime_read_ns = buf->b_mtime_ns; |
7 | 1035 } |
1036 else | |
1037 { | |
1038 long_to_char(0L, b0p->b0_mtime); | |
1039 #ifdef CHECK_INODE | |
1040 long_to_char(0L, b0p->b0_ino); | |
1041 #endif | |
1042 buf->b_mtime = 0; | |
25953
d7e1cf30728c
patch 8.2.3510: changes are only detected with one second accuracy
Bram Moolenaar <Bram@vim.org>
parents:
25913
diff
changeset
|
1043 buf->b_mtime_ns = 0; |
7 | 1044 buf->b_mtime_read = 0; |
25953
d7e1cf30728c
patch 8.2.3510: changes are only detected with one second accuracy
Bram Moolenaar <Bram@vim.org>
parents:
25913
diff
changeset
|
1045 buf->b_mtime_read_ns = 0; |
7 | 1046 buf->b_orig_size = 0; |
1047 buf->b_orig_mode = 0; | |
1048 } | |
1049 } | |
39 | 1050 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1051 // Also add the 'fileencoding' if there is room. |
39 | 1052 add_b0_fenc(b0p, curbuf); |
7 | 1053 } |
1054 | |
1055 /* | |
39 | 1056 * Update the B0_SAME_DIR flag of the swap file. It's set if the file and the |
1057 * swapfile for "buf" are in the same directory. | |
1058 * This is fail safe: if we are not sure the directories are equal the flag is | |
1059 * not set. | |
1060 */ | |
1061 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1062 set_b0_dir_flag(ZERO_BL *b0p, buf_T *buf) |
39 | 1063 { |
1064 if (same_directory(buf->b_ml.ml_mfp->mf_fname, buf->b_ffname)) | |
1065 b0p->b0_flags |= B0_SAME_DIR; | |
1066 else | |
1067 b0p->b0_flags &= ~B0_SAME_DIR; | |
1068 } | |
1069 | |
1070 /* | |
1071 * When there is room, add the 'fileencoding' to block zero. | |
1072 */ | |
1073 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1074 add_b0_fenc( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1075 ZERO_BL *b0p, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1076 buf_T *buf) |
39 | 1077 { |
1078 int n; | |
2267 | 1079 int size = B0_FNAME_SIZE_NOCRYPT; |
1080 | |
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1081 #ifdef FEAT_CRYPT |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1082 // 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
|
1083 // 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
|
1084 // compatible anyway. |
2267 | 1085 if (*buf->b_p_key != NUL) |
1086 size = B0_FNAME_SIZE_CRYPT; | |
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1087 #endif |
39 | 1088 |
835 | 1089 n = (int)STRLEN(buf->b_p_fenc); |
2267 | 1090 if ((int)STRLEN(b0p->b0_fname) + n + 1 > size) |
39 | 1091 b0p->b0_flags &= ~B0_HAS_FENC; |
1092 else | |
1093 { | |
2267 | 1094 mch_memmove((char *)b0p->b0_fname + size - n, |
39 | 1095 (char *)buf->b_p_fenc, (size_t)n); |
2267 | 1096 *(b0p->b0_fname + size - n - 1) = NUL; |
39 | 1097 b0p->b0_flags |= B0_HAS_FENC; |
1098 } | |
1099 } | |
1100 | |
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1101 #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
|
1102 # include <sys/sysinfo.h> |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1103 #endif |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1104 |
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1105 #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
|
1106 /* |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1107 * 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
|
1108 * "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
|
1109 * the result is FALSE; |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1110 */ |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1111 static int |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1112 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
|
1113 { |
25899
076f9b8e9632
patch 8.2.3483: #ifdef for using sysinfo() is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
25678
diff
changeset
|
1114 #if defined(HAVE_SYSINFO) && defined(HAVE_SYSINFO_UPTIME) |
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1115 stat_T st; |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1116 struct sysinfo sinfo; |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1117 |
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1118 // 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
|
1119 // 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
|
1120 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
|
1121 && sysinfo(&sinfo) == 0 |
24093
5dfee9b1eabe
patch 8.2.2588: build failure with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
24089
diff
changeset
|
1122 && 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
|
1123 # ifdef FEAT_EVAL |
24093
5dfee9b1eabe
patch 8.2.2588: build failure with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
24089
diff
changeset
|
1124 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
|
1125 # endif |
24093
5dfee9b1eabe
patch 8.2.2588: build failure with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
24089
diff
changeset
|
1126 sinfo.uptime)) |
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1127 return FALSE; |
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1128 # endif |
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1129 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
|
1130 } |
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1131 #endif |
39 | 1132 |
1133 /* | |
2267 | 1134 * 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
|
1135 * 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
|
1136 * a swap file. |
7 | 1137 */ |
1138 void | |
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1139 ml_recover(int checkext) |
7 | 1140 { |
1141 buf_T *buf = NULL; | |
1142 memfile_T *mfp = NULL; | |
1143 char_u *fname; | |
2267 | 1144 char_u *fname_used = NULL; |
7 | 1145 bhdr_T *hp = NULL; |
1146 ZERO_BL *b0p; | |
39 | 1147 int b0_ff; |
1148 char_u *b0_fenc = NULL; | |
2267 | 1149 #ifdef FEAT_CRYPT |
1150 int b0_cm = -1; | |
1151 #endif | |
7 | 1152 PTR_BL *pp; |
1153 DATA_BL *dp; | |
1154 infoptr_T *ip; | |
1155 blocknr_T bnum; | |
1156 int page_count; | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
1157 stat_T org_stat, swp_stat; |
7 | 1158 int len; |
1159 int directly; | |
1160 linenr_T lnum; | |
1161 char_u *p; | |
1162 int i; | |
1163 long error; | |
1164 int cannot_open; | |
1165 linenr_T line_count; | |
1166 int has_error; | |
1167 int idx; | |
1168 int top; | |
1169 int txt_start; | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
1170 off_T size; |
7 | 1171 int called_from_main; |
1172 int serious_error = TRUE; | |
1173 long mtime; | |
1174 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
|
1175 int orig_file_status = NOTDONE; |
7 | 1176 |
1177 recoverymode = TRUE; | |
1178 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
|
1179 attr = HL_ATTR(HLF_E); |
1975 | 1180 |
1181 /* | |
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
|
1182 * If the file name ends in ".s[a-w][a-z]" we assume this is the swap file. |
1975 | 1183 * Otherwise a search is done to find the swap file(s). |
1184 */ | |
7 | 1185 fname = curbuf->b_fname; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1186 if (fname == NULL) // When there is no file name |
7 | 1187 fname = (char_u *)""; |
1188 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
|
1189 if (checkext && len >= 4 && |
2823 | 1190 #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
|
1191 STRNICMP(fname + len - 4, "_s", 2) |
7 | 1192 #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
|
1193 STRNICMP(fname + len - 4, ".s", 2) |
7 | 1194 #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
|
1195 == 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
|
1196 && 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
|
1197 TOLOWER_ASC(fname[len - 2])) != NULL |
1975 | 1198 && ASCII_ISALPHA(fname[len - 1])) |
7 | 1199 { |
1200 directly = TRUE; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1201 fname_used = vim_strsave(fname); // make a copy for mf_open() |
7 | 1202 } |
1203 else | |
1204 { | |
1205 directly = FALSE; | |
1206 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1207 // count the number of matching swap files |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1208 len = recover_names(fname, FALSE, NULL, 0, NULL); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1209 if (len == 0) // no swap files found |
7 | 1210 { |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1211 semsg(_(e_no_swap_file_found_for_str), fname); |
7 | 1212 goto theend; |
1213 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1214 if (len == 1) // one swap file found, use it |
7 | 1215 i = 1; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1216 else // several swap files found, choose |
7 | 1217 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1218 // list the names of the swap files |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1219 (void)recover_names(fname, TRUE, NULL, 0, NULL); |
7 | 1220 msg_putchar('\n'); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1221 msg_puts(_("Enter number of swap file to use (0 to quit): ")); |
374 | 1222 i = get_number(FALSE, NULL); |
7 | 1223 if (i < 1 || i > len) |
1224 goto theend; | |
1225 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1226 // get the swap file name that will be used |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1227 (void)recover_names(fname, FALSE, NULL, i, &fname_used); |
7 | 1228 } |
2267 | 1229 if (fname_used == NULL) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1230 goto theend; // out of memory |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1231 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1232 // When called from main() still need to initialize storage structure |
625 | 1233 if (called_from_main && ml_open(curbuf) == FAIL) |
7 | 1234 getout(1); |
1235 | |
2267 | 1236 /* |
1237 * 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
|
1238 * Only the memline and crypt information in it are really used. |
2267 | 1239 */ |
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
|
1240 buf = ALLOC_ONE(buf_T); |
7 | 1241 if (buf == NULL) |
1242 goto theend; | |
2267 | 1243 |
1244 /* | |
1245 * init fields in memline struct | |
1246 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1247 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
|
1248 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
|
1249 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
|
1250 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
|
1251 buf->b_ml.ml_locked = NULL; // no locked block |
7 | 1252 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
|
1253 #ifdef FEAT_CRYPT |
9e2e63af1641
Better fix for memory access in recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2407
diff
changeset
|
1254 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
|
1255 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
|
1256 #endif |
7 | 1257 |
2267 | 1258 /* |
1259 * open the memfile from the old swap file | |
1260 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1261 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
|
1262 // mf_open() will consume "fname_used"! |
2267 | 1263 mfp = mf_open(fname_used, O_RDONLY); |
1264 fname_used = p; | |
7 | 1265 if (mfp == NULL || mfp->mf_fd < 0) |
1266 { | |
2267 | 1267 if (fname_used != NULL) |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1268 semsg(_(e_cannot_open_str), fname_used); |
7 | 1269 goto theend; |
1270 } | |
1271 buf->b_ml.ml_mfp = mfp; | |
2267 | 1272 #ifdef FEAT_CRYPT |
1273 mfp->mf_buffer = buf; | |
1274 #endif | |
7 | 1275 |
1276 /* | |
1277 * The page size set in mf_open() might be different from the page size | |
1278 * used in the swap file, we must get it from block 0. But to read block | |
1279 * 0 we need a page size. Use the minimal size for block 0 here, it will | |
1280 * be set to the real value below. | |
1281 */ | |
1282 mfp->mf_page_size = MIN_SWAP_PAGE_SIZE; | |
1283 | |
2267 | 1284 /* |
1285 * try to read block 0 | |
1286 */ | |
7 | 1287 if ((hp = mf_get(mfp, (blocknr_T)0, 1)) == NULL) |
1288 { | |
1289 msg_start(); | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1290 msg_puts_attr(_("Unable to read block 0 from "), attr | MSG_HIST); |
7 | 1291 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
|
1292 msg_puts_attr(_("\nMaybe no changes were made or Vim did not update the swap file."), |
7 | 1293 attr | MSG_HIST); |
1294 msg_end(); | |
1295 goto theend; | |
1296 } | |
1297 b0p = (ZERO_BL *)(hp->bh_data); | |
1298 if (STRNCMP(b0p->b0_version, "VIM 3.0", 7) == 0) | |
1299 { | |
1300 msg_start(); | |
1301 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
|
1302 msg_puts_attr(_(" cannot be used with this version of Vim.\n"), |
7 | 1303 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(_("Use Vim version 3.0.\n"), MSG_HIST); |
7 | 1305 msg_end(); |
1306 goto theend; | |
1307 } | |
2267 | 1308 if (ml_check_b0_id(b0p) == FAIL) |
7 | 1309 { |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1310 semsg(_(e_str_does_not_look_like_vim_swap_file), mfp->mf_fname); |
7 | 1311 goto theend; |
1312 } | |
1313 if (b0_magic_wrong(b0p)) | |
1314 { | |
1315 msg_start(); | |
1316 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
|
1317 #if defined(MSWIN) |
7 | 1318 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
|
1319 msg_puts_attr(_(" cannot be used with this version of Vim.\n"), |
7 | 1320 attr | MSG_HIST); |
1321 else | |
1322 #endif | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1323 msg_puts_attr(_(" cannot be used on this computer.\n"), |
7 | 1324 attr | MSG_HIST); |
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(_("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
|
1326 // avoid going past the end of a corrupted hostname |
7 | 1327 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
|
1328 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
|
1329 msg_puts_attr(_(",\nor the file has been damaged."), attr | MSG_HIST); |
7 | 1330 msg_end(); |
1331 goto theend; | |
1332 } | |
1105 | 1333 |
2267 | 1334 #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
|
1335 for (i = 0; i < (int)ARRAY_LENGTH(id1_codes); ++i) |
6122 | 1336 if (id1_codes[i] == b0p->b0_id[1]) |
1337 b0_cm = i; | |
1338 if (b0_cm > 0) | |
2267 | 1339 mch_memmove(mfp->mf_seed, &b0p->b0_seed, MF_SEED_LEN); |
6122 | 1340 crypt_set_cm_option(buf, b0_cm < 0 ? 0 : b0_cm); |
2267 | 1341 #else |
1342 if (b0p->b0_id[1] != BLOCK0_ID1) | |
1343 { | |
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
1344 semsg(_(e_str_is_encrypted_and_this_version_of_vim_does_not_support_encryption), mfp->mf_fname); |
2267 | 1345 goto theend; |
1346 } | |
1347 #endif | |
1348 | |
7 | 1349 /* |
1350 * If we guessed the wrong page size, we have to recalculate the | |
1351 * highest block number in the file. | |
1352 */ | |
1353 if (mfp->mf_page_size != (unsigned)char_to_long(b0p->b0_page_size)) | |
1354 { | |
1105 | 1355 unsigned previous_page_size = mfp->mf_page_size; |
1356 | |
7 | 1357 mf_new_page_size(mfp, (unsigned)char_to_long(b0p->b0_page_size)); |
1105 | 1358 if (mfp->mf_page_size < previous_page_size) |
1359 { | |
1360 msg_start(); | |
1361 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
|
1362 msg_puts_attr(_(" has been damaged (page size is smaller than minimum value).\n"), |
1105 | 1363 attr | MSG_HIST); |
1364 msg_end(); | |
1365 goto theend; | |
1366 } | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
1367 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
|
1368 mfp->mf_blocknr_max = 0; // no file or empty file |
7 | 1369 else |
1370 mfp->mf_blocknr_max = (blocknr_T)(size / mfp->mf_page_size); | |
1371 mfp->mf_infile_count = mfp->mf_blocknr_max; | |
1105 | 1372 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1373 // need to reallocate the memory used to store the data |
1105 | 1374 p = alloc(mfp->mf_page_size); |
1375 if (p == NULL) | |
1376 goto theend; | |
1377 mch_memmove(p, hp->bh_data, previous_page_size); | |
1378 vim_free(hp->bh_data); | |
1379 hp->bh_data = p; | |
1380 b0p = (ZERO_BL *)(hp->bh_data); | |
7 | 1381 } |
1382 | |
2267 | 1383 /* |
1384 * If .swp file name given directly, use name from swap file for buffer. | |
1385 */ | |
7 | 1386 if (directly) |
1387 { | |
1388 expand_env(b0p->b0_fname, NameBuff, MAXPATHL); | |
1389 if (setfname(curbuf, NameBuff, NULL, TRUE) == FAIL) | |
1390 goto theend; | |
1391 } | |
1392 | |
1393 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
|
1394 smsg(_("Using swap file \"%s\""), NameBuff); |
7 | 1395 |
1396 if (buf_spname(curbuf) != NULL) | |
3839 | 1397 vim_strncpy(NameBuff, buf_spname(curbuf), MAXPATHL - 1); |
7 | 1398 else |
1399 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
|
1400 smsg(_("Original file \"%s\""), NameBuff); |
7 | 1401 msg_putchar('\n'); |
1402 | |
2267 | 1403 /* |
1404 * check date of swap file and original file | |
1405 */ | |
7 | 1406 mtime = char_to_long(b0p->b0_mtime); |
1407 if (curbuf->b_ffname != NULL | |
1408 && mch_stat((char *)curbuf->b_ffname, &org_stat) != -1 | |
1409 && ((mch_stat((char *)mfp->mf_fname, &swp_stat) != -1 | |
1410 && org_stat.st_mtime > swp_stat.st_mtime) | |
1411 || org_stat.st_mtime != mtime)) | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1412 emsg(_(e_warning_original_file_may_have_been_changed)); |
7 | 1413 out_flush(); |
39 | 1414 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1415 // Get the 'fileformat' and 'fileencoding' from block zero. |
39 | 1416 b0_ff = (b0p->b0_flags & B0_FF_MASK); |
1417 if (b0p->b0_flags & B0_HAS_FENC) | |
1418 { | |
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2267
diff
changeset
|
1419 int fnsize = B0_FNAME_SIZE_NOCRYPT; |
2267 | 1420 |
1421 #ifdef FEAT_CRYPT | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1422 // Use the same size as in add_b0_fenc(). |
2267 | 1423 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
|
1424 fnsize = B0_FNAME_SIZE_CRYPT; |
2267 | 1425 #endif |
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2267
diff
changeset
|
1426 for (p = b0p->b0_fname + fnsize; p > b0p->b0_fname && p[-1] != NUL; --p) |
39 | 1427 ; |
20830
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20599
diff
changeset
|
1428 b0_fenc = vim_strnsave(p, b0p->b0_fname + fnsize - p); |
39 | 1429 } |
1430 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1431 mf_put(mfp, hp, FALSE, FALSE); // release block 0 |
7 | 1432 hp = NULL; |
1433 | |
1434 /* | |
1435 * Now that we are sure that the file is going to be recovered, clear the | |
1436 * contents of the current buffer. | |
1437 */ | |
1438 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
|
1439 ml_delete((linenr_T)1); |
7 | 1440 |
1441 /* | |
1442 * Try reading the original file to obtain the values of 'fileformat', | |
1443 * 'fileencoding', etc. Ignore errors. The text itself is not used. | |
2267 | 1444 * When the file is encrypted the user is asked to enter the key. |
7 | 1445 */ |
1446 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
|
1447 orig_file_status = readfile(curbuf->b_ffname, NULL, (linenr_T)0, |
7 | 1448 (linenr_T)0, (linenr_T)MAXLNUM, NULL, READ_NEW); |
1449 | |
2267 | 1450 #ifdef FEAT_CRYPT |
1451 if (b0_cm >= 0) | |
1452 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1453 // 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
|
1454 // without a key, will probably get garbage text. |
2267 | 1455 if (*curbuf->b_p_key != NUL) |
1456 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1457 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
|
1458 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
|
1459 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
|
1460 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
|
1461 msg_puts(_("\nto use the same key for text file and swap file")); |
2267 | 1462 } |
1463 else | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1464 smsg(_(need_key_msg), fname_used); |
6122 | 1465 buf->b_p_key = crypt_get_key(FALSE, FALSE); |
2267 | 1466 if (buf->b_p_key == NULL) |
1467 buf->b_p_key = curbuf->b_p_key; | |
1468 else if (*buf->b_p_key == NUL) | |
1469 { | |
1470 vim_free(buf->b_p_key); | |
1471 buf->b_p_key = curbuf->b_p_key; | |
1472 } | |
1473 if (buf->b_p_key == NULL) | |
1474 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
|
1475 } |
2267 | 1476 #endif |
7 | 1477 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1478 // Use the 'fileformat' and 'fileencoding' as stored in the swap file. |
39 | 1479 if (b0_ff != 0) |
1480 set_fileformat(b0_ff - 1, OPT_LOCAL); | |
1481 if (b0_fenc != NULL) | |
1482 { | |
28457
4dcccb2673fe
patch 8.2.4753: error from setting an option is silently ignored
Bram Moolenaar <Bram@vim.org>
parents:
28357
diff
changeset
|
1483 set_option_value_give_err((char_u *)"fenc", 0L, b0_fenc, OPT_LOCAL); |
39 | 1484 vim_free(b0_fenc); |
1485 } | |
16996
d5e1e09a829f
patch 8.1.1498: ":write" increments b:changedtick even though nothing changed
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
1486 unchanged(curbuf, TRUE, TRUE); |
39 | 1487 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1488 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
|
1489 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
|
1490 lnum = 0; // append after line 0 in curbuf |
7 | 1491 line_count = 0; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1492 idx = 0; // start with first index in block 1 |
7 | 1493 error = 0; |
1494 buf->b_ml.ml_stack_top = 0; | |
1495 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
|
1496 buf->b_ml.ml_stack_size = 0; // no stack yet |
7 | 1497 |
1498 if (curbuf->b_ffname == NULL) | |
1499 cannot_open = TRUE; | |
1500 else | |
1501 cannot_open = FALSE; | |
1502 | |
1503 serious_error = FALSE; | |
1504 for ( ; !got_int; line_breakcheck()) | |
1505 { | |
1506 if (hp != NULL) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1507 mf_put(mfp, hp, FALSE, FALSE); // release previous block |
7 | 1508 |
1509 /* | |
1510 * get block | |
1511 */ | |
27426
41e0dcf38521
patch 8.2.4241: some type casts are redundant
Bram Moolenaar <Bram@vim.org>
parents:
27231
diff
changeset
|
1512 if ((hp = mf_get(mfp, bnum, page_count)) == NULL) |
7 | 1513 { |
1514 if (bnum == 1) | |
1515 { | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1516 semsg(_(e_unable_to_read_block_one_from_str), mfp->mf_fname); |
7 | 1517 goto theend; |
1518 } | |
1519 ++error; | |
1520 ml_append(lnum++, (char_u *)_("???MANY LINES MISSING"), | |
1521 (colnr_T)0, TRUE); | |
1522 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1523 else // there is a block |
7 | 1524 { |
1525 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
|
1526 if (pp->pb_id == PTR_ID) // it is a pointer block |
7 | 1527 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1528 // check line count when using pointer block first time |
7 | 1529 if (idx == 0 && line_count != 0) |
1530 { | |
1531 for (i = 0; i < (int)pp->pb_count; ++i) | |
1532 line_count -= pp->pb_pointer[i].pe_line_count; | |
1533 if (line_count != 0) | |
1534 { | |
1535 ++error; | |
1536 ml_append(lnum++, (char_u *)_("???LINE COUNT WRONG"), | |
1537 (colnr_T)0, TRUE); | |
1538 } | |
1539 } | |
1540 | |
1541 if (pp->pb_count == 0) | |
1542 { | |
1543 ml_append(lnum++, (char_u *)_("???EMPTY BLOCK"), | |
1544 (colnr_T)0, TRUE); | |
1545 ++error; | |
1546 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1547 else if (idx < (int)pp->pb_count) // go a block deeper |
7 | 1548 { |
1549 if (pp->pb_pointer[idx].pe_bnum < 0) | |
1550 { | |
1551 /* | |
1552 * Data block with negative block number. | |
1553 * Try to read lines from the original file. | |
1554 * This is slow, but it works. | |
1555 */ | |
1556 if (!cannot_open) | |
1557 { | |
1558 line_count = pp->pb_pointer[idx].pe_line_count; | |
1559 if (readfile(curbuf->b_ffname, NULL, lnum, | |
1560 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
|
1561 line_count, NULL, 0) != OK) |
7 | 1562 cannot_open = TRUE; |
1563 else | |
1564 lnum += line_count; | |
1565 } | |
1566 if (cannot_open) | |
1567 { | |
1568 ++error; | |
1569 ml_append(lnum++, (char_u *)_("???LINES MISSING"), | |
1570 (colnr_T)0, TRUE); | |
1571 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1572 ++idx; // get same block again for next index |
7 | 1573 continue; |
1574 } | |
1575 | |
1576 /* | |
1577 * going one block deeper in the tree | |
1578 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1579 if ((top = ml_add_stack(buf)) < 0) // new entry in stack |
7 | 1580 { |
1581 ++error; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1582 break; // out of memory |
7 | 1583 } |
1584 ip = &(buf->b_ml.ml_stack[top]); | |
1585 ip->ip_bnum = bnum; | |
1586 ip->ip_index = idx; | |
1587 | |
1588 bnum = pp->pb_pointer[idx].pe_bnum; | |
1589 line_count = pp->pb_pointer[idx].pe_line_count; | |
1590 page_count = pp->pb_pointer[idx].pe_page_count; | |
2885 | 1591 idx = 0; |
7 | 1592 continue; |
1593 } | |
1594 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1595 else // not a pointer block |
7 | 1596 { |
1597 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
|
1598 if (dp->db_id != DATA_ID) // block id wrong |
7 | 1599 { |
1600 if (bnum == 1) | |
1601 { | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1602 semsg(_(e_block_one_id_wrong_str_not_swp_file), |
7 | 1603 mfp->mf_fname); |
1604 goto theend; | |
1605 } | |
1606 ++error; | |
1607 ml_append(lnum++, (char_u *)_("???BLOCK MISSING"), | |
1608 (colnr_T)0, TRUE); | |
1609 } | |
1610 else | |
1611 { | |
1612 /* | |
1613 * it is a data block | |
1614 * Append all the lines in this block | |
1615 */ | |
1616 has_error = FALSE; | |
1617 /* | |
1618 * check length of block | |
1619 * if wrong, use length in pointer block | |
1620 */ | |
1621 if (page_count * mfp->mf_page_size != dp->db_txt_end) | |
1622 { | |
1623 ml_append(lnum++, (char_u *)_("??? from here until ???END lines may be messed up"), | |
1624 (colnr_T)0, TRUE); | |
1625 ++error; | |
1626 has_error = TRUE; | |
1627 dp->db_txt_end = page_count * mfp->mf_page_size; | |
1628 } | |
1629 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1630 // make sure there is a NUL at the end of the block |
7 | 1631 *((char_u *)dp + dp->db_txt_end - 1) = NUL; |
1632 | |
1633 /* | |
1634 * check number of lines in block | |
1635 * if wrong, use count in data block | |
1636 */ | |
1637 if (line_count != dp->db_line_count) | |
1638 { | |
1639 ml_append(lnum++, (char_u *)_("??? from here until ???END lines may have been inserted/deleted"), | |
1640 (colnr_T)0, TRUE); | |
1641 ++error; | |
1642 has_error = TRUE; | |
1643 } | |
1644 | |
1645 for (i = 0; i < dp->db_line_count; ++i) | |
1646 { | |
1647 txt_start = (dp->db_index[i] & DB_INDEX_MASK); | |
1978 | 1648 if (txt_start <= (int)HEADER_SIZE |
7 | 1649 || txt_start >= (int)dp->db_txt_end) |
1650 { | |
1651 p = (char_u *)"???"; | |
1652 ++error; | |
1653 } | |
1654 else | |
1655 p = (char_u *)dp + txt_start; | |
1656 ml_append(lnum++, p, (colnr_T)0, TRUE); | |
1657 } | |
1658 if (has_error) | |
1978 | 1659 ml_append(lnum++, (char_u *)_("???END"), |
1660 (colnr_T)0, TRUE); | |
7 | 1661 } |
1662 } | |
1663 } | |
1664 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1665 if (buf->b_ml.ml_stack_top == 0) // finished |
7 | 1666 break; |
1667 | |
1668 /* | |
1669 * go one block up in the tree | |
1670 */ | |
1671 ip = &(buf->b_ml.ml_stack[--(buf->b_ml.ml_stack_top)]); | |
1672 bnum = ip->ip_bnum; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1673 idx = ip->ip_index + 1; // go to next index |
7 | 1674 page_count = 1; |
1675 } | |
1676 | |
1677 /* | |
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
|
1678 * 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
|
1679 * 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
|
1680 * 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
|
1681 * 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
|
1682 * Line ml_line_count + 1 in the dummy empty line. |
7 | 1683 */ |
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
|
1684 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
|
1685 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1686 // 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
|
1687 // 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
|
1688 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
|
1689 { |
16632
30de89c1d090
patch 8.1.1318: code for text changes is in a "misc" file
Bram Moolenaar <Bram@vim.org>
parents:
16621
diff
changeset
|
1690 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
|
1691 ++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
|
1692 } |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1693 } |
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 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
|
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 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
|
1697 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1698 // 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
|
1699 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
|
1700 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
|
1701 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
|
1702 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
|
1703 { |
16632
30de89c1d090
patch 8.1.1318: code for text changes is in a "misc" file
Bram Moolenaar <Bram@vim.org>
parents:
16621
diff
changeset
|
1704 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
|
1705 ++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
|
1706 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
|
1707 } |
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 } |
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 * 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
|
1713 * 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
|
1714 */ |
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 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
|
1716 && !(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
|
1717 ml_delete(curbuf->b_ml.ml_line_count); |
7 | 1718 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
|
1719 check_cursor(); |
7 | 1720 |
1721 recoverymode = FALSE; | |
1722 if (got_int) | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1723 emsg(_(e_recovery_interrupted)); |
7 | 1724 else if (error) |
1725 { | |
1726 ++no_wait_return; | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1727 msg(">>>>>>>>>>>>>"); |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1728 emsg(_(e_errors_detected_while_recovering_look_for_lines_starting_with_questions)); |
7 | 1729 --no_wait_return; |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1730 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
|
1731 msg(">>>>>>>>>>>>>"); |
7 | 1732 } |
1733 else | |
1734 { | |
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
|
1735 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
|
1736 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1737 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
|
1738 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
|
1739 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
|
1740 } |
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1741 else |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1742 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
|
1743 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
|
1744 #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
|
1745 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
|
1746 { |
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
|
1747 // 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
|
1748 // 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
|
1749 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
|
1750 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
|
1751 } |
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 #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
|
1753 msg_puts("\n\n"); |
7 | 1754 cmdline_row = msg_row; |
1755 } | |
2267 | 1756 #ifdef FEAT_CRYPT |
1757 if (*buf->b_p_key != NUL && STRCMP(curbuf->b_p_key, buf->b_p_key) != 0) | |
1758 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1759 msg_puts(_("Using crypt key from swap file for the text file.\n")); |
28457
4dcccb2673fe
patch 8.2.4753: error from setting an option is silently ignored
Bram Moolenaar <Bram@vim.org>
parents:
28357
diff
changeset
|
1760 set_option_value_give_err((char_u *)"key", 0L, buf->b_p_key, OPT_LOCAL); |
2267 | 1761 } |
1762 #endif | |
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29682
diff
changeset
|
1763 redraw_curbuf_later(UPD_NOT_VALID); |
7 | 1764 |
1765 theend: | |
2267 | 1766 vim_free(fname_used); |
7 | 1767 recoverymode = FALSE; |
1768 if (mfp != NULL) | |
1769 { | |
1770 if (hp != NULL) | |
1771 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
|
1772 mf_close(mfp, FALSE); // will also vim_free(mfp->mf_fname) |
7 | 1773 } |
1053 | 1774 if (buf != NULL) |
1775 { | |
2267 | 1776 #ifdef FEAT_CRYPT |
1777 if (buf->b_p_key != curbuf->b_p_key) | |
1778 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
|
1779 free_string_option(buf->b_p_cm); |
2267 | 1780 #endif |
1053 | 1781 vim_free(buf->b_ml.ml_stack); |
1782 vim_free(buf); | |
1783 } | |
7 | 1784 if (serious_error && called_from_main) |
1785 ml_close(curbuf, TRUE); | |
1786 else | |
1787 { | |
1788 apply_autocmds(EVENT_BUFREADPOST, NULL, curbuf->b_fname, FALSE, curbuf); | |
1789 apply_autocmds(EVENT_BUFWINENTER, NULL, curbuf->b_fname, FALSE, curbuf); | |
1790 } | |
1791 } | |
1792 | |
1793 /* | |
1794 * Find the names of swap files in current directory and the directory given | |
1795 * with the 'directory' option. | |
1796 * | |
1797 * Used to: | |
1798 * - list the swap files for "vim -r" | |
1799 * - count the number of swap files when recovering | |
1800 * - list the swap files when recovering | |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1801 * - list the swap files for swapfilelist() |
7 | 1802 * - find the name of the n'th swap file when recovering |
1803 */ | |
1804 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1805 recover_names( |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1806 char_u *fname, // base for swap file name |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1807 int do_list, // when TRUE, list the swap file names |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1808 list_T *ret_list UNUSED, // when not NULL add file names to it |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1809 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
|
1810 char_u **fname_out) // result when "nr" > 0 |
7 | 1811 { |
1812 int num_names; | |
1813 char_u *(names[6]); | |
1814 char_u *tail; | |
1815 char_u *p; | |
1816 int num_files; | |
1817 int file_count = 0; | |
1818 char_u **files; | |
1819 char_u *dirp; | |
1820 char_u *dir_name; | |
2175 | 1821 char_u *fname_res = NULL; |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1822 #ifdef HAVE_READLINK |
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1823 char_u fname_buf[MAXPATHL]; |
2175 | 1824 #endif |
1825 | |
1826 if (fname != NULL) | |
1827 { | |
1828 #ifdef HAVE_READLINK | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1829 // 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
|
1830 // with the actual file instead of with the symlink. |
2267 | 1831 if (resolve_symlink(fname, fname_buf) == OK) |
1832 fname_res = fname_buf; | |
1833 else | |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1834 #endif |
2267 | 1835 fname_res = fname; |
2175 | 1836 } |
7 | 1837 |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1838 if (do_list) |
7 | 1839 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1840 // 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
|
1841 msg(_("Swap files found:")); |
7 | 1842 msg_putchar('\n'); |
1843 } | |
1844 | |
1845 /* | |
1846 * Do the loop for every directory in 'directory'. | |
1847 * First allocate some memory to put the directory name in. | |
1848 */ | |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1849 dir_name = alloc(STRLEN(p_dir) + 1); |
7 | 1850 dirp = p_dir; |
1851 while (dir_name != NULL && *dirp) | |
1852 { | |
1853 /* | |
1854 * Isolate a directory name from *dirp and put it in dir_name (we know | |
1855 * it is large enough, so use 31000 for length). | |
1856 * Advance dirp to next directory name. | |
1857 */ | |
1858 (void)copy_option_part(&dirp, dir_name, 31000, ","); | |
1859 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1860 if (dir_name[0] == '.' && dir_name[1] == NUL) // check current dir |
7 | 1861 { |
2267 | 1862 if (fname == NULL) |
7 | 1863 { |
1864 #ifdef VMS | |
1865 names[0] = vim_strsave((char_u *)"*_sw%"); | |
1866 #else | |
1867 names[0] = vim_strsave((char_u *)"*.sw?"); | |
1868 #endif | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
1869 #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
|
1870 // 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
|
1871 // supports this too, on some file systems. |
7 | 1872 names[1] = vim_strsave((char_u *)".*.sw?"); |
1873 names[2] = vim_strsave((char_u *)".sw?"); | |
1874 num_names = 3; | |
1875 #else | |
1876 # ifdef VMS | |
1877 names[1] = vim_strsave((char_u *)".*_sw%"); | |
1878 num_names = 2; | |
1879 # else | |
1880 num_names = 1; | |
1881 # endif | |
1882 #endif | |
1883 } | |
1884 else | |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1885 num_names = recov_file_names(names, fname_res, TRUE); |
7 | 1886 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1887 else // check directory dir_name |
7 | 1888 { |
2267 | 1889 if (fname == NULL) |
7 | 1890 { |
1891 #ifdef VMS | |
1892 names[0] = concat_fnames(dir_name, (char_u *)"*_sw%", TRUE); | |
1893 #else | |
1894 names[0] = concat_fnames(dir_name, (char_u *)"*.sw?", TRUE); | |
1895 #endif | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
1896 #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
|
1897 // 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
|
1898 // supports this too, on some file systems. |
7 | 1899 names[1] = concat_fnames(dir_name, (char_u *)".*.sw?", TRUE); |
1900 names[2] = concat_fnames(dir_name, (char_u *)".sw?", TRUE); | |
1901 num_names = 3; | |
1902 #else | |
1903 # ifdef VMS | |
1904 names[1] = concat_fnames(dir_name, (char_u *)".*_sw%", TRUE); | |
1905 num_names = 2; | |
1906 # else | |
1907 num_names = 1; | |
1908 # endif | |
1909 #endif | |
1910 } | |
1911 else | |
1912 { | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
1913 #if defined(UNIX) || defined(MSWIN) |
10996
2f041b367cd9
patch 8.0.0387: compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1914 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
|
1915 |
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
1916 p = dir_name + len; |
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
1917 if (after_pathsep(dir_name, p) && len > 1 && p[-1] == p[-2]) |
7 | 1918 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1919 // 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
|
1920 tail = make_percent_swname(dir_name, fname_res); |
7 | 1921 } |
1922 else | |
1923 #endif | |
1924 { | |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1925 tail = gettail(fname_res); |
7 | 1926 tail = concat_fnames(dir_name, tail, TRUE); |
1927 } | |
1928 if (tail == NULL) | |
1929 num_names = 0; | |
1930 else | |
1931 { | |
1932 num_names = recov_file_names(names, tail, FALSE); | |
1933 vim_free(tail); | |
1934 } | |
1935 } | |
1936 } | |
1937 | |
16684
1c2d9f67d98f
patch 8.1.1344: Coverity complains about possibly using a NULL pointer
Bram Moolenaar <Bram@vim.org>
parents:
16666
diff
changeset
|
1938 // check for out-of-memory |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1939 for (int i = 0; i < num_names; ++i) |
7 | 1940 { |
1941 if (names[i] == NULL) | |
1942 { | |
1943 for (i = 0; i < num_names; ++i) | |
1944 vim_free(names[i]); | |
1945 num_names = 0; | |
1946 } | |
1947 } | |
1948 if (num_names == 0) | |
1949 num_files = 0; | |
1950 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
|
1951 EW_NOTENV|EW_KEEPALL|EW_FILE|EW_SILENT) == FAIL) |
7 | 1952 num_files = 0; |
1953 | |
1954 /* | |
1955 * When no swap file found, wildcard expansion might have failed (e.g. | |
1956 * not able to execute the shell). | |
1957 * Try finding a swap file by simply adding ".swp" to the file name. | |
1958 */ | |
2267 | 1959 if (*dirp == NUL && file_count + num_files == 0 && fname != NULL) |
7 | 1960 { |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
1961 stat_T st; |
7 | 1962 char_u *swapname; |
1963 | |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1964 swapname = modname(fname_res, |
2823 | 1965 #if defined(VMS) |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1966 (char_u *)"_swp", FALSE |
7 | 1967 #else |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1968 (char_u *)".swp", TRUE |
7 | 1969 #endif |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1970 ); |
7 | 1971 if (swapname != NULL) |
1972 { | |
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
|
1973 if (mch_stat((char *)swapname, &st) != -1) // It exists! |
7 | 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 files = ALLOC_ONE(char_u *); |
7 | 1976 if (files != NULL) |
1977 { | |
1978 files[0] = swapname; | |
1979 swapname = NULL; | |
1980 num_files = 1; | |
1981 } | |
1982 } | |
1983 vim_free(swapname); | |
1984 } | |
1985 } | |
1986 | |
1987 /* | |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1988 * Remove swapfile name of the current buffer, it must be ignored. |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1989 * But keep it for swapfilelist(). |
7 | 1990 */ |
1991 if (curbuf->b_ml.ml_mfp != NULL | |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1992 && (p = curbuf->b_ml.ml_mfp->mf_fname) != NULL |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1993 && ret_list == NULL) |
7 | 1994 { |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
1995 for (int 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 } | |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2021 else if (do_list) |
7 | 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 { | |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2039 for (int i = 0; i < num_files; ++i) |
7 | 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 } | |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2053 #ifdef FEAT_EVAL |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2054 else if (ret_list != NULL) |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2055 { |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2056 for (int i = 0; i < num_files; ++i) |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2057 { |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2058 char_u *name = concat_fnames(dir_name, files[i], TRUE); |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2059 if (name != NULL) |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2060 { |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2061 list_append_string(ret_list, name, -1); |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2062 vim_free(name); |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2063 } |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2064 } |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2065 } |
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2066 #endif |
7 | 2067 else |
2068 file_count += num_files; | |
2069 | |
31347
56a2af8c0980
patch 9.0.1007: there is no way to get a list of swap file names
Bram Moolenaar <Bram@vim.org>
parents:
30005
diff
changeset
|
2070 for (int i = 0; i < num_names; ++i) |
7 | 2071 vim_free(names[i]); |
838 | 2072 if (num_files > 0) |
2073 FreeWild(num_files, files); | |
7 | 2074 } |
2075 vim_free(dir_name); | |
2076 return file_count; | |
2077 } | |
2078 | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2079 #if defined(UNIX) || defined(MSWIN) || defined(PROTO) |
7 | 2080 /* |
14475
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2081 * Need _very_ long file names. |
7 | 2082 * Append the full path to name with path separators made into percent |
26018
c2d4e40a32a6
patch 8.2.3543: swapname has double slash when 'directory' ends in it
Bram Moolenaar <Bram@vim.org>
parents:
25953
diff
changeset
|
2083 * signs, to "dir". An unnamed buffer is handled as "" (<currentdir>/"") |
c2d4e40a32a6
patch 8.2.3543: swapname has double slash when 'directory' ends in it
Bram Moolenaar <Bram@vim.org>
parents:
25953
diff
changeset
|
2084 * The last character in "dir" must be an extra slash or backslash, it is |
c2d4e40a32a6
patch 8.2.3543: swapname has double slash when 'directory' ends in it
Bram Moolenaar <Bram@vim.org>
parents:
25953
diff
changeset
|
2085 * removed. |
7 | 2086 */ |
14475
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2087 char_u * |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2088 make_percent_swname(char_u *dir, char_u *name) |
7 | 2089 { |
14475
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2090 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
|
2091 |
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2092 f = fix_fname(name != NULL ? name : (char_u *)""); |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2093 if (f == NULL) |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2094 return NULL; |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2095 |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2096 s = alloc(STRLEN(f) + 1); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2097 if (s != NULL) |
7 | 2098 { |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2099 STRCPY(s, f); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2100 for (d = s; *d != NUL; MB_PTR_ADV(d)) |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2101 if (vim_ispathsep(*d)) |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2102 *d = '%'; |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2103 |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2104 dir[STRLEN(dir) - 1] = NUL; // remove one trailing slash |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2105 d = concat_fnames(dir, s, TRUE); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2106 vim_free(s); |
7 | 2107 } |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
2108 vim_free(f); |
7 | 2109 return d; |
2110 } | |
2111 #endif | |
2112 | |
16455
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
2113 #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
|
2114 && (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
|
2115 # define HAVE_PROCESS_STILL_RUNNING |
7 | 2116 static int process_still_running; |
2117 #endif | |
2118 | |
14601
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2119 #if defined(FEAT_EVAL) || defined(PROTO) |
7 | 2120 /* |
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2121 * 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
|
2122 * 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
|
2123 */ |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2124 void |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2125 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
|
2126 { |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2127 int fd; |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2128 struct block0 b0; |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2129 |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2130 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
|
2131 { |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2132 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
|
2133 { |
14601
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2134 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
|
2135 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
|
2136 else if (b0_magic_wrong(&b0)) |
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 *)"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
|
2138 else |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2139 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2140 // we have swap information |
15267
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2141 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
|
2142 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
|
2143 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
|
2144 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
|
2145 |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2146 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
|
2147 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
|
2148 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
|
2149 # 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
|
2150 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
|
2151 # endif |
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2152 } |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2153 } |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2154 else |
15267
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2155 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
|
2156 close(fd); |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2157 } |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2158 else |
15267
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2159 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
|
2160 } |
14601
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2161 #endif |
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2162 |
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2163 /* |
580 | 2164 * Give information about an existing swap file. |
7 | 2165 * Returns timestamp (0 when unknown). |
2166 */ | |
2167 static time_t | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2168 swapfile_info(char_u *fname) |
7 | 2169 { |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
2170 stat_T st; |
7 | 2171 int fd; |
2172 struct block0 b0; | |
2173 #ifdef UNIX | |
2174 char_u uname[B0_UNAME_SIZE]; | |
2175 #endif | |
2176 | |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2177 // print the swap file date |
7 | 2178 if (mch_stat((char *)fname, &st) != -1) |
2179 { | |
2180 #ifdef UNIX | |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2181 // print name of owner of the file |
7 | 2182 if (mch_get_uname(st.st_uid, uname, B0_UNAME_SIZE) == OK) |
2183 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2184 msg_puts(_(" owned by: ")); |
7 | 2185 msg_outtrans(uname); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2186 msg_puts(_(" dated: ")); |
7 | 2187 } |
2188 else | |
2189 #endif | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2190 msg_puts(_(" dated: ")); |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2191 msg_puts(get_ctime(st.st_mtime, TRUE)); |
7 | 2192 } |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2193 else |
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2194 st.st_mtime = 0; |
7 | 2195 |
2196 /* | |
2197 * print the original file name | |
2198 */ | |
2199 fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0); | |
2200 if (fd >= 0) | |
2201 { | |
2664 | 2202 if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0)) |
7 | 2203 { |
2204 if (STRNCMP(b0.b0_version, "VIM 3.0", 7) == 0) | |
2205 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2206 msg_puts(_(" [from Vim version 3.0]")); |
7 | 2207 } |
2267 | 2208 else if (ml_check_b0_id(&b0) == FAIL) |
7 | 2209 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2210 msg_puts(_(" [does not look like a Vim swap file]")); |
7 | 2211 } |
2212 else | |
2213 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2214 msg_puts(_(" file name: ")); |
7 | 2215 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
|
2216 msg_puts(_("[No Name]")); |
7 | 2217 else |
2218 msg_outtrans(b0.b0_fname); | |
2219 | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2220 msg_puts(_("\n modified: ")); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2221 msg_puts(b0.b0_dirty ? _("YES") : _("no")); |
7 | 2222 |
2223 if (*(b0.b0_uname) != NUL) | |
2224 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2225 msg_puts(_("\n user name: ")); |
7 | 2226 msg_outtrans(b0.b0_uname); |
2227 } | |
2228 | |
2229 if (*(b0.b0_hname) != NUL) | |
2230 { | |
2231 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
|
2232 msg_puts(_(" host name: ")); |
7 | 2233 else |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2234 msg_puts(_("\n host name: ")); |
7 | 2235 msg_outtrans(b0.b0_hname); |
2236 } | |
2237 | |
2238 if (char_to_long(b0.b0_pid) != 0L) | |
2239 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2240 msg_puts(_("\n process ID: ")); |
7 | 2241 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
|
2242 #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
|
2243 if (swapfile_process_running(&b0, fname)) |
7 | 2244 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2245 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
|
2246 # ifdef HAVE_PROCESS_STILL_RUNNING |
7 | 2247 process_still_running = TRUE; |
2248 # endif | |
2249 } | |
2250 #endif | |
2251 } | |
2252 | |
2253 if (b0_magic_wrong(&b0)) | |
2254 { | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
2255 #if defined(MSWIN) |
7 | 2256 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
|
2257 msg_puts(_("\n [not usable with this version of Vim]")); |
7 | 2258 else |
2259 #endif | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2260 msg_puts(_("\n [not usable on this computer]")); |
7 | 2261 } |
2262 } | |
2263 } | |
2264 else | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2265 msg_puts(_(" [cannot be read]")); |
7 | 2266 close(fd); |
2267 } | |
2268 else | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2269 msg_puts(_(" [cannot be opened]")); |
7 | 2270 msg_putchar('\n'); |
2271 | |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2272 return st.st_mtime; |
7 | 2273 } |
2274 | |
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2275 /* |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2276 * 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
|
2277 * be safely deleted. |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2278 */ |
28175
3cc909ea91a8
patch 8.2.4613: return type of swapfile_unchanged() is wrong
Bram Moolenaar <Bram@vim.org>
parents:
27752
diff
changeset
|
2279 static int |
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2280 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
|
2281 { |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2282 stat_T st; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2283 int fd; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2284 struct block0 b0; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2285 int ret = TRUE; |
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 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
|
2288 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
|
2289 return 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 // 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
|
2292 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
|
2293 if (fd < 0) |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2294 return FALSE; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2295 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
|
2296 { |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2297 close(fd); |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2298 return FALSE; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2299 } |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2300 |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2301 // 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
|
2302 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
|
2303 ret = FALSE; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2304 |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2305 // must be unchanged |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2306 if (b0.b0_dirty) |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2307 ret = FALSE; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2308 |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2309 #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
|
2310 // 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
|
2311 // 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
|
2312 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
|
2313 { |
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 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
|
2315 } |
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
|
2316 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
|
2317 { |
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
|
2318 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
|
2319 |
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
|
2320 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
|
2321 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
|
2322 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
|
2323 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
|
2324 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
|
2325 } |
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
|
2326 |
18498
9e6d5a4abb1c
patch 8.1.2243: typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
18459
diff
changeset
|
2327 // 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
|
2328 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
|
2329 ret = FALSE; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2330 #endif |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2331 |
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
|
2332 // 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
|
2333 // 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
|
2334 |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2335 close(fd); |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2336 return ret; |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2337 } |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2338 |
7 | 2339 static int |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2340 recov_file_names(char_u **names, char_u *path, int prepend_dot) |
7 | 2341 { |
2342 int num_names; | |
2343 | |
2344 /* | |
2345 * (Win32 and Win64) never short names, but do prepend a dot. | |
2346 * (Not MS-DOS or Win32 or Win64) maybe short name, maybe not: Try both. | |
2347 * Only use the short name if it is different. | |
2348 */ | |
2349 char_u *p; | |
2350 int i; | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2351 # ifndef MSWIN |
7 | 2352 int shortname = curbuf->b_shortname; |
2353 | |
2354 curbuf->b_shortname = FALSE; | |
2355 # endif | |
2356 | |
2357 num_names = 0; | |
2358 | |
2359 /* | |
2360 * May also add the file name with a dot prepended, for swap file in same | |
2361 * dir as original file. | |
2362 */ | |
2363 if (prepend_dot) | |
2364 { | |
2365 names[num_names] = modname(path, (char_u *)".sw?", TRUE); | |
2366 if (names[num_names] == NULL) | |
2367 goto end; | |
2368 ++num_names; | |
2369 } | |
2370 | |
2371 /* | |
2372 * Form the normal swap file name pattern by appending ".sw?". | |
2373 */ | |
2374 #ifdef VMS | |
2375 names[num_names] = concat_fnames(path, (char_u *)"_sw%", FALSE); | |
2376 #else | |
2377 names[num_names] = concat_fnames(path, (char_u *)".sw?", FALSE); | |
2378 #endif | |
2379 if (names[num_names] == NULL) | |
2380 goto end; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2381 if (num_names >= 1) // check if we have the same name twice |
7 | 2382 { |
2383 p = names[num_names - 1]; | |
2384 i = (int)STRLEN(names[num_names - 1]) - (int)STRLEN(names[num_names]); | |
2385 if (i > 0) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2386 p += i; // file name has been expanded to full path |
7 | 2387 |
2388 if (STRCMP(p, names[num_names]) != 0) | |
2389 ++num_names; | |
2390 else | |
2391 vim_free(names[num_names]); | |
2392 } | |
2393 else | |
2394 ++num_names; | |
2395 | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2396 # ifndef MSWIN |
7 | 2397 /* |
2398 * Also try with 'shortname' set, in case the file is on a DOS filesystem. | |
2399 */ | |
2400 curbuf->b_shortname = TRUE; | |
2401 #ifdef VMS | |
2402 names[num_names] = modname(path, (char_u *)"_sw%", FALSE); | |
2403 #else | |
2404 names[num_names] = modname(path, (char_u *)".sw?", FALSE); | |
2405 #endif | |
2406 if (names[num_names] == NULL) | |
2407 goto end; | |
2408 | |
2409 /* | |
2410 * Remove the one from 'shortname', if it's the same as with 'noshortname'. | |
2411 */ | |
2412 p = names[num_names]; | |
2413 i = STRLEN(names[num_names]) - STRLEN(names[num_names - 1]); | |
2414 if (i > 0) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2415 p += i; // file name has been expanded to full path |
7 | 2416 if (STRCMP(names[num_names - 1], p) == 0) |
2417 vim_free(names[num_names]); | |
2418 else | |
2419 ++num_names; | |
2420 # endif | |
2421 | |
2422 end: | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2423 # ifndef MSWIN |
7 | 2424 curbuf->b_shortname = shortname; |
2425 # endif | |
2426 | |
2427 return num_names; | |
2428 } | |
2429 | |
2430 /* | |
2431 * sync all memlines | |
2432 * | |
2433 * If 'check_file' is TRUE, check if original file exists and was not changed. | |
2434 * If 'check_char' is TRUE, stop syncing when character becomes available, but | |
2435 * always sync at least one block. | |
2436 */ | |
2437 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2438 ml_sync_all(int check_file, int check_char) |
7 | 2439 { |
2440 buf_T *buf; | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
2441 stat_T st; |
7 | 2442 |
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
2443 FOR_ALL_BUFFERS(buf) |
7 | 2444 { |
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
2445 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
|
2446 || 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
|
2447 || 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
|
2448 continue; // no file |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2449 |
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2450 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
|
2451 // flush locked block |
7 | 2452 (void)ml_find_line(buf, (linenr_T)0, ML_FLUSH); |
2453 if (bufIsChanged(buf) && check_file && mf_need_trans(buf->b_ml.ml_mfp) | |
2454 && buf->b_ffname != NULL) | |
2455 { | |
2456 /* | |
2457 * If the original file does not exist anymore or has been changed | |
2458 * call ml_preserve() to get rid of all negative numbered blocks. | |
2459 */ | |
2460 if (mch_stat((char *)buf->b_ffname, &st) == -1 | |
2461 || st.st_mtime != buf->b_mtime_read | |
25953
d7e1cf30728c
patch 8.2.3510: changes are only detected with one second accuracy
Bram Moolenaar <Bram@vim.org>
parents:
25913
diff
changeset
|
2462 #ifdef ST_MTIM_NSEC |
d7e1cf30728c
patch 8.2.3510: changes are only detected with one second accuracy
Bram Moolenaar <Bram@vim.org>
parents:
25913
diff
changeset
|
2463 || st.ST_MTIM_NSEC != buf->b_mtime_read_ns |
d7e1cf30728c
patch 8.2.3510: changes are only detected with one second accuracy
Bram Moolenaar <Bram@vim.org>
parents:
25913
diff
changeset
|
2464 #endif |
2241
60da25e3aab7
Correct use of long instead of off_t for file size. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2240
diff
changeset
|
2465 || st.st_size != buf->b_orig_size) |
7 | 2466 { |
2467 ml_preserve(buf, FALSE); | |
2468 did_check_timestamps = FALSE; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2469 need_check_timestamps = TRUE; // give message later |
7 | 2470 } |
2471 } | |
2472 if (buf->b_ml.ml_mfp->mf_dirty) | |
2473 { | |
2474 (void)mf_sync(buf->b_ml.ml_mfp, (check_char ? MFS_STOP : 0) | |
2475 | (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
|
2476 if (check_char && ui_char_avail()) // character available now |
7 | 2477 break; |
2478 } | |
2479 } | |
2480 } | |
2481 | |
2482 /* | |
2483 * sync one buffer, including negative blocks | |
2484 * | |
2485 * after this all the blocks are in the swap file | |
2486 * | |
2487 * Used for the :preserve command and when the original file has been | |
2488 * changed or deleted. | |
2489 * | |
2490 * when message is TRUE the success of preserving is reported | |
2491 */ | |
2492 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2493 ml_preserve(buf_T *buf, int message) |
7 | 2494 { |
2495 bhdr_T *hp; | |
2496 linenr_T lnum; | |
2497 memfile_T *mfp = buf->b_ml.ml_mfp; | |
2498 int status; | |
2499 int got_int_save = got_int; | |
2500 | |
2501 if (mfp == NULL || mfp->mf_fname == NULL) | |
2502 { | |
2503 if (message) | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
2504 emsg(_(e_cannot_preserve_there_is_no_swap_file)); |
7 | 2505 return; |
2506 } | |
2507 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2508 // 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
|
2509 // before. |
7 | 2510 got_int = FALSE; |
2511 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2512 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
|
2513 (void)ml_find_line(buf, (linenr_T)0, ML_FLUSH); // flush locked block |
7 | 2514 status = mf_sync(mfp, MFS_ALL | MFS_FLUSH); |
2515 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2516 // stack is invalid after mf_sync(.., MFS_ALL) |
7 | 2517 buf->b_ml.ml_stack_top = 0; |
2518 | |
2519 /* | |
2520 * Some of the data blocks may have been changed from negative to | |
2521 * positive block number. In that case the pointer blocks need to be | |
2522 * updated. | |
2523 * | |
2524 * We don't know in which pointer block the references are, so we visit | |
2525 * all data blocks until there are no more translations to be done (or | |
2526 * we hit the end of the file, which can only happen in case a write fails, | |
2527 * e.g. when file system if full). | |
2528 * ml_find_line() does the work by translating the negative block numbers | |
2529 * when getting the first line of each data block. | |
2530 */ | |
2531 if (mf_need_trans(mfp) && !got_int) | |
2532 { | |
2533 lnum = 1; | |
2534 while (mf_need_trans(mfp) && lnum <= buf->b_ml.ml_line_count) | |
2535 { | |
2536 hp = ml_find_line(buf, lnum, ML_FIND); | |
2537 if (hp == NULL) | |
2538 { | |
2539 status = FAIL; | |
2540 goto theend; | |
2541 } | |
2542 CHECK(buf->b_ml.ml_locked_low != lnum, "low != lnum"); | |
2543 lnum = buf->b_ml.ml_locked_high + 1; | |
2544 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2545 (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
|
2546 // sync the updated pointer blocks |
7 | 2547 if (mf_sync(mfp, MFS_ALL | MFS_FLUSH) == FAIL) |
2548 status = FAIL; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2549 buf->b_ml.ml_stack_top = 0; // stack is invalid now |
7 | 2550 } |
2551 theend: | |
2552 got_int |= got_int_save; | |
2553 | |
2554 if (message) | |
2555 { | |
2556 if (status == OK) | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2557 msg(_("File preserved")); |
7 | 2558 else |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
2559 emsg(_(e_preserve_failed)); |
7 | 2560 } |
2561 } | |
2562 | |
2563 /* | |
2564 * NOTE: The pointer returned by the ml_get_*() functions only remains valid | |
2565 * until the next call! | |
2566 * line1 = ml_get(1); | |
2567 * line2 = ml_get(2); // line1 is now invalid! | |
2568 * Make a copy of the line if necessary. | |
2569 */ | |
2570 /* | |
2657 | 2571 * Return a pointer to a (read-only copy of a) line. |
7 | 2572 * |
2573 * On failure an error message is given and IObuff is returned (to avoid | |
2574 * having to check for error everywhere). | |
2575 */ | |
2576 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2577 ml_get(linenr_T lnum) |
7 | 2578 { |
2579 return ml_get_buf(curbuf, lnum, FALSE); | |
2580 } | |
2581 | |
2582 /* | |
2657 | 2583 * Return pointer to position "pos". |
7 | 2584 */ |
2585 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2586 ml_get_pos(pos_T *pos) |
7 | 2587 { |
2588 return (ml_get_buf(curbuf, pos->lnum, FALSE) + pos->col); | |
2589 } | |
2590 | |
2591 /* | |
2657 | 2592 * Return pointer to cursor line. |
7 | 2593 */ |
2594 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2595 ml_get_curline(void) |
7 | 2596 { |
2597 return ml_get_buf(curbuf, curwin->w_cursor.lnum, FALSE); | |
2598 } | |
2599 | |
2600 /* | |
2657 | 2601 * Return pointer to cursor position. |
7 | 2602 */ |
2603 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2604 ml_get_cursor(void) |
7 | 2605 { |
2606 return (ml_get_buf(curbuf, curwin->w_cursor.lnum, FALSE) + | |
2607 curwin->w_cursor.col); | |
2608 } | |
2609 | |
2610 /* | |
2657 | 2611 * Return a pointer to a line in a specific buffer |
7 | 2612 * |
2613 * "will_change": if TRUE mark the buffer dirty (chars in the line will be | |
2614 * changed) | |
2615 */ | |
2616 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2617 ml_get_buf( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2618 buf_T *buf, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2619 linenr_T lnum, |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2620 int will_change) // line will be changed |
7 | 2621 { |
1068 | 2622 bhdr_T *hp; |
2623 DATA_BL *dp; | |
2624 static int recursive = 0; | |
26286
2815b25993fb
patch 8.2.3674: when ml_get_buf() fails it messes up IObuff
Bram Moolenaar <Bram@vim.org>
parents:
26018
diff
changeset
|
2625 static char_u questions[4]; |
7 | 2626 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2627 if (lnum > buf->b_ml.ml_line_count) // invalid line number |
7 | 2628 { |
1068 | 2629 if (recursive == 0) |
2630 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2631 // 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
|
2632 // the GUI redraws part of the text. |
1068 | 2633 ++recursive; |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
2634 siemsg(_(e_ml_get_invalid_lnum_nr), lnum); |
1068 | 2635 --recursive; |
2636 } | |
27746
2d24aad37e60
patch 8.2.4399: crash after ml_get error
Bram Moolenaar <Bram@vim.org>
parents:
27453
diff
changeset
|
2637 ml_flush_line(buf); |
7 | 2638 errorret: |
26286
2815b25993fb
patch 8.2.3674: when ml_get_buf() fails it messes up IObuff
Bram Moolenaar <Bram@vim.org>
parents:
26018
diff
changeset
|
2639 STRCPY(questions, "???"); |
16786
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2640 buf->b_ml.ml_line_len = 4; |
27746
2d24aad37e60
patch 8.2.4399: crash after ml_get error
Bram Moolenaar <Bram@vim.org>
parents:
27453
diff
changeset
|
2641 buf->b_ml.ml_line_lnum = lnum; |
26286
2815b25993fb
patch 8.2.3674: when ml_get_buf() fails it messes up IObuff
Bram Moolenaar <Bram@vim.org>
parents:
26018
diff
changeset
|
2642 return questions; |
7 | 2643 } |
16786
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2644 if (lnum <= 0) // pretend line 0 is line 1 |
7 | 2645 lnum = 1; |
2646 | |
16786
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2647 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
|
2648 { |
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2649 buf->b_ml.ml_line_len = 1; |
7 | 2650 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
|
2651 } |
7 | 2652 |
2108
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2653 /* |
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2654 * 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
|
2655 * Otherwise may need to flush last used line. |
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2656 * 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
|
2657 * blocks. |
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2658 */ |
1066 | 2659 if (buf->b_ml.ml_line_lnum != lnum || mf_dont_release) |
7 | 2660 { |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2661 unsigned start, end; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2662 colnr_T len; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2663 int idx; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2664 |
7 | 2665 ml_flush_line(buf); |
2666 | |
2667 /* | |
2668 * Find the data block containing the line. | |
2669 * This also fills the stack with the blocks from the root to the data | |
2670 * block and releases any locked block. | |
2671 */ | |
2672 if ((hp = ml_find_line(buf, lnum, ML_FIND)) == NULL) | |
2673 { | |
1068 | 2674 if (recursive == 0) |
2675 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2676 // 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
|
2677 // when the GUI redraws part of the text. |
1068 | 2678 ++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
|
2679 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
|
2680 shorten_dir(NameBuff); |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
2681 siemsg(_(e_ml_get_cannot_find_line_nr_in_buffer_nr_str), |
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
|
2682 lnum, buf->b_fnum, NameBuff); |
1068 | 2683 --recursive; |
2684 } | |
7 | 2685 goto errorret; |
2686 } | |
2687 | |
2688 dp = (DATA_BL *)(hp->bh_data); | |
2689 | |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2690 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
|
2691 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
|
2692 // 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
|
2693 // 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
|
2694 if (idx == 0) |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2695 end = dp->db_txt_end; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2696 else |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2697 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
|
2698 len = end - start; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2699 |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2700 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
|
2701 buf->b_ml.ml_line_len = len; |
7 | 2702 buf->b_ml.ml_line_lnum = lnum; |
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2703 buf->b_ml.ml_flags &= ~(ML_LINE_DIRTY | ML_ALLOCATED); |
7 | 2704 } |
2705 if (will_change) | |
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2706 { |
7 | 2707 buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS); |
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2708 #ifdef FEAT_EVAL |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2709 if (ml_get_alloc_lines && (buf->b_ml.ml_flags & ML_ALLOCATED)) |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2710 // can't make the change in the data block |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2711 buf->b_ml.ml_flags |= ML_LINE_DIRTY; |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2712 #endif |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2713 } |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2714 |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2715 #ifdef FEAT_EVAL |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2716 if (ml_get_alloc_lines |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2717 && (buf->b_ml.ml_flags & (ML_LINE_DIRTY | ML_ALLOCATED)) == 0) |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2718 { |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2719 char_u *p = alloc(buf->b_ml.ml_line_len); |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2720 |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2721 // make sure the text is in allocated memory |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2722 if (p != NULL) |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2723 { |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2724 memmove(p, buf->b_ml.ml_line_ptr, buf->b_ml.ml_line_len); |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2725 buf->b_ml.ml_line_ptr = p; |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2726 buf->b_ml.ml_flags |= ML_ALLOCATED; |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2727 if (will_change) |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2728 // can't make the change in the data block |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2729 buf->b_ml.ml_flags |= ML_LINE_DIRTY; |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2730 } |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2731 } |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2732 #endif |
7 | 2733 return buf->b_ml.ml_line_ptr; |
2734 } | |
2735 | |
2736 /* | |
2737 * Check if a line that was just obtained by a call to ml_get | |
2738 * is in allocated memory. | |
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2739 * This ignores ML_ALLOCATED to get the same behavior as without the test |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2740 * override. |
7 | 2741 */ |
2742 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2743 ml_line_alloced(void) |
7 | 2744 { |
2745 return (curbuf->b_ml.ml_flags & ML_LINE_DIRTY); | |
2746 } | |
2747 | |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2748 #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
|
2749 /* |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2750 * 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
|
2751 */ |
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
|
2752 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
|
2753 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
|
2754 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
|
2755 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
|
2756 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
|
2757 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
|
2758 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
|
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 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
|
2761 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
|
2762 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
|
2763 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
|
2764 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
|
2765 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
|
2766 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
|
2767 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
|
2768 |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2769 // 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
|
2770 // 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
|
2771 // 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
|
2772 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
|
2773 { |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2774 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
|
2775 { |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2776 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
|
2777 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
|
2778 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
|
2779 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
|
2780 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
|
2781 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
|
2782 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
|
2783 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
|
2784 } |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2785 |
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 // 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
|
2787 // 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
|
2788 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
|
2789 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
|
2790 { |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2791 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
|
2792 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
|
2793 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
|
2794 { |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2795 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
|
2796 { |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2797 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
|
2798 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
|
2799 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
|
2800 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
|
2801 * 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
|
2802 } |
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 ++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
|
2804 } |
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 } |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2806 } |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2807 *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
|
2808 *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
|
2809 *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
|
2810 } |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2811 #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
|
2812 |
7 | 2813 static int |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2814 ml_append_int( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2815 buf_T *buf, |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2816 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
|
2817 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
|
2818 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
|
2819 int flags) // ML_APPEND_ flags |
7 | 2820 { |
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
|
2821 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
|
2822 colnr_T len = len_arg; |
7 | 2823 int i; |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2824 int line_count; // number of indexes in current block |
7 | 2825 int offset; |
2826 int from, to; | |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2827 int space_needed; // space needed for new line |
7 | 2828 int page_size; |
2829 int page_count; | |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2830 int db_idx; // index for lnum in data block |
7 | 2831 bhdr_T *hp; |
2832 memfile_T *mfp; | |
2833 DATA_BL *dp; | |
2834 PTR_BL *pp; | |
2835 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
|
2836 #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
|
2837 char_u *tofree = NULL; |
29651
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2838 # ifdef FEAT_BYTEOFF |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2839 colnr_T text_len = 0; // text len with NUL without text properties |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2840 # 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
|
2841 #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
|
2842 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
|
2843 |
7 | 2844 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
|
2845 return FAIL; // lnum out of range |
7 | 2846 |
2847 if (lowest_marked && lowest_marked > lnum) | |
2848 lowest_marked = lnum + 1; | |
2849 | |
2850 if (len == 0) | |
29651
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2851 { |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2852 len = (colnr_T)STRLEN(line) + 1; // space needed for the text |
29651
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2853 #if defined(FEAT_PROP_POPUP) && defined(FEAT_BYTEOFF) |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2854 text_len = len; |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2855 #endif |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2856 } |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2857 #if defined(FEAT_PROP_POPUP) && defined(FEAT_BYTEOFF) |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2858 else if (curbuf->b_has_textprop) |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2859 // "len" may include text properties, get the length of the text. |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2860 text_len = (colnr_T)STRLEN(line) + 1; |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2861 else |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2862 text_len = len; |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
2863 #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
|
2864 |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2865 #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
|
2866 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
|
2867 && !(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
|
2868 // 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
|
2869 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
|
2870 #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
|
2871 |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2872 space_needed = len + INDEX_SIZE; // space needed for text + index |
7 | 2873 |
2874 mfp = buf->b_ml.ml_mfp; | |
2875 page_size = mfp->mf_page_size; | |
2876 | |
2877 /* | |
2878 * find the data block containing the previous line | |
2879 * This also fills the stack with the blocks from the root to the data block | |
2880 * This also releases any locked block. | |
2881 */ | |
2882 if ((hp = ml_find_line(buf, lnum == 0 ? (linenr_T)1 : lnum, | |
2883 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
|
2884 goto theend; |
7 | 2885 |
2886 buf->b_ml.ml_flags &= ~ML_EMPTY; | |
2887 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2888 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
|
2889 db_idx = -1; // careful, it is negative! |
7 | 2890 else |
2891 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
|
2892 // get line count before the insertion |
7 | 2893 line_count = buf->b_ml.ml_locked_high - buf->b_ml.ml_locked_low; |
2894 | |
2895 dp = (DATA_BL *)(hp->bh_data); | |
2896 | |
2897 /* | |
2898 * If | |
2899 * - there is not enough room in the current block | |
2900 * - appending to the last line in the block | |
2901 * - not appending to the last line in the file | |
2902 * insert in front of the next block. | |
2903 */ | |
2904 if ((int)dp->db_free < space_needed && db_idx == line_count - 1 | |
2905 && lnum < buf->b_ml.ml_line_count) | |
2906 { | |
2907 /* | |
2908 * Now that the line is not going to be inserted in the block that we | |
2909 * expected, the line count has to be adjusted in the pointer blocks | |
2910 * by using ml_locked_lineadd. | |
2911 */ | |
2912 --(buf->b_ml.ml_locked_lineadd); | |
2913 --(buf->b_ml.ml_locked_high); | |
2914 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
|
2915 goto theend; |
7 | 2916 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2917 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
|
2918 // get line count before the insertion |
7 | 2919 line_count = buf->b_ml.ml_locked_high - buf->b_ml.ml_locked_low; |
2920 CHECK(buf->b_ml.ml_locked_low != lnum + 1, "locked_low != lnum + 1"); | |
2921 | |
2922 dp = (DATA_BL *)(hp->bh_data); | |
2923 } | |
2924 | |
2925 ++buf->b_ml.ml_line_count; | |
2926 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2927 if ((int)dp->db_free >= space_needed) // enough room in data block |
7 | 2928 { |
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
|
2929 /* |
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 * 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
|
2931 * 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
|
2932 */ |
7 | 2933 dp->db_txt_start -= len; |
2934 dp->db_free -= space_needed; | |
2935 ++(dp->db_line_count); | |
2936 | |
2937 /* | |
2938 * move the text of the lines that follow to the front | |
2939 * adjust the indexes of the lines that follow | |
2940 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2941 if (line_count > db_idx + 1) // if there are following lines |
7 | 2942 { |
2943 /* | |
2944 * Offset is the start of the previous line. | |
2945 * This will become the character just after the new line. | |
2946 */ | |
2947 if (db_idx < 0) | |
2948 offset = dp->db_txt_end; | |
2949 else | |
2950 offset = ((dp->db_index[db_idx]) & DB_INDEX_MASK); | |
2951 mch_memmove((char *)dp + dp->db_txt_start, | |
2952 (char *)dp + dp->db_txt_start + len, | |
2953 (size_t)(offset - (dp->db_txt_start + len))); | |
2954 for (i = line_count - 1; i > db_idx; --i) | |
2955 dp->db_index[i + 1] = dp->db_index[i] - len; | |
2956 dp->db_index[db_idx + 1] = offset - len; | |
2957 } | |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2958 else |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2959 // add line at the end (which is the start of the text) |
7 | 2960 dp->db_index[db_idx + 1] = dp->db_txt_start; |
2961 | |
2962 /* | |
2963 * copy the text into the block | |
2964 */ | |
2965 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
|
2966 if (flags & ML_APPEND_MARK) |
7 | 2967 dp->db_index[db_idx + 1] |= DB_MARKED; |
2968 | |
2969 /* | |
2970 * Mark the block dirty. | |
2971 */ | |
2972 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
|
2973 if (!(flags & ML_APPEND_NEW)) |
7 | 2974 buf->b_ml.ml_flags |= ML_LOCKED_POS; |
2975 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2976 else // not enough space in data block |
7 | 2977 { |
2978 long line_count_left, line_count_right; | |
2979 int page_count_left, page_count_right; | |
2980 bhdr_T *hp_left; | |
2981 bhdr_T *hp_right; | |
2982 bhdr_T *hp_new; | |
2983 int lines_moved; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2984 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
|
2985 int total_moved = 0; // init to shut up gcc |
7 | 2986 DATA_BL *dp_right, *dp_left; |
2987 int stack_idx; | |
2988 int in_left; | |
2989 int lineadd; | |
2990 blocknr_T bnum_left, bnum_right; | |
2991 linenr_T lnum_left, lnum_right; | |
2992 int pb_idx; | |
2993 PTR_BL *pp_new; | |
2994 | |
2995 /* | |
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
|
2996 * 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
|
2997 * 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
|
2998 * 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
|
2999 * 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
|
3000 * 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
|
3001 * 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
|
3002 * 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
|
3003 * |
7 | 3004 * We are going to allocate a new data block. Depending on the |
3005 * situation it will be put to the left or right of the existing | |
3006 * block. If possible we put the new line in the left block and move | |
3007 * the lines after it to the right block. Otherwise the new line is | |
3008 * also put in the right block. This method is more efficient when | |
3009 * inserting a lot of lines at one place. | |
3010 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3011 if (db_idx < 0) // left block is new, right block is existing |
7 | 3012 { |
3013 lines_moved = 0; | |
3014 in_left = TRUE; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3015 // space_needed does not change |
7 | 3016 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3017 else // left block is existing, right block is new |
7 | 3018 { |
3019 lines_moved = line_count - db_idx - 1; | |
3020 if (lines_moved == 0) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3021 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
|
3022 // space_needed does not change |
7 | 3023 else |
3024 { | |
3025 data_moved = ((dp->db_index[db_idx]) & DB_INDEX_MASK) - | |
3026 dp->db_txt_start; | |
3027 total_moved = data_moved + lines_moved * INDEX_SIZE; | |
3028 if ((int)dp->db_free + total_moved >= space_needed) | |
3029 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3030 in_left = TRUE; // put new line in left block |
7 | 3031 space_needed = total_moved; |
3032 } | |
3033 else | |
3034 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3035 in_left = FALSE; // put new line in right block |
7 | 3036 space_needed += total_moved; |
3037 } | |
3038 } | |
3039 } | |
3040 | |
3041 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
|
3042 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
|
3043 == NULL) |
7 | 3044 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3045 // correct line counts in pointer blocks |
7 | 3046 --(buf->b_ml.ml_locked_lineadd); |
3047 --(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
|
3048 goto theend; |
7 | 3049 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3050 if (db_idx < 0) // left block is new |
7 | 3051 { |
3052 hp_left = hp_new; | |
3053 hp_right = hp; | |
3054 line_count_left = 0; | |
3055 line_count_right = line_count; | |
3056 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3057 else // right block is new |
7 | 3058 { |
3059 hp_left = hp; | |
3060 hp_right = hp_new; | |
3061 line_count_left = line_count; | |
3062 line_count_right = 0; | |
3063 } | |
3064 dp_right = (DATA_BL *)(hp_right->bh_data); | |
3065 dp_left = (DATA_BL *)(hp_left->bh_data); | |
3066 bnum_left = hp_left->bh_bnum; | |
3067 bnum_right = hp_right->bh_bnum; | |
3068 page_count_left = hp_left->bh_page_count; | |
3069 page_count_right = hp_right->bh_page_count; | |
3070 | |
3071 /* | |
3072 * May move the new line into the right/new block. | |
3073 */ | |
3074 if (!in_left) | |
3075 { | |
3076 dp_right->db_txt_start -= len; | |
3077 dp_right->db_free -= len + INDEX_SIZE; | |
3078 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
|
3079 if (flags & ML_APPEND_MARK) |
7 | 3080 dp_right->db_index[0] |= DB_MARKED; |
3081 | |
3082 mch_memmove((char *)dp_right + dp_right->db_txt_start, | |
3083 line, (size_t)len); | |
3084 ++line_count_right; | |
3085 } | |
3086 /* | |
3087 * may move lines from the left/old block to the right/new one. | |
3088 */ | |
3089 if (lines_moved) | |
3090 { | |
3091 dp_right->db_txt_start -= data_moved; | |
3092 dp_right->db_free -= total_moved; | |
3093 mch_memmove((char *)dp_right + dp_right->db_txt_start, | |
3094 (char *)dp_left + dp_left->db_txt_start, | |
3095 (size_t)data_moved); | |
3096 offset = dp_right->db_txt_start - dp_left->db_txt_start; | |
3097 dp_left->db_txt_start += data_moved; | |
3098 dp_left->db_free += total_moved; | |
3099 | |
3100 /* | |
3101 * update indexes in the new block | |
3102 */ | |
3103 for (to = line_count_right, from = db_idx + 1; | |
3104 from < line_count_left; ++from, ++to) | |
3105 dp_right->db_index[to] = dp->db_index[from] + offset; | |
3106 line_count_right += lines_moved; | |
3107 line_count_left -= lines_moved; | |
3108 } | |
3109 | |
3110 /* | |
3111 * May move the new line into the left (old or new) block. | |
3112 */ | |
3113 if (in_left) | |
3114 { | |
3115 dp_left->db_txt_start -= len; | |
3116 dp_left->db_free -= len + INDEX_SIZE; | |
3117 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
|
3118 if (flags & ML_APPEND_MARK) |
7 | 3119 dp_left->db_index[line_count_left] |= DB_MARKED; |
3120 mch_memmove((char *)dp_left + dp_left->db_txt_start, | |
3121 line, (size_t)len); | |
3122 ++line_count_left; | |
3123 } | |
3124 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3125 if (db_idx < 0) // left block is new |
7 | 3126 { |
3127 lnum_left = lnum + 1; | |
3128 lnum_right = 0; | |
3129 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3130 else // right block is new |
7 | 3131 { |
3132 lnum_left = 0; | |
3133 if (in_left) | |
3134 lnum_right = lnum + 2; | |
3135 else | |
3136 lnum_right = lnum + 1; | |
3137 } | |
3138 dp_left->db_line_count = line_count_left; | |
3139 dp_right->db_line_count = line_count_right; | |
3140 | |
3141 /* | |
3142 * release the two data blocks | |
3143 * The new one (hp_new) already has a correct blocknumber. | |
3144 * The old one (hp, in ml_locked) gets a positive blocknumber if | |
3145 * we changed it and we are not editing a new file. | |
3146 */ | |
3147 if (lines_moved || in_left) | |
3148 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
|
3149 if (!(flags & ML_APPEND_NEW) && db_idx >= 0 && in_left) |
7 | 3150 buf->b_ml.ml_flags |= ML_LOCKED_POS; |
3151 mf_put(mfp, hp_new, TRUE, FALSE); | |
3152 | |
3153 /* | |
3154 * flush the old data block | |
3155 * set ml_locked_lineadd to 0, because the updating of the | |
3156 * pointer blocks is done below | |
3157 */ | |
3158 lineadd = buf->b_ml.ml_locked_lineadd; | |
3159 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
|
3160 ml_find_line(buf, (linenr_T)0, ML_FLUSH); // flush data block |
7 | 3161 |
3162 /* | |
3163 * update pointer blocks for the new data block | |
3164 */ | |
3165 for (stack_idx = buf->b_ml.ml_stack_top - 1; stack_idx >= 0; | |
3166 --stack_idx) | |
3167 { | |
3168 ip = &(buf->b_ml.ml_stack[stack_idx]); | |
3169 pb_idx = ip->ip_index; | |
3170 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
|
3171 goto theend; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3172 pp = (PTR_BL *)(hp->bh_data); // must be pointer block |
7 | 3173 if (pp->pb_id != PTR_ID) |
3174 { | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
3175 iemsg(_(e_pointer_block_id_wrong_three)); |
7 | 3176 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
|
3177 goto theend; |
7 | 3178 } |
3179 /* | |
3180 * TODO: If the pointer block is full and we are adding at the end | |
3181 * try to insert in front of the next block | |
3182 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3183 // block not full, add one entry |
7 | 3184 if (pp->pb_count < pp->pb_count_max) |
3185 { | |
3186 if (pb_idx + 1 < (int)pp->pb_count) | |
3187 mch_memmove(&pp->pb_pointer[pb_idx + 2], | |
3188 &pp->pb_pointer[pb_idx + 1], | |
3189 (size_t)(pp->pb_count - pb_idx - 1) * sizeof(PTR_EN)); | |
3190 ++pp->pb_count; | |
3191 pp->pb_pointer[pb_idx].pe_line_count = line_count_left; | |
3192 pp->pb_pointer[pb_idx].pe_bnum = bnum_left; | |
3193 pp->pb_pointer[pb_idx].pe_page_count = page_count_left; | |
3194 pp->pb_pointer[pb_idx + 1].pe_line_count = line_count_right; | |
3195 pp->pb_pointer[pb_idx + 1].pe_bnum = bnum_right; | |
3196 pp->pb_pointer[pb_idx + 1].pe_page_count = page_count_right; | |
3197 | |
3198 if (lnum_left != 0) | |
3199 pp->pb_pointer[pb_idx].pe_old_lnum = lnum_left; | |
3200 if (lnum_right != 0) | |
3201 pp->pb_pointer[pb_idx + 1].pe_old_lnum = lnum_right; | |
3202 | |
3203 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
|
3204 buf->b_ml.ml_stack_top = stack_idx + 1; // truncate stack |
7 | 3205 |
3206 if (lineadd) | |
3207 { | |
3208 --(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
|
3209 // fix line count for rest of blocks in the stack |
7 | 3210 ml_lineadd(buf, lineadd); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3211 // fix stack itself |
7 | 3212 buf->b_ml.ml_stack[buf->b_ml.ml_stack_top].ip_high += |
3213 lineadd; | |
3214 ++(buf->b_ml.ml_stack_top); | |
3215 } | |
3216 | |
3217 /* | |
3218 * We are finished, break the loop here. | |
3219 */ | |
3220 break; | |
3221 } | |
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3222 // pointer block full |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3223 /* |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3224 * split the pointer block |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3225 * allocate a new pointer block |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3226 * move some of the pointer into the new block |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3227 * prepare for updating the parent block |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3228 */ |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3229 for (;;) // do this twice when splitting block 1 |
7 | 3230 { |
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3231 hp_new = ml_new_ptr(mfp); |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3232 if (hp_new == NULL) // TODO: try to fix tree |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3233 goto theend; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3234 pp_new = (PTR_BL *)(hp_new->bh_data); |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3235 |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3236 if (hp->bh_bnum != 1) |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3237 break; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3238 |
7 | 3239 /* |
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3240 * if block 1 becomes full the tree is given an extra level |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3241 * The pointers from block 1 are moved into the new block. |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3242 * block 1 is updated to point to the new block |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3243 * then continue to split the new block |
7 | 3244 */ |
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3245 mch_memmove(pp_new, pp, (size_t)page_size); |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3246 pp->pb_count = 1; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3247 pp->pb_pointer[0].pe_bnum = hp_new->bh_bnum; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3248 pp->pb_pointer[0].pe_line_count = buf->b_ml.ml_line_count; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3249 pp->pb_pointer[0].pe_old_lnum = 1; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3250 pp->pb_pointer[0].pe_page_count = 1; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3251 mf_put(mfp, hp, TRUE, FALSE); // release block 1 |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3252 hp = hp_new; // new block is to be split |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3253 pp = pp_new; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3254 CHECK(stack_idx != 0, _("stack_idx should be 0")); |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3255 ip->ip_index = 0; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3256 ++stack_idx; // do block 1 again later |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3257 } |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3258 /* |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3259 * move the pointers after the current one to the new block |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3260 * If there are none, the new entry will be in the new block. |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3261 */ |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3262 total_moved = pp->pb_count - pb_idx - 1; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3263 if (total_moved) |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3264 { |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3265 mch_memmove(&pp_new->pb_pointer[0], |
7 | 3266 &pp->pb_pointer[pb_idx + 1], |
3267 (size_t)(total_moved) * sizeof(PTR_EN)); | |
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3268 pp_new->pb_count = total_moved; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3269 pp->pb_count -= total_moved - 1; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3270 pp->pb_pointer[pb_idx + 1].pe_bnum = bnum_right; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3271 pp->pb_pointer[pb_idx + 1].pe_line_count = line_count_right; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3272 pp->pb_pointer[pb_idx + 1].pe_page_count = page_count_right; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3273 if (lnum_right) |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3274 pp->pb_pointer[pb_idx + 1].pe_old_lnum = lnum_right; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3275 } |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3276 else |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3277 { |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3278 pp_new->pb_count = 1; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3279 pp_new->pb_pointer[0].pe_bnum = bnum_right; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3280 pp_new->pb_pointer[0].pe_line_count = line_count_right; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3281 pp_new->pb_pointer[0].pe_page_count = page_count_right; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3282 pp_new->pb_pointer[0].pe_old_lnum = lnum_right; |
7 | 3283 } |
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3284 pp->pb_pointer[pb_idx].pe_bnum = bnum_left; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3285 pp->pb_pointer[pb_idx].pe_line_count = line_count_left; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3286 pp->pb_pointer[pb_idx].pe_page_count = page_count_left; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3287 if (lnum_left) |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3288 pp->pb_pointer[pb_idx].pe_old_lnum = lnum_left; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3289 lnum_left = 0; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3290 lnum_right = 0; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3291 |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3292 /* |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3293 * recompute line counts |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3294 */ |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3295 line_count_right = 0; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3296 for (i = 0; i < (int)pp_new->pb_count; ++i) |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3297 line_count_right += pp_new->pb_pointer[i].pe_line_count; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3298 line_count_left = 0; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3299 for (i = 0; i < (int)pp->pb_count; ++i) |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3300 line_count_left += pp->pb_pointer[i].pe_line_count; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3301 |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3302 bnum_left = hp->bh_bnum; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3303 bnum_right = hp_new->bh_bnum; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3304 page_count_left = 1; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3305 page_count_right = 1; |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3306 mf_put(mfp, hp, TRUE, FALSE); |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3307 mf_put(mfp, hp_new, TRUE, FALSE); |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3308 |
7 | 3309 } |
3310 | |
3311 /* | |
3312 * Safety check: fallen out of for loop? | |
3313 */ | |
3314 if (stack_idx < 0) | |
3315 { | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
3316 iemsg(_(e_updated_too_many_blocks)); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3317 buf->b_ml.ml_stack_top = 0; // invalidate stack |
7 | 3318 } |
3319 } | |
3320 | |
3321 #ifdef FEAT_BYTEOFF | |
29651
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
3322 // The line was inserted below 'lnum' |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
3323 ml_updatechunk(buf, lnum + 1, |
25672
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3324 # ifdef FEAT_PROP_POPUP |
29651
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
3325 (long)text_len |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
3326 # else |
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
3327 (long)len |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3328 # endif |
29651
23dceecc0bf8
patch 9.0.0166: when using text properties line text length computed twice
Bram Moolenaar <Bram@vim.org>
parents:
29340
diff
changeset
|
3329 , ML_CHNK_ADDLINE); |
7 | 3330 #endif |
25672
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3331 |
7 | 3332 #ifdef FEAT_NETBEANS_INTG |
2210 | 3333 if (netbeans_active()) |
7 | 3334 { |
3335 if (STRLEN(line) > 0) | |
835 | 3336 netbeans_inserted(buf, lnum+1, (colnr_T)0, line, (int)STRLEN(line)); |
34 | 3337 netbeans_inserted(buf, lnum+1, (colnr_T)STRLEN(line), |
7 | 3338 (char_u *)"\n", 1); |
3339 } | |
3340 #endif | |
8493
caed4b2d305f
commit https://github.com/vim/vim/commit/509ce2a558e7e0c03242e32e844255af52f1c821
Christian Brabandt <cb@256bit.org>
parents:
8422
diff
changeset
|
3341 #ifdef FEAT_JOB_CHANNEL |
8422
5d2c84be23b5
commit https://github.com/vim/vim/commit/99ef06296f3c37490511c03786a2c8672e015c56
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
3342 if (buf->b_write_to_channel) |
5d2c84be23b5
commit https://github.com/vim/vim/commit/99ef06296f3c37490511c03786a2c8672e015c56
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
3343 channel_write_new_lines(buf); |
5d2c84be23b5
commit https://github.com/vim/vim/commit/99ef06296f3c37490511c03786a2c8672e015c56
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
3344 #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
|
3345 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
|
3346 |
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
3347 theend: |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3348 #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
|
3349 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
|
3350 #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
|
3351 return ret; |
7 | 3352 } |
3353 | |
3354 /* | |
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3355 * 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
|
3356 */ |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3357 static int |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3358 ml_append_flush( |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3359 buf_T *buf, |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3360 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
|
3361 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
|
3362 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
|
3363 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
|
3364 { |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3365 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
|
3366 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
|
3367 |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3368 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
|
3369 // 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
|
3370 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
|
3371 |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3372 #ifdef FEAT_EVAL |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3373 // 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
|
3374 // 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
|
3375 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
|
3376 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
|
3377 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
|
3378 #endif |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3379 |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3380 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
|
3381 } |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3382 |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3383 /* |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3384 * 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
|
3385 * "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
|
3386 * 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
|
3387 * |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3388 * "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
|
3389 * 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
|
3390 * 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
|
3391 * appended_lines(). |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3392 * |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3393 * 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
|
3394 */ |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3395 int |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3396 ml_append( |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3397 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
|
3398 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
|
3399 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
|
3400 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
|
3401 { |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3402 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
|
3403 } |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3404 |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3405 int |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3406 ml_append_flags( |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3407 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
|
3408 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
|
3409 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
|
3410 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
|
3411 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3412 // 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
|
3413 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
|
3414 return FAIL; |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3415 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
|
3416 } |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3417 |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3418 |
28877
f13fcdacb57f
patch 8.2.4961: build error with a certain combination of features
Bram Moolenaar <Bram@vim.org>
parents:
28875
diff
changeset
|
3419 #if defined(FEAT_SPELL) || defined(FEAT_QUICKFIX) || defined(FEAT_PROP_POPUP) \ |
f13fcdacb57f
patch 8.2.4961: build error with a certain combination of features
Bram Moolenaar <Bram@vim.org>
parents:
28875
diff
changeset
|
3420 || defined(PROTO) |
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3421 /* |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3422 * 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
|
3423 * a memline. |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3424 */ |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3425 int |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3426 ml_append_buf( |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3427 buf_T *buf, |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3428 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
|
3429 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
|
3430 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
|
3431 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
|
3432 { |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3433 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
|
3434 return FAIL; |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3435 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
|
3436 } |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3437 #endif |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3438 |
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3439 /* |
21337
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
3440 * Replace line "lnum", with buffering, in current buffer. |
7 | 3441 * |
720 | 3442 * If "copy" is TRUE, make a copy of the line, otherwise the line has been |
7 | 3443 * 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
|
3444 * 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
|
3445 * Do not use it after calling ml_replace(). |
7 | 3446 * |
3447 * Check: The caller of this function should probably also call | |
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29682
diff
changeset
|
3448 * changed_lines(), unless update_screen(UPD_NOT_VALID) is used. |
7 | 3449 * |
3450 * return FAIL for failure, OK otherwise | |
3451 */ | |
3452 int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3453 ml_replace(linenr_T lnum, char_u *line, int copy) |
7 | 3454 { |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3455 colnr_T len = -1; |
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 if (line != NULL) |
15182
4b2de998ebd6
patch 8.1.0601: a few compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
15142
diff
changeset
|
3458 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
|
3459 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
|
3460 } |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3461 |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3462 /* |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3463 * 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
|
3464 * "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
|
3465 * 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
|
3466 * "len_arg" includes the NUL of the text. |
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
3467 * When "copy" is TRUE copy the text into allocated memory, otherwise |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
3468 * "line_arg" must be allocated and will be consumed here. |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3469 */ |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3470 int |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3471 ml_replace_len( |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3472 linenr_T lnum, |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3473 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
|
3474 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
|
3475 int has_props, |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3476 int copy) |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3477 { |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3478 char_u *line = line_arg; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3479 colnr_T len = len_arg; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3480 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3481 if (line == NULL) // just checking... |
7 | 3482 return FAIL; |
3483 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3484 // 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
|
3485 if (curbuf->b_ml.ml_mfp == NULL && open_buffer(FALSE, NULL, 0) == FAIL) |
7 | 3486 return FAIL; |
3487 | |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3488 if (!has_props) |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3489 ++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
|
3490 if (copy) |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3491 { |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3492 // 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
|
3493 #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
|
3494 if (has_props) |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3495 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
|
3496 else |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3497 #endif |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3498 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
|
3499 if (line == NULL) |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3500 return FAIL; |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3501 } |
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3502 |
7 | 3503 #ifdef FEAT_NETBEANS_INTG |
2210 | 3504 if (netbeans_active()) |
7 | 3505 { |
3506 netbeans_removed(curbuf, lnum, 0, (long)STRLEN(ml_get(lnum))); | |
835 | 3507 netbeans_inserted(curbuf, lnum, 0, line, (int)STRLEN(line)); |
7 | 3508 } |
3509 #endif | |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3510 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
|
3511 { |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3512 // 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
|
3513 ml_flush_line(curbuf); |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3514 |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3515 #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
|
3516 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
|
3517 // 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
|
3518 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
|
3519 #endif |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3520 } |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3521 |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3522 #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
|
3523 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
|
3524 { |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3525 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
|
3526 |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3527 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
|
3528 { |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3529 char_u *newline; |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3530 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
|
3531 |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3532 // 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
|
3533 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
|
3534 if (newline != NULL) |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3535 { |
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3536 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
|
3537 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
|
3538 + oldtextlen, textproplen); |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3539 vim_free(line); |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3540 line = newline; |
15182
4b2de998ebd6
patch 8.1.0601: a few compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
15142
diff
changeset
|
3541 len += (colnr_T)textproplen; |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3542 } |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3543 } |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3544 } |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3545 #endif |
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3546 |
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
3547 if (curbuf->b_ml.ml_flags & (ML_LINE_DIRTY | ML_ALLOCATED)) |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
3548 vim_free(curbuf->b_ml.ml_line_ptr); // free allocated line |
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3549 |
7 | 3550 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
|
3551 curbuf->b_ml.ml_line_len = len; |
7 | 3552 curbuf->b_ml.ml_line_lnum = lnum; |
3553 curbuf->b_ml.ml_flags = (curbuf->b_ml.ml_flags | ML_LINE_DIRTY) & ~ML_EMPTY; | |
3554 | |
3555 return OK; | |
3556 } | |
3557 | |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3558 #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
|
3559 /* |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3560 * Adjust text properties in line "lnum" for a deleted line. |
28875
78ebb50d6fcb
patch 8.2.4960: text properties that cross lines not updated for deleted line
Bram Moolenaar <Bram@vim.org>
parents:
28457
diff
changeset
|
3561 * When "above" is true this is the line above the deleted line, otherwise this |
78ebb50d6fcb
patch 8.2.4960: text properties that cross lines not updated for deleted line
Bram Moolenaar <Bram@vim.org>
parents:
28457
diff
changeset
|
3562 * is the line below the deleted line. |
78ebb50d6fcb
patch 8.2.4960: text properties that cross lines not updated for deleted line
Bram Moolenaar <Bram@vim.org>
parents:
28457
diff
changeset
|
3563 * "del_props[del_props_len]" are the properties of the deleted line. |
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
|
3564 */ |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3565 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
|
3566 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
|
3567 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
|
3568 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
|
3569 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
|
3570 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
|
3571 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
|
3572 { |
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 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
|
3574 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
|
3575 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
|
3576 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
|
3577 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
|
3578 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
|
3579 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
|
3580 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
|
3581 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
|
3582 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
|
3583 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
|
3584 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
|
3585 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
|
3586 |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3587 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
|
3588 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3589 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
|
3590 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
|
3591 && !(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
|
3592 || (!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
|
3593 && !(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
|
3594 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3595 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
|
3596 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3597 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
|
3598 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
|
3599 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
|
3600 |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3601 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
|
3602 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
|
3603 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
|
3604 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
|
3605 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
|
3606 else |
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3607 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
|
3608 - 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
|
3609 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
|
3610 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
|
3611 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
|
3612 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3613 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
|
3614 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
|
3615 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
|
3616 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
|
3617 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
|
3618 } |
15353
21580db06cf3
patch 8.1.0684: warnings from 64-bit compiler
Bram Moolenaar <Bram@vim.org>
parents:
15294
diff
changeset
|
3619 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
|
3620 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3621 |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3622 found = FALSE; |
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3623 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
|
3624 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
|
3625 { |
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3626 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
|
3627 : 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
|
3628 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
|
3629 |
28875
78ebb50d6fcb
patch 8.2.4960: text properties that cross lines not updated for deleted line
Bram Moolenaar <Bram@vim.org>
parents:
28457
diff
changeset
|
3630 mch_memmove(&prop_this, text + textlen + done_this, |
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3631 sizeof(textprop_T)); |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3632 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
|
3633 && 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
|
3634 && 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
|
3635 { |
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 found = TRUE; |
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3637 prop_this.tp_flags &= ~flag; |
28875
78ebb50d6fcb
patch 8.2.4960: text properties that cross lines not updated for deleted line
Bram Moolenaar <Bram@vim.org>
parents:
28457
diff
changeset
|
3638 mch_memmove(text + textlen + done_this, &prop_this, |
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3639 sizeof(textprop_T)); |
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3640 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
|
3641 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3642 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3643 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
|
3644 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3645 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
|
3646 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
|
3647 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
|
3648 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
|
3649 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3650 |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3651 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
|
3652 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3653 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3654 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3655 #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
|
3656 |
7 | 3657 /* |
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
3658 * 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
|
3659 * 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
|
3660 * When "flags" has ML_DEL_UNDO this is called from undo. |
7 | 3661 * |
3662 * return FAIL for failure, OK otherwise | |
3663 */ | |
3664 static int | |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3665 ml_delete_int(buf_T *buf, linenr_T lnum, int flags) |
7 | 3666 { |
3667 bhdr_T *hp; | |
3668 memfile_T *mfp; | |
3669 DATA_BL *dp; | |
3670 PTR_BL *pp; | |
3671 infoptr_T *ip; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3672 int count; // number of entries in block |
7 | 3673 int idx; |
3674 int stack_idx; | |
3675 int text_start; | |
3676 int line_start; | |
3677 long line_size; | |
3678 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
|
3679 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
|
3680 #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
|
3681 char_u *textprop_save = NULL; |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3682 long textprop_len = 0; |
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
|
3683 #endif |
7 | 3684 |
3685 if (lowest_marked && lowest_marked > lnum) | |
3686 lowest_marked--; | |
3687 | |
3688 /* | |
3689 * If the file becomes empty the last line is replaced by an empty line. | |
3690 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3691 if (buf->b_ml.ml_line_count == 1) // file becomes empty |
7 | 3692 { |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3693 if ((flags & ML_DEL_MESSAGE) |
7 | 3694 #ifdef FEAT_NETBEANS_INTG |
3695 && !netbeansSuppressNoLines | |
3696 #endif | |
3697 ) | |
680 | 3698 set_keep_msg((char_u *)_(no_lines_msg), 0); |
3699 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3700 // FEAT_BYTEOFF already handled in there, don't worry 'bout it below |
7 | 3701 i = ml_replace((linenr_T)1, (char_u *)"", TRUE); |
3702 buf->b_ml.ml_flags |= ML_EMPTY; | |
3703 | |
3704 return i; | |
3705 } | |
3706 | |
3707 /* | |
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
|
3708 * 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
|
3709 * 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
|
3710 * This also releases any locked block.. |
7 | 3711 */ |
3712 mfp = buf->b_ml.ml_mfp; | |
3713 if (mfp == NULL) | |
3714 return FAIL; | |
3715 | |
3716 if ((hp = ml_find_line(buf, lnum, ML_DELETE)) == NULL) | |
3717 return FAIL; | |
3718 | |
3719 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
|
3720 // compute line count before the delete |
7 | 3721 count = (long)(buf->b_ml.ml_locked_high) |
3722 - (long)(buf->b_ml.ml_locked_low) + 2; | |
3723 idx = lnum - buf->b_ml.ml_locked_low; | |
3724 | |
3725 --buf->b_ml.ml_line_count; | |
3726 | |
3727 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
|
3728 if (idx == 0) // first line in block, text at the end |
7 | 3729 line_size = dp->db_txt_end - line_start; |
3730 else | |
3731 line_size = ((dp->db_index[idx - 1]) & DB_INDEX_MASK) - line_start; | |
3732 | |
3733 #ifdef FEAT_NETBEANS_INTG | |
2210 | 3734 if (netbeans_active()) |
27426
41e0dcf38521
patch 8.2.4241: some type casts are redundant
Bram Moolenaar <Bram@vim.org>
parents:
27231
diff
changeset
|
3735 netbeans_removed(buf, lnum, 0, line_size); |
7 | 3736 #endif |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3737 #ifdef FEAT_PROP_POPUP |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3738 // If there are text properties compute their byte length. |
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3739 // if needed make a copy, so that we can update properties in preceding and |
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3740 // following lines. |
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3741 if (buf->b_has_textprop) |
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
|
3742 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3743 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
|
3744 |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3745 textprop_len = line_size - (long)textlen; |
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3746 if (!(flags & (ML_DEL_UNDO | ML_DEL_NOPROP)) && textprop_len > 0) |
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
|
3747 textprop_save = vim_memsave((char_u *)dp + line_start + textlen, |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3748 textprop_len); |
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
|
3749 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3750 #endif |
7 | 3751 |
3752 /* | |
3753 * special case: If there is only one line in the data block it becomes empty. | |
3754 * Then we have to remove the entry, pointing to this data block, from the | |
3755 * pointer block. If this pointer block also becomes empty, we go up another | |
3756 * block, and so on, up to the root if necessary. | |
3757 * The line counts in the pointer blocks have already been adjusted by | |
3758 * ml_find_line(). | |
3759 */ | |
3760 if (count == 1) | |
3761 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3762 mf_free(mfp, hp); // free the data block |
7 | 3763 buf->b_ml.ml_locked = NULL; |
3764 | |
2823 | 3765 for (stack_idx = buf->b_ml.ml_stack_top - 1; stack_idx >= 0; |
3766 --stack_idx) | |
7 | 3767 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3768 buf->b_ml.ml_stack_top = 0; // stack is invalid when failing |
7 | 3769 ip = &(buf->b_ml.ml_stack[stack_idx]); |
3770 idx = ip->ip_index; | |
3771 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
|
3772 goto theend; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3773 pp = (PTR_BL *)(hp->bh_data); // must be pointer block |
7 | 3774 if (pp->pb_id != PTR_ID) |
3775 { | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
3776 iemsg(_(e_pointer_block_id_wrong_four)); |
7 | 3777 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
|
3778 goto theend; |
7 | 3779 } |
3780 count = --(pp->pb_count); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3781 if (count == 0) // the pointer block becomes empty! |
7 | 3782 mf_free(mfp, hp); |
3783 else | |
3784 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3785 if (count != idx) // move entries after the deleted one |
7 | 3786 mch_memmove(&pp->pb_pointer[idx], &pp->pb_pointer[idx + 1], |
3787 (size_t)(count - idx) * sizeof(PTR_EN)); | |
3788 mf_put(mfp, hp, TRUE, FALSE); | |
3789 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3790 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
|
3791 // fix line count for rest of blocks in the stack |
1167 | 3792 if (buf->b_ml.ml_locked_lineadd != 0) |
7 | 3793 { |
3794 ml_lineadd(buf, buf->b_ml.ml_locked_lineadd); | |
3795 buf->b_ml.ml_stack[buf->b_ml.ml_stack_top].ip_high += | |
1167 | 3796 buf->b_ml.ml_locked_lineadd; |
7 | 3797 } |
3798 ++(buf->b_ml.ml_stack_top); | |
3799 | |
3800 break; | |
3801 } | |
3802 } | |
3803 CHECK(stack_idx < 0, _("deleted block 1?")); | |
3804 } | |
3805 else | |
3806 { | |
3807 /* | |
3808 * delete the text by moving the next lines forwards | |
3809 */ | |
3810 text_start = dp->db_txt_start; | |
3811 mch_memmove((char *)dp + text_start + line_size, | |
3812 (char *)dp + text_start, (size_t)(line_start - text_start)); | |
3813 | |
3814 /* | |
3815 * delete the index by moving the next indexes backwards | |
3816 * Adjust the indexes for the text movement. | |
3817 */ | |
3818 for (i = idx; i < count - 1; ++i) | |
3819 dp->db_index[i] = dp->db_index[i + 1] + line_size; | |
3820 | |
3821 dp->db_free += line_size + INDEX_SIZE; | |
3822 dp->db_txt_start += line_size; | |
3823 --(dp->db_line_count); | |
3824 | |
3825 /* | |
3826 * mark the block dirty and make sure it is in the file (for recovery) | |
3827 */ | |
3828 buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS); | |
3829 } | |
3830 | |
3831 #ifdef FEAT_BYTEOFF | |
25672
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3832 ml_updatechunk(buf, lnum, line_size |
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3833 # ifdef FEAT_PROP_POPUP |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3834 - textprop_len |
25672
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3835 # endif |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3836 , ML_CHNK_DELLINE); |
7 | 3837 #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
|
3838 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
|
3839 |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3840 theend: |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3841 #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
|
3842 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
|
3843 { |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3844 // 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
|
3845 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
|
3846 adjust_text_props_for_delete(buf, lnum - 1, textprop_save, |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3847 (int)textprop_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
|
3848 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
|
3849 adjust_text_props_for_delete(buf, lnum, textprop_save, |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
3850 (int)textprop_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
|
3851 } |
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3852 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
|
3853 #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
|
3854 return ret; |
7 | 3855 } |
3856 | |
3857 /* | |
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3858 * 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
|
3859 * 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
|
3860 * |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3861 * 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
|
3862 * 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
|
3863 * |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3864 * 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
|
3865 */ |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3866 int |
20599
d571231175b4
patch 8.2.0853: ml_delete() often called with FALSE argument
Bram Moolenaar <Bram@vim.org>
parents:
20583
diff
changeset
|
3867 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
|
3868 { |
20599
d571231175b4
patch 8.2.0853: ml_delete() often called with FALSE argument
Bram Moolenaar <Bram@vim.org>
parents:
20583
diff
changeset
|
3869 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
|
3870 } |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3871 |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3872 /* |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3873 * 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
|
3874 */ |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3875 int |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3876 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
|
3877 { |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3878 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
|
3879 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
|
3880 return FAIL; |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3881 |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3882 #ifdef FEAT_EVAL |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3883 // 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
|
3884 // the text. |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3885 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
|
3886 #endif |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3887 |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3888 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
|
3889 } |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3890 |
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3891 /* |
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
|
3892 * set the DB_MARKED flag for line 'lnum' |
7 | 3893 */ |
3894 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3895 ml_setmarked(linenr_T lnum) |
7 | 3896 { |
3897 bhdr_T *hp; | |
3898 DATA_BL *dp; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3899 // invalid line number |
7 | 3900 if (lnum < 1 || lnum > curbuf->b_ml.ml_line_count |
3901 || 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
|
3902 return; // give error message? |
7 | 3903 |
3904 if (lowest_marked == 0 || lowest_marked > lnum) | |
3905 lowest_marked = lnum; | |
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 block | |
3910 * This also 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 dp->db_index[lnum - curbuf->b_ml.ml_locked_low] |= DB_MARKED; | |
3917 curbuf->b_ml.ml_flags |= ML_LOCKED_DIRTY; | |
3918 } | |
3919 | |
3920 /* | |
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
|
3921 * find the first line with its DB_MARKED flag set |
7 | 3922 */ |
3923 linenr_T | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3924 ml_firstmarked(void) |
7 | 3925 { |
3926 bhdr_T *hp; | |
3927 DATA_BL *dp; | |
3928 linenr_T lnum; | |
3929 int i; | |
3930 | |
3931 if (curbuf->b_ml.ml_mfp == NULL) | |
3932 return (linenr_T) 0; | |
3933 | |
3934 /* | |
3935 * The search starts with lowest_marked line. This is the last line where | |
3936 * a mark was found, adjusted by inserting/deleting lines. | |
3937 */ | |
3938 for (lnum = lowest_marked; lnum <= curbuf->b_ml.ml_line_count; ) | |
3939 { | |
3940 /* | |
3941 * Find the data block containing the line. | |
3942 * This also fills the stack with the blocks from the root to the data | |
3943 * block This also releases any locked block. | |
3944 */ | |
3945 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
|
3946 return (linenr_T)0; // give error message? |
7 | 3947 |
3948 dp = (DATA_BL *)(hp->bh_data); | |
3949 | |
3950 for (i = lnum - curbuf->b_ml.ml_locked_low; | |
3951 lnum <= curbuf->b_ml.ml_locked_high; ++i, ++lnum) | |
3952 if ((dp->db_index[i]) & DB_MARKED) | |
3953 { | |
3954 (dp->db_index[i]) &= DB_INDEX_MASK; | |
3955 curbuf->b_ml.ml_flags |= ML_LOCKED_DIRTY; | |
3956 lowest_marked = lnum + 1; | |
3957 return lnum; | |
3958 } | |
3959 } | |
3960 | |
3961 return (linenr_T) 0; | |
3962 } | |
3963 | |
3964 /* | |
3965 * clear all DB_MARKED flags | |
3966 */ | |
3967 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3968 ml_clearmarked(void) |
7 | 3969 { |
3970 bhdr_T *hp; | |
3971 DATA_BL *dp; | |
3972 linenr_T lnum; | |
3973 int i; | |
3974 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3975 if (curbuf->b_ml.ml_mfp == NULL) // nothing to do |
7 | 3976 return; |
3977 | |
3978 /* | |
3979 * The search starts with line lowest_marked. | |
3980 */ | |
3981 for (lnum = lowest_marked; lnum <= curbuf->b_ml.ml_line_count; ) | |
3982 { | |
3983 /* | |
3984 * Find the data block containing the line. | |
3985 * This also fills the stack with the blocks from the root to the data | |
3986 * block and releases any locked block. | |
3987 */ | |
3988 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
|
3989 return; // give error message? |
7 | 3990 |
3991 dp = (DATA_BL *)(hp->bh_data); | |
3992 | |
3993 for (i = lnum - curbuf->b_ml.ml_locked_low; | |
3994 lnum <= curbuf->b_ml.ml_locked_high; ++i, ++lnum) | |
3995 if ((dp->db_index[i]) & DB_MARKED) | |
3996 { | |
3997 (dp->db_index[i]) &= DB_INDEX_MASK; | |
3998 curbuf->b_ml.ml_flags |= ML_LOCKED_DIRTY; | |
3999 } | |
4000 } | |
4001 | |
4002 lowest_marked = 0; | |
4003 } | |
4004 | |
4005 /* | |
4006 * flush ml_line if necessary | |
4007 */ | |
4008 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4009 ml_flush_line(buf_T *buf) |
7 | 4010 { |
4011 bhdr_T *hp; | |
4012 DATA_BL *dp; | |
4013 linenr_T lnum; | |
4014 char_u *new_line; | |
4015 char_u *old_line; | |
4016 colnr_T new_len; | |
4017 int old_len; | |
4018 int extra; | |
4019 int idx; | |
4020 int start; | |
4021 int count; | |
4022 int i; | |
2075
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4023 static int entered = FALSE; |
7 | 4024 |
4025 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
|
4026 return; // nothing to do |
7 | 4027 |
4028 if (buf->b_ml.ml_flags & ML_LINE_DIRTY) | |
4029 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4030 // 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
|
4031 // when obtaining the cursor position. |
2075
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4032 if (entered) |
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4033 return; |
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4034 entered = TRUE; |
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4035 |
7 | 4036 lnum = buf->b_ml.ml_line_lnum; |
4037 new_line = buf->b_ml.ml_line_ptr; | |
4038 | |
4039 hp = ml_find_line(buf, lnum, ML_FIND); | |
4040 if (hp == NULL) | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
4041 siemsg(_(e_cannot_find_line_nr), lnum); |
7 | 4042 else |
4043 { | |
4044 dp = (DATA_BL *)(hp->bh_data); | |
4045 idx = lnum - buf->b_ml.ml_locked_low; | |
4046 start = ((dp->db_index[idx]) & DB_INDEX_MASK); | |
4047 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
|
4048 if (idx == 0) // line is last in block |
7 | 4049 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
|
4050 else // text of previous line follows |
7 | 4051 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
|
4052 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
|
4053 extra = new_len - old_len; // negative if lines gets smaller |
7 | 4054 |
4055 /* | |
4056 * if new line fits in data block, replace directly | |
4057 */ | |
4058 if ((int)dp->db_free >= extra) | |
4059 { | |
25636
885fba352580
patch 8.2.3354: build failure with +byte_offset but without +textprop
Bram Moolenaar <Bram@vim.org>
parents:
25624
diff
changeset
|
4060 #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP) |
25624
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4061 int old_prop_len = 0; |
28984
b3828315a0d9
patch 8.2.5014: byte offsets are wrong when using text properties
Bram Moolenaar <Bram@vim.org>
parents:
28877
diff
changeset
|
4062 if (buf->b_has_textprop) |
b3828315a0d9
patch 8.2.5014: byte offsets are wrong when using text properties
Bram Moolenaar <Bram@vim.org>
parents:
28877
diff
changeset
|
4063 old_prop_len = old_len - (int)STRLEN(old_line) - 1; |
25624
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4064 #endif |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4065 // if the length changes and there are following lines |
7 | 4066 count = buf->b_ml.ml_locked_high - buf->b_ml.ml_locked_low + 1; |
4067 if (extra != 0 && idx < count - 1) | |
4068 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4069 // move text of following lines |
7 | 4070 mch_memmove((char *)dp + dp->db_txt_start - extra, |
4071 (char *)dp + dp->db_txt_start, | |
4072 (size_t)(start - dp->db_txt_start)); | |
4073 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4074 // adjust pointers of this and following lines |
7 | 4075 for (i = idx + 1; i < count; ++i) |
4076 dp->db_index[i] -= extra; | |
4077 } | |
4078 dp->db_index[idx] -= extra; | |
4079 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4080 // adjust free space |
7 | 4081 dp->db_free -= extra; |
4082 dp->db_txt_start -= extra; | |
4083 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4084 // copy new line into the data block |
7 | 4085 mch_memmove(old_line - extra, new_line, (size_t)new_len); |
4086 buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS); | |
25636
885fba352580
patch 8.2.3354: build failure with +byte_offset but without +textprop
Bram Moolenaar <Bram@vim.org>
parents:
25624
diff
changeset
|
4087 #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP) |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4088 // The else case is already covered by the insert and delete |
25624
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4089 if (buf->b_has_textprop) |
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4090 { |
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4091 // Do not count the size of any text properties. |
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4092 extra += old_prop_len; |
25638
960ff2a7d921
patch 8.2.3355: MS-Windows: compiler warning for 64-32 bit conversion
Bram Moolenaar <Bram@vim.org>
parents:
25636
diff
changeset
|
4093 extra -= new_len - (int)STRLEN(new_line) - 1; |
25624
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4094 } |
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4095 if (extra != 0) |
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4096 ml_updatechunk(buf, lnum, (long)extra, ML_CHNK_UPDLINE); |
7 | 4097 #endif |
4098 } | |
4099 else | |
4100 { | |
4101 /* | |
4102 * Cannot do it in one data block: Delete and append. | |
4103 * Append first, because ml_delete_int() cannot delete the | |
4104 * last line in a buffer, which causes trouble for a buffer | |
4105 * that has only one line. | |
4106 * Don't forget to copy the mark! | |
4107 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4108 // 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
|
4109 (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
|
4110 ((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
|
4111 #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
|
4112 | ML_APPEND_NOPROP |
4bc0bda6857d
patch 8.2.2890: text property duplicated when data block splits
Bram Moolenaar <Bram@vim.org>
parents:
24093
diff
changeset
|
4113 #endif |
4bc0bda6857d
patch 8.2.2890: text property duplicated when data block splits
Bram Moolenaar <Bram@vim.org>
parents:
24093
diff
changeset
|
4114 ); |
25050
7ef7a211f6bf
patch 8.2.3062: internal error when adding several text properties
Bram Moolenaar <Bram@vim.org>
parents:
24990
diff
changeset
|
4115 (void)ml_delete_int(buf, lnum, ML_DEL_NOPROP); |
7 | 4116 } |
4117 } | |
4118 vim_free(new_line); | |
2075
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4119 |
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4120 entered = FALSE; |
7 | 4121 } |
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
4122 else if (buf->b_ml.ml_flags & ML_ALLOCATED) |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
4123 vim_free(buf->b_ml.ml_line_ptr); |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
4124 |
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
4125 buf->b_ml.ml_flags &= ~(ML_LINE_DIRTY | ML_ALLOCATED); |
7 | 4126 buf->b_ml.ml_line_lnum = 0; |
4127 } | |
4128 | |
4129 /* | |
4130 * create a new, empty, data block | |
4131 */ | |
4132 static bhdr_T * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4133 ml_new_data(memfile_T *mfp, int negative, int page_count) |
7 | 4134 { |
4135 bhdr_T *hp; | |
4136 DATA_BL *dp; | |
4137 | |
4138 if ((hp = mf_new(mfp, negative, page_count)) == NULL) | |
4139 return NULL; | |
4140 | |
4141 dp = (DATA_BL *)(hp->bh_data); | |
4142 dp->db_id = DATA_ID; | |
4143 dp->db_txt_start = dp->db_txt_end = page_count * mfp->mf_page_size; | |
4144 dp->db_free = dp->db_txt_start - HEADER_SIZE; | |
4145 dp->db_line_count = 0; | |
4146 | |
4147 return hp; | |
4148 } | |
4149 | |
4150 /* | |
4151 * create a new, empty, pointer block | |
4152 */ | |
4153 static bhdr_T * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4154 ml_new_ptr(memfile_T *mfp) |
7 | 4155 { |
4156 bhdr_T *hp; | |
4157 PTR_BL *pp; | |
4158 | |
4159 if ((hp = mf_new(mfp, FALSE, 1)) == NULL) | |
4160 return NULL; | |
4161 | |
4162 pp = (PTR_BL *)(hp->bh_data); | |
4163 pp->pb_id = PTR_ID; | |
4164 pp->pb_count = 0; | |
31877
9f28cca2410a
patch 9.0.1271: using sizeof() and subtract array size is tricky
Bram Moolenaar <Bram@vim.org>
parents:
31728
diff
changeset
|
4165 pp->pb_count_max = |
9f28cca2410a
patch 9.0.1271: using sizeof() and subtract array size is tricky
Bram Moolenaar <Bram@vim.org>
parents:
31728
diff
changeset
|
4166 (short_u)((mfp->mf_page_size - offsetof(PTR_BL, pb_pointer)) |
9f28cca2410a
patch 9.0.1271: using sizeof() and subtract array size is tricky
Bram Moolenaar <Bram@vim.org>
parents:
31728
diff
changeset
|
4167 / sizeof(PTR_EN)); |
7 | 4168 |
4169 return hp; | |
4170 } | |
4171 | |
4172 /* | |
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
|
4173 * Lookup line 'lnum' in a memline. |
7 | 4174 * |
4175 * action: if ML_DELETE or ML_INSERT the line count is updated while searching | |
4176 * if ML_FLUSH only flush a locked block | |
4177 * if ML_FIND just find the line | |
4178 * | |
4179 * If the block was found it is locked and put in ml_locked. | |
4180 * The stack is updated to lead to the locked block. The ip_high field in | |
4181 * the stack is updated to reflect the last line in the block AFTER the | |
4182 * insert or delete, also if the pointer block has not been updated yet. But | |
1167 | 4183 * if ml_locked != NULL ml_locked_lineadd must be added to ip_high. |
7 | 4184 * |
4185 * return: NULL for failure, pointer to block header otherwise | |
4186 */ | |
4187 static bhdr_T * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4188 ml_find_line(buf_T *buf, linenr_T lnum, int action) |
7 | 4189 { |
4190 DATA_BL *dp; | |
4191 PTR_BL *pp; | |
4192 infoptr_T *ip; | |
4193 bhdr_T *hp; | |
4194 memfile_T *mfp; | |
4195 linenr_T t; | |
4196 blocknr_T bnum, bnum2; | |
4197 int dirty; | |
4198 linenr_T low, high; | |
4199 int top; | |
4200 int page_count; | |
4201 int idx; | |
4202 | |
4203 mfp = buf->b_ml.ml_mfp; | |
4204 | |
4205 /* | |
4206 * If there is a locked block check if the wanted line is in it. | |
4207 * If not, flush and release the locked block. | |
4208 * Don't do this for ML_INSERT_SAME, because the stack need to be updated. | |
4209 * Don't do this for ML_FLUSH, because we want to flush the locked block. | |
1066 | 4210 * Don't do this when 'swapfile' is reset, we want to load all the blocks. |
7 | 4211 */ |
4212 if (buf->b_ml.ml_locked) | |
4213 { | |
1066 | 4214 if (ML_SIMPLE(action) |
4215 && buf->b_ml.ml_locked_low <= lnum | |
4216 && buf->b_ml.ml_locked_high >= lnum | |
4217 && !mf_dont_release) | |
7 | 4218 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4219 // remember to update pointer blocks and stack later |
7 | 4220 if (action == ML_INSERT) |
4221 { | |
4222 ++(buf->b_ml.ml_locked_lineadd); | |
4223 ++(buf->b_ml.ml_locked_high); | |
4224 } | |
4225 else if (action == ML_DELETE) | |
4226 { | |
4227 --(buf->b_ml.ml_locked_lineadd); | |
4228 --(buf->b_ml.ml_locked_high); | |
4229 } | |
4230 return (buf->b_ml.ml_locked); | |
4231 } | |
4232 | |
4233 mf_put(mfp, buf->b_ml.ml_locked, buf->b_ml.ml_flags & ML_LOCKED_DIRTY, | |
4234 buf->b_ml.ml_flags & ML_LOCKED_POS); | |
4235 buf->b_ml.ml_locked = NULL; | |
4236 | |
1167 | 4237 /* |
4238 * If lines have been added or deleted in the locked block, need to | |
4239 * update the line count in pointer blocks. | |
4240 */ | |
4241 if (buf->b_ml.ml_locked_lineadd != 0) | |
7 | 4242 ml_lineadd(buf, buf->b_ml.ml_locked_lineadd); |
4243 } | |
4244 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4245 if (action == ML_FLUSH) // nothing else to do |
7 | 4246 return NULL; |
4247 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4248 bnum = 1; // start at the root of the tree |
7 | 4249 page_count = 1; |
4250 low = 1; | |
4251 high = buf->b_ml.ml_line_count; | |
4252 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4253 if (action == ML_FIND) // first try stack entries |
7 | 4254 { |
4255 for (top = buf->b_ml.ml_stack_top - 1; top >= 0; --top) | |
4256 { | |
4257 ip = &(buf->b_ml.ml_stack[top]); | |
4258 if (ip->ip_low <= lnum && ip->ip_high >= lnum) | |
4259 { | |
4260 bnum = ip->ip_bnum; | |
4261 low = ip->ip_low; | |
4262 high = ip->ip_high; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4263 buf->b_ml.ml_stack_top = top; // truncate stack at prev entry |
7 | 4264 break; |
4265 } | |
4266 } | |
4267 if (top < 0) | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4268 buf->b_ml.ml_stack_top = 0; // not found, start at the root |
7 | 4269 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4270 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
|
4271 buf->b_ml.ml_stack_top = 0; // start at the root |
7 | 4272 |
4273 /* | |
4274 * search downwards in the tree until a data block is found | |
4275 */ | |
4276 for (;;) | |
4277 { | |
4278 if ((hp = mf_get(mfp, bnum, page_count)) == NULL) | |
4279 goto error_noblock; | |
4280 | |
4281 /* | |
4282 * update high for insert/delete | |
4283 */ | |
4284 if (action == ML_INSERT) | |
4285 ++high; | |
4286 else if (action == ML_DELETE) | |
4287 --high; | |
4288 | |
4289 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
|
4290 if (dp->db_id == DATA_ID) // data block |
7 | 4291 { |
4292 buf->b_ml.ml_locked = hp; | |
4293 buf->b_ml.ml_locked_low = low; | |
4294 buf->b_ml.ml_locked_high = high; | |
4295 buf->b_ml.ml_locked_lineadd = 0; | |
4296 buf->b_ml.ml_flags &= ~(ML_LOCKED_DIRTY | ML_LOCKED_POS); | |
4297 return hp; | |
4298 } | |
4299 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4300 pp = (PTR_BL *)(dp); // must be pointer block |
7 | 4301 if (pp->pb_id != PTR_ID) |
4302 { | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
4303 iemsg(_(e_pointer_block_id_wrong)); |
7 | 4304 goto error_block; |
4305 } | |
4306 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4307 if ((top = ml_add_stack(buf)) < 0) // add new entry to stack |
7 | 4308 goto error_block; |
4309 ip = &(buf->b_ml.ml_stack[top]); | |
4310 ip->ip_bnum = bnum; | |
4311 ip->ip_low = low; | |
4312 ip->ip_high = high; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4313 ip->ip_index = -1; // index not known yet |
7 | 4314 |
4315 dirty = FALSE; | |
4316 for (idx = 0; idx < (int)pp->pb_count; ++idx) | |
4317 { | |
4318 t = pp->pb_pointer[idx].pe_line_count; | |
4319 CHECK(t == 0, _("pe_line_count is zero")); | |
4320 if ((low += t) > lnum) | |
4321 { | |
4322 ip->ip_index = idx; | |
4323 bnum = pp->pb_pointer[idx].pe_bnum; | |
4324 page_count = pp->pb_pointer[idx].pe_page_count; | |
4325 high = low - 1; | |
4326 low -= t; | |
4327 | |
4328 /* | |
4329 * a negative block number may have been changed | |
4330 */ | |
4331 if (bnum < 0) | |
4332 { | |
4333 bnum2 = mf_trans_del(mfp, bnum); | |
4334 if (bnum != bnum2) | |
4335 { | |
4336 bnum = bnum2; | |
4337 pp->pb_pointer[idx].pe_bnum = bnum; | |
4338 dirty = TRUE; | |
4339 } | |
4340 } | |
4341 | |
4342 break; | |
4343 } | |
4344 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4345 if (idx >= (int)pp->pb_count) // past the end: something wrong! |
7 | 4346 { |
4347 if (lnum > buf->b_ml.ml_line_count) | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
4348 siemsg(_(e_line_number_out_of_range_nr_past_the_end), |
7 | 4349 lnum - buf->b_ml.ml_line_count); |
4350 | |
4351 else | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
4352 siemsg(_(e_line_count_wrong_in_block_nr), bnum); |
7 | 4353 goto error_block; |
4354 } | |
4355 if (action == ML_DELETE) | |
4356 { | |
4357 pp->pb_pointer[idx].pe_line_count--; | |
4358 dirty = TRUE; | |
4359 } | |
4360 else if (action == ML_INSERT) | |
4361 { | |
4362 pp->pb_pointer[idx].pe_line_count++; | |
4363 dirty = TRUE; | |
4364 } | |
4365 mf_put(mfp, hp, dirty, FALSE); | |
4366 } | |
4367 | |
4368 error_block: | |
4369 mf_put(mfp, hp, FALSE, FALSE); | |
4370 error_noblock: | |
2267 | 4371 /* |
4372 * If action is ML_DELETE or ML_INSERT we have to correct the tree for | |
4373 * the incremented/decremented line counts, because there won't be a line | |
4374 * inserted/deleted after all. | |
4375 */ | |
7 | 4376 if (action == ML_DELETE) |
4377 ml_lineadd(buf, 1); | |
4378 else if (action == ML_INSERT) | |
4379 ml_lineadd(buf, -1); | |
4380 buf->b_ml.ml_stack_top = 0; | |
4381 return NULL; | |
4382 } | |
4383 | |
4384 /* | |
4385 * add an entry to the info pointer stack | |
4386 * | |
4387 * return -1 for failure, number of the new entry otherwise | |
4388 */ | |
4389 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4390 ml_add_stack(buf_T *buf) |
7 | 4391 { |
4392 int top; | |
4393 infoptr_T *newstack; | |
4394 | |
4395 top = buf->b_ml.ml_stack_top; | |
4396 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4397 // may have to increase the stack size |
7 | 4398 if (top == buf->b_ml.ml_stack_size) |
4399 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4400 CHECK(top > 0, _("Stack size increases")); // more than 5 levels??? |
7 | 4401 |
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
|
4402 newstack = ALLOC_MULT(infoptr_T, buf->b_ml.ml_stack_size + STACK_INCR); |
7 | 4403 if (newstack == NULL) |
4404 return -1; | |
6989 | 4405 if (top > 0) |
4406 mch_memmove(newstack, buf->b_ml.ml_stack, | |
1624 | 4407 (size_t)top * sizeof(infoptr_T)); |
7 | 4408 vim_free(buf->b_ml.ml_stack); |
4409 buf->b_ml.ml_stack = newstack; | |
4410 buf->b_ml.ml_stack_size += STACK_INCR; | |
4411 } | |
4412 | |
4413 buf->b_ml.ml_stack_top++; | |
4414 return top; | |
4415 } | |
4416 | |
4417 /* | |
4418 * Update the pointer blocks on the stack for inserted/deleted lines. | |
4419 * The stack itself is also updated. | |
4420 * | |
4421 * When a insert/delete line action fails, the line is not inserted/deleted, | |
4422 * but the pointer blocks have already been updated. That is fixed here by | |
4423 * walking through the stack. | |
4424 * | |
4425 * Count is the number of lines added, negative if lines have been deleted. | |
4426 */ | |
4427 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4428 ml_lineadd(buf_T *buf, int count) |
7 | 4429 { |
4430 int idx; | |
4431 infoptr_T *ip; | |
4432 PTR_BL *pp; | |
4433 memfile_T *mfp = buf->b_ml.ml_mfp; | |
4434 bhdr_T *hp; | |
4435 | |
4436 for (idx = buf->b_ml.ml_stack_top - 1; idx >= 0; --idx) | |
4437 { | |
4438 ip = &(buf->b_ml.ml_stack[idx]); | |
4439 if ((hp = mf_get(mfp, ip->ip_bnum, 1)) == NULL) | |
4440 break; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4441 pp = (PTR_BL *)(hp->bh_data); // must be pointer block |
7 | 4442 if (pp->pb_id != PTR_ID) |
4443 { | |
4444 mf_put(mfp, hp, FALSE, FALSE); | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
4445 iemsg(_(e_pointer_block_id_wrong_two)); |
7 | 4446 break; |
4447 } | |
4448 pp->pb_pointer[ip->ip_index].pe_line_count += count; | |
4449 ip->ip_high += count; | |
4450 mf_put(mfp, hp, TRUE, FALSE); | |
4451 } | |
4452 } | |
4453 | |
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4454 #if defined(HAVE_READLINK) || defined(PROTO) |
594 | 4455 /* |
4456 * Resolve a symlink in the last component of a file name. | |
4457 * Note that f_resolve() does it for every part of the path, we don't do that | |
4458 * here. | |
4459 * If it worked returns OK and the resolved link in "buf[MAXPATHL]". | |
4460 * Otherwise returns FAIL. | |
4461 */ | |
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4462 int |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4463 resolve_symlink(char_u *fname, char_u *buf) |
594 | 4464 { |
4465 char_u tmp[MAXPATHL]; | |
4466 int ret; | |
4467 int depth = 0; | |
4468 | |
4469 if (fname == NULL) | |
4470 return FAIL; | |
4471 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4472 // Put the result so far in tmp[], starting with the original name. |
594 | 4473 vim_strncpy(tmp, fname, MAXPATHL - 1); |
4474 | |
4475 for (;;) | |
4476 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4477 // Limit symlink depth to 100, catch recursive loops. |
594 | 4478 if (++depth == 100) |
4479 { | |
26958
d92e0d85923f
patch 8.2.4008: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26909
diff
changeset
|
4480 semsg(_(e_symlink_loop_for_str), fname); |
594 | 4481 return FAIL; |
4482 } | |
4483 | |
4484 ret = readlink((char *)tmp, (char *)buf, MAXPATHL - 1); | |
4485 if (ret <= 0) | |
4486 { | |
619 | 4487 if (errno == EINVAL || errno == ENOENT) |
594 | 4488 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4489 // 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
|
4490 // 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
|
4491 // call to vim_FullName(). |
594 | 4492 if (depth == 1) |
4493 return FAIL; | |
4494 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4495 // Use the resolved name in tmp[]. |
594 | 4496 break; |
4497 } | |
4498 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4499 // There must be some error reading links, use original name. |
594 | 4500 return FAIL; |
4501 } | |
4502 buf[ret] = NUL; | |
4503 | |
4504 /* | |
4505 * Check whether the symlink is relative or absolute. | |
4506 * If it's relative, build a new path based on the directory | |
4507 * portion of the filename (if any) and the path the symlink | |
4508 * points to. | |
4509 */ | |
4510 if (mch_isFullName(buf)) | |
4511 STRCPY(tmp, buf); | |
4512 else | |
4513 { | |
4514 char_u *tail; | |
4515 | |
4516 tail = gettail(tmp); | |
4517 if (STRLEN(tail) + STRLEN(buf) >= MAXPATHL) | |
4518 return FAIL; | |
4519 STRCPY(tail, buf); | |
4520 } | |
4521 } | |
4522 | |
4523 /* | |
4524 * Try to resolve the full name of the file so that the swapfile name will | |
4525 * be consistent even when opening a relative symlink from different | |
4526 * working directories. | |
4527 */ | |
4528 return vim_FullName(tmp, buf, MAXPATHL, TRUE); | |
4529 } | |
4530 #endif | |
4531 | |
7 | 4532 /* |
460 | 4533 * Make swap file name out of the file name and a directory name. |
4534 * Returns pointer to allocated memory or NULL. | |
7 | 4535 */ |
460 | 4536 char_u * |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4537 makeswapname( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4538 char_u *fname, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4539 char_u *ffname UNUSED, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4540 buf_T *buf, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4541 char_u *dir_name) |
7 | 4542 { |
4543 char_u *r, *s; | |
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
4544 char_u *fname_res = fname; |
594 | 4545 #ifdef HAVE_READLINK |
4546 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
|
4547 |
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
4548 // 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
|
4549 // 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
|
4550 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
|
4551 fname_res = fname_buf; |
594 | 4552 #endif |
7 | 4553 |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
4554 #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
|
4555 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
|
4556 |
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
4557 s = dir_name + len; |
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
4558 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
|
4559 { // Ends with '//', Use Full path |
7 | 4560 r = NULL; |
21337
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
4561 if ((s = make_percent_swname(dir_name, fname_res)) != NULL) |
7 | 4562 { |
4563 r = modname(s, (char_u *)".swp", FALSE); | |
4564 vim_free(s); | |
4565 } | |
4566 return r; | |
4567 } | |
4568 #endif | |
4569 | |
4570 r = buf_modname( | |
4571 (buf->b_p_sn || buf->b_shortname), | |
594 | 4572 fname_res, |
7 | 4573 (char_u *) |
2823 | 4574 #if defined(VMS) |
7 | 4575 "_swp", |
4576 #else | |
4577 ".swp", | |
4578 #endif | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4579 // 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
|
4580 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
|
4581 if (r == NULL) // out of memory |
7 | 4582 return NULL; |
4583 | |
4584 s = get_file_in_dir(r, dir_name); | |
4585 vim_free(r); | |
4586 return s; | |
4587 } | |
4588 | |
4589 /* | |
4590 * Get file name to use for swap file or backup file. | |
4591 * Use the name of the edited file "fname" and an entry in the 'dir' or 'bdir' | |
4592 * option "dname". | |
4593 * - If "dname" is ".", return "fname" (swap file in dir of file). | |
4594 * - If "dname" starts with "./", insert "dname" in "fname" (swap file | |
4595 * relative to dir of file). | |
4596 * - Otherwise, prepend "dname" to the tail of "fname" (swap file in specific | |
4597 * dir). | |
4598 * | |
4599 * The return value is an allocated string and can be NULL. | |
4600 */ | |
4601 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4602 get_file_in_dir( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4603 char_u *fname, |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4604 char_u *dname) // don't use "dirname", it is a global for Alpha |
7 | 4605 { |
4606 char_u *t; | |
4607 char_u *tail; | |
4608 char_u *retval; | |
4609 int save_char; | |
4610 | |
4611 tail = gettail(fname); | |
4612 | |
4613 if (dname[0] == '.' && dname[1] == NUL) | |
4614 retval = vim_strsave(fname); | |
4615 else if (dname[0] == '.' && vim_ispathsep(dname[1])) | |
4616 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4617 if (tail == fname) // no path before file name |
7 | 4618 retval = concat_fnames(dname + 2, tail, TRUE); |
4619 else | |
4620 { | |
4621 save_char = *tail; | |
4622 *tail = NUL; | |
4623 t = concat_fnames(fname, dname + 2, TRUE); | |
4624 *tail = save_char; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4625 if (t == NULL) // out of memory |
7 | 4626 retval = NULL; |
4627 else | |
4628 { | |
4629 retval = concat_fnames(t, tail, TRUE); | |
4630 vim_free(t); | |
4631 } | |
4632 } | |
4633 } | |
4634 else | |
4635 retval = concat_fnames(dname, tail, TRUE); | |
4636 | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
4637 #ifdef MSWIN |
5432 | 4638 if (retval != NULL) |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10996
diff
changeset
|
4639 for (t = gettail(retval); *t != NUL; MB_PTR_ADV(t)) |
5432 | 4640 if (*t == ':') |
4641 *t = '%'; | |
4642 #endif | |
4643 | |
7 | 4644 return retval; |
4645 } | |
4646 | |
580 | 4647 /* |
4648 * Print the ATTENTION message: info about an existing swap file. | |
4649 */ | |
4650 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4651 attention_message( |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4652 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
|
4653 char_u *fname) // swap file name |
580 | 4654 { |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
4655 stat_T st; |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
4656 time_t swap_mtime; |
580 | 4657 |
4658 ++no_wait_return; | |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
4659 (void)emsg(_(e_attention)); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4660 msg_puts(_("\nFound a swap file by the name \"")); |
580 | 4661 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
|
4662 msg_puts("\"\n"); |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
4663 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
|
4664 msg_puts(_("While opening file \"")); |
580 | 4665 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
|
4666 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
|
4667 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
|
4668 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4669 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
|
4670 } |
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
|
4671 else |
580 | 4672 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4673 msg_puts(_(" dated: ")); |
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
4674 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
|
4675 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
|
4676 msg_puts(_(" NEWER than swap file!\n")); |
580 | 4677 } |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4678 // 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
|
4679 // other languages. |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4680 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
|
4681 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
|
4682 msg_puts(_(" If this is the case, use \":recover\" or \"vim -r ")); |
580 | 4683 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
|
4684 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
|
4685 msg_puts(_(" If you did this already, delete the swap file \"")); |
580 | 4686 msg_outtrans(fname); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4687 msg_puts(_("\"\n to avoid this message.\n")); |
580 | 4688 cmdline_row = msg_row; |
4689 --no_wait_return; | |
4690 } | |
4691 | |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4692 typedef enum { |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4693 SEA_CHOICE_NONE = 0, |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4694 SEA_CHOICE_READONLY = 1, |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4695 SEA_CHOICE_EDIT = 2, |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4696 SEA_CHOICE_RECOVER = 3, |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4697 SEA_CHOICE_DELETE = 4, |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4698 SEA_CHOICE_QUIT = 5, |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4699 SEA_CHOICE_ABORT = 6 |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4700 } sea_choice_T; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4701 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
4702 #if defined(FEAT_EVAL) |
580 | 4703 /* |
4704 * Trigger the SwapExists autocommands. | |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4705 * Returns a value for equivalent to do_dialog(). |
580 | 4706 */ |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4707 static sea_choice_T |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4708 do_swapexists(buf_T *buf, char_u *fname) |
580 | 4709 { |
4710 set_vim_var_string(VV_SWAPNAME, fname, -1); | |
4711 set_vim_var_string(VV_SWAPCHOICE, NULL, -1); | |
4712 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4713 // 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
|
4714 // edited. Disallow changing directory here. |
1856 | 4715 ++allbuf_lock; |
580 | 4716 apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL); |
1856 | 4717 --allbuf_lock; |
580 | 4718 |
4719 set_vim_var_string(VV_SWAPNAME, NULL, -1); | |
4720 | |
4721 switch (*get_vim_var_str(VV_SWAPCHOICE)) | |
4722 { | |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4723 case 'o': return SEA_CHOICE_READONLY; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4724 case 'e': return SEA_CHOICE_EDIT; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4725 case 'r': return SEA_CHOICE_RECOVER; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4726 case 'd': return SEA_CHOICE_DELETE; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4727 case 'q': return SEA_CHOICE_QUIT; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4728 case 'a': return SEA_CHOICE_ABORT; |
580 | 4729 } |
4730 | |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4731 return SEA_CHOICE_NONE; |
580 | 4732 } |
4733 #endif | |
4734 | |
7 | 4735 /* |
4736 * Find out what name to use for the swap file for buffer 'buf'. | |
4737 * | |
4738 * Several names are tried to find one that does not exist | |
460 | 4739 * Returns the name in allocated memory or NULL. |
3158 | 4740 * When out of memory "dirp" is set to NULL. |
7 | 4741 * |
4742 * 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
|
4743 * not being able to open the swap or undo file |
1856 | 4744 * Note: May trigger SwapExists autocmd, pointers may change! |
7 | 4745 */ |
4746 static char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4747 findswapname( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4748 buf_T *buf, |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4749 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
|
4750 char_u *old_fname) // don't give warning for this file name |
7 | 4751 { |
4752 char_u *fname; | |
4753 int n; | |
4754 char_u *dir_name; | |
4755 #ifdef AMIGA | |
4756 BPTR fh; | |
4757 #endif | |
4758 int r; | |
5432 | 4759 char_u *buf_fname = buf->b_fname; |
7 | 4760 |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
4761 #if !defined(UNIX) |
7 | 4762 # define CREATE_DUMMY_FILE |
4763 FILE *dummyfd = NULL; | |
4764 | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
4765 # ifdef MSWIN |
5432 | 4766 if (buf_fname != NULL && !mch_isFullName(buf_fname) |
4767 && vim_strchr(gettail(buf_fname), ':')) | |
4768 { | |
4769 char_u *t; | |
4770 | |
4771 buf_fname = vim_strsave(buf_fname); | |
4772 if (buf_fname == NULL) | |
4773 buf_fname = buf->b_fname; | |
4774 else | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10996
diff
changeset
|
4775 for (t = gettail(buf_fname); *t != NUL; MB_PTR_ADV(t)) |
5432 | 4776 if (*t == ':') |
4777 *t = '%'; | |
4778 } | |
4779 # endif | |
4780 | |
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4781 /* |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4782 * 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
|
4783 * 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
|
4784 * "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
|
4785 * this problem we temporarily create "test.doc". Don't do this when the |
26771
fc859aea8cec
patch 8.2.3914: various spelling mistakes in comments
Bram Moolenaar <Bram@vim.org>
parents:
26286
diff
changeset
|
4786 * check below for an 8.3 file name is used. |
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4787 */ |
5432 | 4788 if (!(buf->b_p_sn || buf->b_shortname) && buf_fname != NULL |
4789 && mch_getperm(buf_fname) < 0) | |
4790 dummyfd = mch_fopen((char *)buf_fname, "w"); | |
7 | 4791 #endif |
4792 | |
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4793 /* |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4794 * 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
|
4795 * 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
|
4796 */ |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
4797 dir_name = alloc(STRLEN(*dirp) + 1); |
3158 | 4798 if (dir_name == NULL) |
4799 *dirp = NULL; | |
4800 else | |
7 | 4801 (void)copy_option_part(dirp, dir_name, 31000, ","); |
4802 | |
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4803 /* |
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4804 * 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
|
4805 */ |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4806 if (dir_name == NULL) // out of memory |
7 | 4807 fname = NULL; |
4808 else | |
5432 | 4809 fname = makeswapname(buf_fname, buf->b_ffname, buf, dir_name); |
7 | 4810 |
4811 for (;;) | |
4812 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4813 if (fname == NULL) // must be out of memory |
7 | 4814 break; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4815 if ((n = (int)STRLEN(fname)) == 0) // safety check |
7 | 4816 { |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12975
diff
changeset
|
4817 VIM_CLEAR(fname); |
7 | 4818 break; |
4819 } | |
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
4820 #if defined(UNIX) |
7 | 4821 /* |
4822 * Some systems have a MS-DOS compatible filesystem that use 8.3 character | |
4823 * file names. If this is the first try and the swap file name does not fit in | |
4824 * 8.3, detect if this is the case, set shortname and try again. | |
4825 */ | |
4826 if (fname[n - 2] == 'w' && fname[n - 1] == 'p' | |
4827 && !(buf->b_p_sn || buf->b_shortname)) | |
4828 { | |
4829 char_u *tail; | |
4830 char_u *fname2; | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
4831 stat_T s1, s2; |
7 | 4832 int f1, f2; |
4833 int created1 = FALSE, created2 = FALSE; | |
4834 int same = FALSE; | |
4835 | |
4836 /* | |
4837 * Check if swapfile name does not fit in 8.3: | |
4838 * It either contains two dots, is longer than 8 chars, or starts | |
4839 * with a dot. | |
4840 */ | |
5432 | 4841 tail = gettail(buf_fname); |
7 | 4842 if ( vim_strchr(tail, '.') != NULL |
4843 || STRLEN(tail) > (size_t)8 | |
4844 || *gettail(fname) == '.') | |
4845 { | |
4846 fname2 = alloc(n + 2); | |
4847 if (fname2 != NULL) | |
4848 { | |
4849 STRCPY(fname2, fname); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4850 // 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
|
4851 // 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
|
4852 // if fname == "123456789.swp", fname2 = "12345678x.swp" |
7 | 4853 if (vim_strchr(tail, '.') != NULL) |
4854 fname2[n - 1] = 'x'; | |
4855 else if (*gettail(fname) == '.') | |
4856 { | |
4857 fname2[n] = 'x'; | |
4858 fname2[n + 1] = NUL; | |
4859 } | |
4860 else | |
4861 fname2[n - 5] += 1; | |
4862 /* | |
4863 * may need to create the files to be able to use mch_stat() | |
4864 */ | |
4865 f1 = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0); | |
4866 if (f1 < 0) | |
4867 { | |
4868 f1 = mch_open_rw((char *)fname, | |
4869 O_RDWR|O_CREAT|O_EXCL|O_EXTRA); | |
4870 created1 = TRUE; | |
4871 } | |
4872 if (f1 >= 0) | |
4873 { | |
4874 f2 = mch_open((char *)fname2, O_RDONLY | O_EXTRA, 0); | |
4875 if (f2 < 0) | |
4876 { | |
4877 f2 = mch_open_rw((char *)fname2, | |
4878 O_RDWR|O_CREAT|O_EXCL|O_EXTRA); | |
4879 created2 = TRUE; | |
4880 } | |
4881 if (f2 >= 0) | |
4882 { | |
4883 /* | |
4884 * Both files exist now. If mch_stat() returns the | |
4885 * same device and inode they are the same file. | |
4886 */ | |
4887 if (mch_fstat(f1, &s1) != -1 | |
4888 && mch_fstat(f2, &s2) != -1 | |
4889 && s1.st_dev == s2.st_dev | |
4890 && s1.st_ino == s2.st_ino) | |
4891 same = TRUE; | |
4892 close(f2); | |
4893 if (created2) | |
4894 mch_remove(fname2); | |
4895 } | |
4896 close(f1); | |
4897 if (created1) | |
4898 mch_remove(fname); | |
4899 } | |
4900 vim_free(fname2); | |
4901 if (same) | |
4902 { | |
4903 buf->b_shortname = TRUE; | |
4904 vim_free(fname); | |
5432 | 4905 fname = makeswapname(buf_fname, buf->b_ffname, |
460 | 4906 buf, dir_name); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4907 continue; // try again with b_shortname set |
7 | 4908 } |
4909 } | |
4910 } | |
4911 } | |
4912 #endif | |
4913 /* | |
4914 * check if the swapfile already exists | |
4915 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4916 if (mch_getperm(fname) < 0) // it does not exist |
7 | 4917 { |
4918 #ifdef HAVE_LSTAT | |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
4919 stat_T sb; |
7 | 4920 |
4921 /* | |
4922 * Extra security check: When a swap file is a symbolic link, this | |
4923 * is most likely a symlink attack. | |
4924 */ | |
4925 if (mch_lstat((char *)fname, &sb) < 0) | |
4926 #else | |
4927 # ifdef AMIGA | |
4928 fh = Open((UBYTE *)fname, (long)MODE_NEWFILE); | |
4929 /* | |
4930 * on the Amiga mch_getperm() will return -1 when the file exists | |
4931 * but is being used by another program. This happens if you edit | |
4932 * a file twice. | |
4933 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4934 if (fh != (BPTR)NULL) // can open file, OK |
7 | 4935 { |
4936 Close(fh); | |
4937 mch_remove(fname); | |
4938 break; | |
4939 } | |
4940 if (IoErr() != ERROR_OBJECT_IN_USE | |
4941 && IoErr() != ERROR_OBJECT_EXISTS) | |
4942 # endif | |
4943 #endif | |
4944 break; | |
4945 } | |
4946 | |
4947 /* | |
4948 * A file name equal to old_fname is OK to use. | |
4949 */ | |
4950 if (old_fname != NULL && fnamecmp(fname, old_fname) == 0) | |
4951 break; | |
4952 | |
4953 /* | |
4954 * get here when file already exists | |
4955 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4956 if (fname[n - 2] == 'w' && fname[n - 1] == 'p') // first try |
7 | 4957 { |
4958 /* | |
4959 * on MS-DOS compatible filesystems (e.g. messydos) file.doc.swp | |
4960 * and file.doc are the same file. To guess if this problem is | |
4961 * present try if file.doc.swx exists. If it does, we set | |
4962 * buf->b_shortname and try file_doc.swp (dots replaced by | |
4963 * underscores for this file), and try again. If it doesn't we | |
4964 * assume that "file.doc.swp" already exists. | |
4965 */ | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4966 if (!(buf->b_p_sn || buf->b_shortname)) // not tried yet |
7 | 4967 { |
4968 fname[n - 1] = 'x'; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4969 r = mch_getperm(fname); // try "file.swx" |
7 | 4970 fname[n - 1] = 'p'; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4971 if (r >= 0) // "file.swx" seems to exist |
7 | 4972 { |
4973 buf->b_shortname = TRUE; | |
4974 vim_free(fname); | |
5432 | 4975 fname = makeswapname(buf_fname, buf->b_ffname, |
460 | 4976 buf, dir_name); |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4977 continue; // try again with '.' replaced with '_' |
7 | 4978 } |
4979 } | |
4980 /* | |
4981 * If we get here the ".swp" file really exists. | |
4982 * Give an error message, unless recovering, no file name, we are | |
4983 * viewing a help file or when the path of the file is different | |
4984 * (happens when all .swp files are in one directory). | |
4985 */ | |
5432 | 4986 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
|
4987 && !buf->b_help |
5278e5a2a4e3
patch 8.1.1813: ATTENTION prompt for a preview popup window
Bram Moolenaar <Bram@vim.org>
parents:
17454
diff
changeset
|
4988 && !(buf->b_flags & (BF_DUMMY | BF_NO_SEA))) |
7 | 4989 { |
4990 int fd; | |
4991 struct block0 b0; | |
4992 int differ = FALSE; | |
4993 | |
4994 /* | |
4995 * Try to read block 0 from the swap file to get the original | |
4996 * file name (and inode number). | |
4997 */ | |
4998 fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0); | |
4999 if (fd >= 0) | |
5000 { | |
2664 | 5001 if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0)) |
7 | 5002 { |
5003 /* | |
39 | 5004 * If the swapfile has the same directory as the |
5005 * buffer don't compare the directory names, they can | |
5006 * have a different mountpoint. | |
7 | 5007 */ |
39 | 5008 if (b0.b0_flags & B0_SAME_DIR) |
5009 { | |
5010 if (fnamecmp(gettail(buf->b_ffname), | |
5011 gettail(b0.b0_fname)) != 0 | |
5012 || !same_directory(fname, buf->b_ffname)) | |
594 | 5013 { |
5014 #ifdef CHECK_INODE | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5015 // 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
|
5016 // 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
|
5017 // inode too. |
594 | 5018 expand_env(b0.b0_fname, NameBuff, MAXPATHL); |
5019 if (fnamecmp_ino(buf->b_ffname, NameBuff, | |
5020 char_to_long(b0.b0_ino))) | |
5021 #endif | |
5022 differ = TRUE; | |
5023 } | |
39 | 5024 } |
5025 else | |
5026 { | |
5027 /* | |
5028 * The name in the swap file may be | |
5029 * "~user/path/file". Expand it first. | |
5030 */ | |
5031 expand_env(b0.b0_fname, NameBuff, MAXPATHL); | |
7 | 5032 #ifdef CHECK_INODE |
39 | 5033 if (fnamecmp_ino(buf->b_ffname, NameBuff, |
594 | 5034 char_to_long(b0.b0_ino))) |
39 | 5035 differ = TRUE; |
7 | 5036 #else |
39 | 5037 if (fnamecmp(NameBuff, buf->b_ffname) != 0) |
5038 differ = TRUE; | |
7 | 5039 #endif |
39 | 5040 } |
7 | 5041 } |
5042 close(fd); | |
5043 } | |
5044 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5045 // 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
|
5046 // for the current file, and the buffer was not recovered. |
7 | 5047 if (differ == FALSE && !(curbuf->b_flags & BF_RECOVERED) |
5048 && vim_strchr(p_shm, SHM_ATTENTION) == NULL) | |
5049 { | |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5050 sea_choice_T choice = SEA_CHOICE_NONE; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5051 stat_T st; |
7 | 5052 #ifdef CREATE_DUMMY_FILE |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5053 int did_use_dummy = FALSE; |
7 | 5054 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5055 // 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
|
5056 // 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
|
5057 // 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
|
5058 // here if the window is closed. |
7 | 5059 if (dummyfd != NULL) |
5060 { | |
5061 fclose(dummyfd); | |
5062 dummyfd = NULL; | |
5432 | 5063 mch_remove(buf_fname); |
7 | 5064 did_use_dummy = TRUE; |
5065 } | |
5066 #endif | |
5067 | |
16455
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
5068 #ifdef HAVE_PROCESS_STILL_RUNNING |
7 | 5069 process_still_running = FALSE; |
5070 #endif | |
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5071 // 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
|
5072 // - the edited file exists |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5073 // - 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
|
5074 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
|
5075 && swapfile_unchanged(fname)) |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5076 { |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5077 choice = SEA_CHOICE_DELETE; |
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5078 if (p_verbose > 0) |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5079 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
|
5080 } |
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5081 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
5082 #if defined(FEAT_EVAL) |
580 | 5083 /* |
5084 * If there is an SwapExists autocommand and we can handle | |
5085 * the response, trigger it. It may return 0 to ask the | |
5086 * user anyway. | |
5087 */ | |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5088 if (choice == SEA_CHOICE_NONE |
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5089 && swap_exists_action != SEA_NONE |
5432 | 5090 && has_autocmd(EVENT_SWAPEXISTS, buf_fname, buf)) |
580 | 5091 choice = do_swapexists(buf, fname); |
5092 #endif | |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5093 |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5094 if (choice == SEA_CHOICE_NONE |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5095 && swap_exists_action == SEA_READONLY) |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5096 { |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5097 // always open readonly. |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5098 choice = SEA_CHOICE_READONLY; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5099 } |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5100 |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5101 if (choice == SEA_CHOICE_NONE) |
7 | 5102 { |
580 | 5103 #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
|
5104 // 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
|
5105 // 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
|
5106 // 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
|
5107 // loading a session from the .gvimrc file. |
580 | 5108 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
|
5109 gui_start(NULL); |
580 | 5110 #endif |
14903
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5111 // Show info about the existing swap file. |
580 | 5112 attention_message(buf, fname); |
5113 | |
14903
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5114 // 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
|
5115 // interrupt loading a file. |
580 | 5116 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
|
5117 |
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5118 // 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
|
5119 // interfere with the prompt here. |
14909
c97b4b537572
patch 8.1.0466: autocmd test fails
Bram Moolenaar <Bram@vim.org>
parents:
14903
diff
changeset
|
5120 flush_buffers(FLUSH_TYPEAHEAD); |
7 | 5121 } |
5122 | |
5123 #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) | |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5124 if (swap_exists_action != SEA_NONE |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5125 && choice == SEA_CHOICE_NONE) |
7 | 5126 { |
5127 char_u *name; | |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5128 int dialog_result; |
7 | 5129 |
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
5130 name = alloc(STRLEN(fname) |
7 | 5131 + 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
|
5132 + STRLEN(_("\" already exists!")) + 5); |
7 | 5133 if (name != NULL) |
5134 { | |
5135 STRCPY(name, _("Swap file \"")); | |
5136 home_replace(NULL, fname, name + STRLEN(name), | |
5137 1000, TRUE); | |
5138 STRCAT(name, _("\" already exists!")); | |
5139 } | |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5140 dialog_result = do_dialog(VIM_WARNING, |
7 | 5141 (char_u *)_("VIM - ATTENTION"), |
5142 name == NULL | |
5143 ? (char_u *)_("Swap file already exists!") | |
5144 : name, | |
16455
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
5145 # ifdef HAVE_PROCESS_STILL_RUNNING |
7 | 5146 process_still_running |
5147 ? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") : | |
5148 # endif | |
2684 | 5149 (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL, FALSE); |
580 | 5150 |
16455
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
5151 # ifdef HAVE_PROCESS_STILL_RUNNING |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5152 if (process_still_running && dialog_result >= 4) |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5153 // compensate for missing "Delete it" button |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5154 dialog_result++; |
580 | 5155 # endif |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5156 choice = dialog_result; |
580 | 5157 vim_free(name); |
5158 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5159 // pretend screen didn't scroll, need redraw anyway |
580 | 5160 msg_scrolled = 0; |
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29682
diff
changeset
|
5161 redraw_all_later(UPD_NOT_VALID); |
580 | 5162 } |
5163 #endif | |
5164 | |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5165 switch (choice) |
580 | 5166 { |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5167 case SEA_CHOICE_READONLY: |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5168 buf->b_p_ro = TRUE; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5169 break; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5170 case SEA_CHOICE_EDIT: |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5171 break; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5172 case SEA_CHOICE_RECOVER: |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5173 swap_exists_action = SEA_RECOVER; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5174 break; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5175 case SEA_CHOICE_DELETE: |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5176 mch_remove(fname); |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5177 break; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5178 case SEA_CHOICE_QUIT: |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5179 swap_exists_action = SEA_QUIT; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5180 break; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5181 case SEA_CHOICE_ABORT: |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5182 swap_exists_action = SEA_QUIT; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5183 got_int = TRUE; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5184 break; |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5185 case SEA_CHOICE_NONE: |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5186 msg_puts("\n"); |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5187 if (msg_silent == 0) |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5188 // call wait_return() later |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5189 need_wait_return = TRUE; |
7 | 5190 break; |
5191 } | |
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5192 |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5193 // If the file was deleted this fname can be used. |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5194 if (choice != SEA_CHOICE_NONE && mch_getperm(fname) < 0) |
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5195 break; |
7 | 5196 |
5197 #ifdef CREATE_DUMMY_FILE | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5198 // Going to try another name, need the dummy file again. |
7 | 5199 if (did_use_dummy) |
5432 | 5200 dummyfd = mch_fopen((char *)buf_fname, "w"); |
7 | 5201 #endif |
5202 } | |
5203 } | |
5204 } | |
5205 | |
5206 /* | |
5207 * Change the ".swp" extension to find another file that can be used. | |
5208 * First decrement the last char: ".swo", ".swn", etc. | |
5209 * If that still isn't enough decrement the last but one char: ".svz" | |
9 | 5210 * Can happen when editing many "No Name" buffers. |
7 | 5211 */ |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5212 if (fname[n - 1] == 'a') // ".s?a" |
7 | 5213 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5214 if (fname[n - 2] == 'a') // ".saa": tried enough, give up |
7 | 5215 { |
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
5216 emsg(_(e_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
|
5217 VIM_CLEAR(fname); |
7 | 5218 break; |
5219 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5220 --fname[n - 2]; // ".svz", ".suz", etc. |
7 | 5221 fname[n - 1] = 'z' + 1; |
5222 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5223 --fname[n - 1]; // ".swo", ".swn", etc. |
7 | 5224 } |
5225 | |
5226 vim_free(dir_name); | |
5227 #ifdef CREATE_DUMMY_FILE | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5228 if (dummyfd != NULL) // file has been created temporarily |
7 | 5229 { |
5230 fclose(dummyfd); | |
5432 | 5231 mch_remove(buf_fname); |
7 | 5232 } |
5233 #endif | |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
5234 #ifdef MSWIN |
5432 | 5235 if (buf_fname != buf->b_fname) |
5236 vim_free(buf_fname); | |
5237 #endif | |
7 | 5238 return fname; |
5239 } | |
5240 | |
5241 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5242 b0_magic_wrong(ZERO_BL *b0p) |
7 | 5243 { |
5244 return (b0p->b0_magic_long != (long)B0_MAGIC_LONG | |
5245 || b0p->b0_magic_int != (int)B0_MAGIC_INT | |
5246 || b0p->b0_magic_short != (short)B0_MAGIC_SHORT | |
5247 || b0p->b0_magic_char != B0_MAGIC_CHAR); | |
5248 } | |
5249 | |
5250 #ifdef CHECK_INODE | |
5251 /* | |
5252 * Compare current file name with file name from swap file. | |
5253 * Try to use inode numbers when possible. | |
5254 * Return non-zero when files are different. | |
5255 * | |
5256 * When comparing file names a few things have to be taken into consideration: | |
5257 * - When working over a network the full path of a file depends on the host. | |
5258 * We check the inode number if possible. It is not 100% reliable though, | |
5259 * because the device number cannot be used over a network. | |
5260 * - When a file does not exist yet (editing a new file) there is no inode | |
5261 * number. | |
5262 * - The file name in a swap file may not be valid on the current host. The | |
5263 * "~user" form is used whenever possible to avoid this. | |
5264 * | |
5265 * This is getting complicated, let's make a table: | |
5266 * | |
5267 * ino_c ino_s fname_c fname_s differ = | |
5268 * | |
5269 * both files exist -> compare inode numbers: | |
5270 * != 0 != 0 X X ino_c != ino_s | |
5271 * | |
5272 * inode number(s) unknown, file names available -> compare file names | |
5273 * == 0 X OK OK fname_c != fname_s | |
5274 * X == 0 OK OK fname_c != fname_s | |
5275 * | |
5276 * current file doesn't exist, file for swap file exist, file name(s) not | |
5277 * available -> probably different | |
5278 * == 0 != 0 FAIL X TRUE | |
5279 * == 0 != 0 X FAIL TRUE | |
5280 * | |
5281 * current file exists, inode for swap unknown, file name(s) not | |
5282 * available -> probably different | |
5283 * != 0 == 0 FAIL X TRUE | |
5284 * != 0 == 0 X FAIL TRUE | |
5285 * | |
5286 * current file doesn't exist, inode for swap unknown, one file name not | |
5287 * available -> probably different | |
5288 * == 0 == 0 FAIL OK TRUE | |
5289 * == 0 == 0 OK FAIL TRUE | |
5290 * | |
5291 * 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
|
5292 * 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
|
5293 * == 0 == 0 FAIL FAIL fname_c != fname_s |
7 | 5294 * |
5295 * Note that when the ino_t is 64 bits, only the last 32 will be used. This | |
5296 * can't be changed without making the block 0 incompatible with 32 bit | |
5297 * versions. | |
5298 */ | |
5299 | |
5300 static int | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5301 fnamecmp_ino( |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5302 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
|
5303 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
|
5304 long ino_block0) |
7 | 5305 { |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
5306 stat_T st; |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5307 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
|
5308 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
|
5309 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
|
5310 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
|
5311 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
|
5312 int retval_s; // flag: buf_s valid |
7 | 5313 |
5314 if (mch_stat((char *)fname_c, &st) == 0) | |
5315 ino_c = (ino_t)st.st_ino; | |
5316 | |
5317 /* | |
5318 * First we try to get the inode from the file name, because the inode in | |
5319 * the swap file may be outdated. If that fails (e.g. this path is not | |
5320 * valid on this machine), use the inode from block 0. | |
5321 */ | |
5322 if (mch_stat((char *)fname_s, &st) == 0) | |
5323 ino_s = (ino_t)st.st_ino; | |
5324 else | |
5325 ino_s = (ino_t)ino_block0; | |
5326 | |
5327 if (ino_c && ino_s) | |
5328 return (ino_c != ino_s); | |
5329 | |
5330 /* | |
5331 * One of the inode numbers is unknown, try a forced vim_FullName() and | |
5332 * compare the file names. | |
5333 */ | |
5334 retval_c = vim_FullName(fname_c, buf_c, MAXPATHL, TRUE); | |
5335 retval_s = vim_FullName(fname_s, buf_s, MAXPATHL, TRUE); | |
5336 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
|
5337 return STRCMP(buf_c, buf_s) != 0; |
7 | 5338 |
5339 /* | |
5340 * 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
|
5341 * 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
|
5342 * in the swap file. |
7 | 5343 */ |
5344 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
|
5345 return STRCMP(fname_c, fname_s) != 0; |
7 | 5346 return TRUE; |
5347 } | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5348 #endif // CHECK_INODE |
7 | 5349 |
5350 /* | |
5351 * Move a long integer into a four byte character array. | |
5352 * Used for machine independency in block zero. | |
5353 */ | |
5354 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5355 long_to_char(long n, char_u *s) |
7 | 5356 { |
5357 s[0] = (char_u)(n & 0xff); | |
5358 n = (unsigned)n >> 8; | |
5359 s[1] = (char_u)(n & 0xff); | |
5360 n = (unsigned)n >> 8; | |
5361 s[2] = (char_u)(n & 0xff); | |
5362 n = (unsigned)n >> 8; | |
5363 s[3] = (char_u)(n & 0xff); | |
5364 } | |
5365 | |
5366 static long | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5367 char_to_long(char_u *s) |
7 | 5368 { |
5369 long retval; | |
5370 | |
5371 retval = s[3]; | |
5372 retval <<= 8; | |
5373 retval |= s[2]; | |
5374 retval <<= 8; | |
5375 retval |= s[1]; | |
5376 retval <<= 8; | |
5377 retval |= s[0]; | |
5378 | |
5379 return retval; | |
5380 } | |
5381 | |
39 | 5382 /* |
5383 * Set the flags in the first block of the swap file: | |
5384 * - file is modified or not: buf->b_changed | |
5385 * - 'fileformat' | |
5386 * - 'fileencoding' | |
5387 */ | |
7 | 5388 void |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5389 ml_setflags(buf_T *buf) |
7 | 5390 { |
5391 bhdr_T *hp; | |
5392 ZERO_BL *b0p; | |
5393 | |
5394 if (!buf->b_ml.ml_mfp) | |
5395 return; | |
5396 for (hp = buf->b_ml.ml_mfp->mf_used_last; hp != NULL; hp = hp->bh_prev) | |
5397 { | |
5398 if (hp->bh_bnum == 0) | |
5399 { | |
5400 b0p = (ZERO_BL *)(hp->bh_data); | |
39 | 5401 b0p->b0_dirty = buf->b_changed ? B0_DIRTY : 0; |
5402 b0p->b0_flags = (b0p->b0_flags & ~B0_FF_MASK) | |
5403 | (get_fileformat(buf) + 1); | |
5404 add_b0_fenc(b0p, buf); | |
7 | 5405 hp->bh_flags |= BH_DIRTY; |
5406 mf_sync(buf->b_ml.ml_mfp, MFS_ZERO); | |
5407 break; | |
5408 } | |
5409 } | |
5410 } | |
5411 | |
2267 | 5412 #if defined(FEAT_CRYPT) || defined(PROTO) |
5413 /* | |
5414 * If "data" points to a data block encrypt the text in it and return a copy | |
5415 * in allocated memory. Return NULL when out of memory. | |
5416 * Otherwise return "data". | |
5417 */ | |
5418 char_u * | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5419 ml_encrypt_data( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5420 memfile_T *mfp, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5421 char_u *data, |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
5422 off_T offset, |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5423 unsigned size) |
2267 | 5424 { |
5425 DATA_BL *dp = (DATA_BL *)data; | |
5426 char_u *head_end; | |
5427 char_u *text_start; | |
5428 char_u *new_data; | |
5429 int text_len; | |
6122 | 5430 cryptstate_T *state; |
2267 | 5431 |
5432 if (dp->db_id != DATA_ID) | |
5433 return data; | |
5434 | |
6817 | 5435 state = ml_crypt_prepare(mfp, offset, FALSE); |
5436 if (state == NULL) | |
5437 return data; | |
5438 | |
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
|
5439 new_data = alloc(size); |
2267 | 5440 if (new_data == NULL) |
5441 return NULL; | |
5442 head_end = (char_u *)(&dp->db_index[dp->db_line_count]); | |
5443 text_start = (char_u *)dp + dp->db_txt_start; | |
5444 text_len = size - dp->db_txt_start; | |
5445 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5446 // Copy the header and the text. |
2267 | 5447 mch_memmove(new_data, dp, head_end - (char_u *)dp); |
5448 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5449 // 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
|
5450 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
|
5451 FALSE); |
6122 | 5452 crypt_free_state(state); |
2267 | 5453 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5454 // Clear the gap. |
2267 | 5455 if (head_end < text_start) |
5456 vim_memset(new_data + (head_end - data), 0, text_start - head_end); | |
5457 | |
5458 return new_data; | |
5459 } | |
5460 | |
5461 /* | |
6817 | 5462 * Decrypt the text in "data" if it points to an encrypted data block. |
2267 | 5463 */ |
5464 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5465 ml_decrypt_data( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5466 memfile_T *mfp, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5467 char_u *data, |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
5468 off_T offset, |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5469 unsigned size) |
2267 | 5470 { |
5471 DATA_BL *dp = (DATA_BL *)data; | |
5472 char_u *head_end; | |
5473 char_u *text_start; | |
5474 int text_len; | |
6122 | 5475 cryptstate_T *state; |
2267 | 5476 |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5477 if (dp->db_id != DATA_ID) |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5478 return; |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5479 |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5480 head_end = (char_u *)(&dp->db_index[dp->db_line_count]); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5481 text_start = (char_u *)dp + dp->db_txt_start; |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5482 text_len = dp->db_txt_end - dp->db_txt_start; |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5483 |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5484 if (head_end > text_start || dp->db_txt_start > size |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5485 || dp->db_txt_end > size) |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5486 return; // data was messed up |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5487 |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5488 state = ml_crypt_prepare(mfp, offset, TRUE); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5489 if (state == NULL) |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5490 return; |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5491 |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5492 // Decrypt the text in place. |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5493 crypt_decode_inplace(state, text_start, text_len, FALSE); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31513
diff
changeset
|
5494 crypt_free_state(state); |
2267 | 5495 } |
5496 | |
5497 /* | |
5498 * Prepare for encryption/decryption, using the key, seed and offset. | |
6122 | 5499 * Return an allocated cryptstate_T *. |
2267 | 5500 */ |
6122 | 5501 static cryptstate_T * |
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
5502 ml_crypt_prepare(memfile_T *mfp, off_T offset, int reading) |
2267 | 5503 { |
5504 buf_T *buf = mfp->mf_buffer; | |
5505 char_u salt[50]; | |
6122 | 5506 int method_nr; |
2267 | 5507 char_u *key; |
5508 char_u *seed; | |
5509 | |
5510 if (reading && mfp->mf_old_key != NULL) | |
5511 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5512 // Reading back blocks with the previous key/method/seed. |
6122 | 5513 method_nr = mfp->mf_old_cm; |
2267 | 5514 key = mfp->mf_old_key; |
5515 seed = mfp->mf_old_seed; | |
5516 } | |
5517 else | |
5518 { | |
6122 | 5519 method_nr = crypt_get_method_nr(buf); |
2267 | 5520 key = buf->b_p_key; |
5521 seed = mfp->mf_seed; | |
5522 } | |
6817 | 5523 if (*key == NUL) |
5524 return NULL; | |
2267 | 5525 |
6122 | 5526 if (method_nr == CRYPT_M_ZIP) |
2267 | 5527 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5528 // 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
|
5529 // key for every block. |
2267 | 5530 vim_snprintf((char *)salt, sizeof(salt), "%s%ld", key, (long)offset); |
6122 | 5531 return crypt_create(method_nr, salt, NULL, 0, NULL, 0); |
2267 | 5532 } |
6122 | 5533 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5534 // 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
|
5535 // of the block for the salt. |
6122 | 5536 vim_snprintf((char *)salt, sizeof(salt), "%ld", (long)offset); |
5537 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
|
5538 seed, MF_SEED_LEN); |
2267 | 5539 } |
5540 | |
5541 #endif | |
5542 | |
5543 | |
7 | 5544 #if defined(FEAT_BYTEOFF) || defined(PROTO) |
5545 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5546 #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
|
5547 #define MLCS_MINL 400 // should be half of MLCS_MAXL |
7 | 5548 |
5549 /* | |
2407
6bc102a4bff8
Fix memory access to 'cryptmethod' during recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2394
diff
changeset
|
5550 * Keep information for finding byte offset of a line, updtype may be one of: |
7 | 5551 * ML_CHNK_ADDLINE: Add len to parent chunk, possibly splitting it |
5552 * Careful: ML_CHNK_ADDLINE may cause ml_find_line() to be called. | |
5553 * ML_CHNK_DELLINE: Subtract len from parent chunk, possibly deleting it | |
5554 * ML_CHNK_UPDLINE: Add len to parent chunk, as a signed entity. | |
5555 */ | |
5556 static void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5557 ml_updatechunk( |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5558 buf_T *buf, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5559 linenr_T line, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5560 long len, |
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5561 int updtype) |
7 | 5562 { |
5563 static buf_T *ml_upd_lastbuf = NULL; | |
5564 static linenr_T ml_upd_lastline; | |
5565 static linenr_T ml_upd_lastcurline; | |
5566 static int ml_upd_lastcurix; | |
5567 | |
5568 linenr_T curline = ml_upd_lastcurline; | |
5569 int curix = ml_upd_lastcurix; | |
5570 long size; | |
5571 chunksize_T *curchnk; | |
5572 int rest; | |
5573 bhdr_T *hp; | |
5574 DATA_BL *dp; | |
5575 | |
5576 if (buf->b_ml.ml_usedchunks == -1 || len == 0) | |
5577 return; | |
5578 if (buf->b_ml.ml_chunksize == NULL) | |
5579 { | |
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
|
5580 buf->b_ml.ml_chunksize = ALLOC_MULT(chunksize_T, 100); |
7 | 5581 if (buf->b_ml.ml_chunksize == NULL) |
5582 { | |
5583 buf->b_ml.ml_usedchunks = -1; | |
5584 return; | |
5585 } | |
5586 buf->b_ml.ml_numchunks = 100; | |
5587 buf->b_ml.ml_usedchunks = 1; | |
5588 buf->b_ml.ml_chunksize[0].mlcs_numlines = 1; | |
5589 buf->b_ml.ml_chunksize[0].mlcs_totalsize = 1; | |
5590 } | |
5591 | |
5592 if (updtype == ML_CHNK_UPDLINE && buf->b_ml.ml_line_count == 1) | |
5593 { | |
5594 /* | |
5595 * First line in empty buffer from ml_flush_line() -- reset | |
5596 */ | |
5597 buf->b_ml.ml_usedchunks = 1; | |
5598 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
|
5599 buf->b_ml.ml_chunksize[0].mlcs_totalsize = (long)buf->b_ml.ml_line_len; |
7 | 5600 return; |
5601 } | |
5602 | |
5603 /* | |
5604 * Find chunk that our line belongs to, curline will be at start of the | |
5605 * chunk. | |
5606 */ | |
5607 if (buf != ml_upd_lastbuf || line != ml_upd_lastline + 1 | |
5608 || updtype != ML_CHNK_ADDLINE) | |
5609 { | |
5610 for (curline = 1, curix = 0; | |
5611 curix < buf->b_ml.ml_usedchunks - 1 | |
5612 && line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines; | |
5613 curix++) | |
5614 curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines; | |
5615 } | |
14980
c98810dfebaf
patch 8.1.0501: cppcheck warns for using array index before bounds check
Bram Moolenaar <Bram@vim.org>
parents:
14923
diff
changeset
|
5616 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
|
5617 && line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines) |
7 | 5618 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5619 // Adjust cached curix & curline |
7 | 5620 curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines; |
5621 curix++; | |
5622 } | |
5623 curchnk = buf->b_ml.ml_chunksize + curix; | |
5624 | |
5625 if (updtype == ML_CHNK_DELLINE) | |
1030 | 5626 len = -len; |
7 | 5627 curchnk->mlcs_totalsize += len; |
5628 if (updtype == ML_CHNK_ADDLINE) | |
5629 { | |
5630 curchnk->mlcs_numlines++; | |
5631 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5632 // May resize here so we don't have to do it in both cases below |
7 | 5633 if (buf->b_ml.ml_usedchunks + 1 >= buf->b_ml.ml_numchunks) |
5634 { | |
6596 | 5635 chunksize_T *t_chunksize = buf->b_ml.ml_chunksize; |
5636 | |
7 | 5637 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
|
5638 buf->b_ml.ml_chunksize = vim_realloc(buf->b_ml.ml_chunksize, |
7 | 5639 sizeof(chunksize_T) * buf->b_ml.ml_numchunks); |
5640 if (buf->b_ml.ml_chunksize == NULL) | |
5641 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5642 // Hmmmm, Give up on offset for this buffer |
6596 | 5643 vim_free(t_chunksize); |
7 | 5644 buf->b_ml.ml_usedchunks = -1; |
5645 return; | |
5646 } | |
5647 } | |
5648 | |
5649 if (buf->b_ml.ml_chunksize[curix].mlcs_numlines >= MLCS_MAXL) | |
5650 { | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5651 int count; // number of entries in block |
7 | 5652 int idx; |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5653 int end_idx; |
7 | 5654 int text_end; |
5655 int linecnt; | |
5656 | |
5657 mch_memmove(buf->b_ml.ml_chunksize + curix + 1, | |
5658 buf->b_ml.ml_chunksize + curix, | |
5659 (buf->b_ml.ml_usedchunks - curix) * | |
5660 sizeof(chunksize_T)); | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5661 // Compute length of first half of lines in the split chunk |
7 | 5662 size = 0; |
5663 linecnt = 0; | |
5664 while (curline < buf->b_ml.ml_line_count | |
5665 && linecnt < MLCS_MINL) | |
5666 { | |
5667 if ((hp = ml_find_line(buf, curline, ML_FIND)) == NULL) | |
5668 { | |
5669 buf->b_ml.ml_usedchunks = -1; | |
5670 return; | |
5671 } | |
5672 dp = (DATA_BL *)(hp->bh_data); | |
5673 count = (long)(buf->b_ml.ml_locked_high) - | |
5674 (long)(buf->b_ml.ml_locked_low) + 1; | |
5675 idx = curline - buf->b_ml.ml_locked_low; | |
5676 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
|
5677 |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5678 // compute index of last line to use in this MEMLINE |
7 | 5679 rest = count - idx; |
5680 if (linecnt + rest > MLCS_MINL) | |
5681 { | |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5682 end_idx = idx + MLCS_MINL - linecnt - 1; |
7 | 5683 linecnt = MLCS_MINL; |
5684 } | |
5685 else | |
5686 { | |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5687 end_idx = count - 1; |
7 | 5688 linecnt += rest; |
5689 } | |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5690 #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
|
5691 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
|
5692 { |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5693 int i; |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5694 |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5695 // 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
|
5696 // 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
|
5697 // lines. |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5698 for (i = end_idx; i < idx; ++i) |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
5699 size += (int)STRLEN((char_u *)dp |
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
5700 + (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
|
5701 } |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5702 else |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5703 #endif |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5704 { |
25624
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
5705 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
|
5706 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
|
5707 else |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5708 text_end = ((dp->db_index[idx - 1]) & DB_INDEX_MASK); |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
5709 size += text_end |
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
5710 - ((dp->db_index[end_idx]) & DB_INDEX_MASK); |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5711 } |
7 | 5712 } |
5713 buf->b_ml.ml_chunksize[curix].mlcs_numlines = linecnt; | |
5714 buf->b_ml.ml_chunksize[curix + 1].mlcs_numlines -= linecnt; | |
5715 buf->b_ml.ml_chunksize[curix].mlcs_totalsize = size; | |
5716 buf->b_ml.ml_chunksize[curix + 1].mlcs_totalsize -= size; | |
5717 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
|
5718 ml_upd_lastbuf = NULL; // Force recalc of curix & curline |
7 | 5719 return; |
5720 } | |
5721 else if (buf->b_ml.ml_chunksize[curix].mlcs_numlines >= MLCS_MINL | |
5722 && curix == buf->b_ml.ml_usedchunks - 1 | |
5723 && buf->b_ml.ml_line_count - line <= 1) | |
5724 { | |
5725 /* | |
23229
b545334ae654
patch 8.2.2160: various typos
Bram Moolenaar <Bram@vim.org>
parents:
22959
diff
changeset
|
5726 * We are in the last chunk and it is cheap to create a new one |
7 | 5727 * after this. Do it now to avoid the loop above later on |
5728 */ | |
5729 curchnk = buf->b_ml.ml_chunksize + curix + 1; | |
5730 buf->b_ml.ml_usedchunks++; | |
5731 if (line == buf->b_ml.ml_line_count) | |
5732 { | |
5733 curchnk->mlcs_numlines = 0; | |
5734 curchnk->mlcs_totalsize = 0; | |
5735 } | |
5736 else | |
5737 { | |
5738 /* | |
5739 * Line is just prior to last, move count for last | |
5740 * This is the common case when loading a new file | |
5741 */ | |
5742 hp = ml_find_line(buf, buf->b_ml.ml_line_count, ML_FIND); | |
5743 if (hp == NULL) | |
5744 { | |
5745 buf->b_ml.ml_usedchunks = -1; | |
5746 return; | |
5747 } | |
5748 dp = (DATA_BL *)(hp->bh_data); | |
5749 if (dp->db_line_count == 1) | |
5750 rest = dp->db_txt_end - dp->db_txt_start; | |
5751 else | |
5752 rest = | |
5753 ((dp->db_index[dp->db_line_count - 2]) & DB_INDEX_MASK) | |
5754 - dp->db_txt_start; | |
5755 curchnk->mlcs_totalsize = rest; | |
5756 curchnk->mlcs_numlines = 1; | |
5757 curchnk[-1].mlcs_totalsize -= rest; | |
5758 curchnk[-1].mlcs_numlines -= 1; | |
5759 } | |
5760 } | |
5761 } | |
5762 else if (updtype == ML_CHNK_DELLINE) | |
5763 { | |
5764 curchnk->mlcs_numlines--; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5765 ml_upd_lastbuf = NULL; // Force recalc of curix & curline |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
5766 if (curix < buf->b_ml.ml_usedchunks - 1 |
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
5767 && curchnk->mlcs_numlines + curchnk[1].mlcs_numlines |
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
5768 <= MLCS_MINL) |
7 | 5769 { |
5770 curix++; | |
5771 curchnk = buf->b_ml.ml_chunksize + curix; | |
5772 } | |
5773 else if (curix == 0 && curchnk->mlcs_numlines <= 0) | |
5774 { | |
5775 buf->b_ml.ml_usedchunks--; | |
5776 mch_memmove(buf->b_ml.ml_chunksize, buf->b_ml.ml_chunksize + 1, | |
5777 buf->b_ml.ml_usedchunks * sizeof(chunksize_T)); | |
5778 return; | |
5779 } | |
5780 else if (curix == 0 || (curchnk->mlcs_numlines > 10 | |
29682
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
5781 && curchnk->mlcs_numlines + curchnk[-1].mlcs_numlines |
57cfb39b7842
patch 9.0.0181: textprop test with line2byte() fails on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
29651
diff
changeset
|
5782 > MLCS_MINL)) |
7 | 5783 { |
5784 return; | |
5785 } | |
5786 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5787 // Collapse chunks |
7 | 5788 curchnk[-1].mlcs_numlines += curchnk->mlcs_numlines; |
5789 curchnk[-1].mlcs_totalsize += curchnk->mlcs_totalsize; | |
5790 buf->b_ml.ml_usedchunks--; | |
5791 if (curix < buf->b_ml.ml_usedchunks) | |
5792 mch_memmove(buf->b_ml.ml_chunksize + curix, | |
5793 buf->b_ml.ml_chunksize + curix + 1, | |
5794 (buf->b_ml.ml_usedchunks - curix) * | |
5795 sizeof(chunksize_T)); | |
5796 return; | |
5797 } | |
5798 ml_upd_lastbuf = buf; | |
5799 ml_upd_lastline = line; | |
5800 ml_upd_lastcurline = curline; | |
5801 ml_upd_lastcurix = curix; | |
5802 } | |
5803 | |
5804 /* | |
5805 * Find offset for line or line with offset. | |
169 | 5806 * Find line with offset if "lnum" is 0; return remaining offset in offp |
5807 * Find offset of line if "lnum" > 0 | |
7 | 5808 * return -1 if information is not available |
5809 */ | |
5810 long | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5811 ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp) |
7 | 5812 { |
5813 linenr_T curline; | |
5814 int curix; | |
5815 long size; | |
5816 bhdr_T *hp; | |
5817 DATA_BL *dp; | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5818 int count; // number of entries in block |
7 | 5819 int idx; |
5820 int start_idx; | |
5821 int text_end; | |
5822 long offset; | |
5823 int len; | |
5824 int ffdos = (get_fileformat(buf) == EOL_DOS); | |
5825 int extra = 0; | |
5826 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5827 // take care of cached line first |
169 | 5828 ml_flush_line(curbuf); |
5829 | |
7 | 5830 if (buf->b_ml.ml_usedchunks == -1 |
5831 || buf->b_ml.ml_chunksize == NULL | |
169 | 5832 || lnum < 0) |
7 | 5833 return -1; |
5834 | |
5835 if (offp == NULL) | |
5836 offset = 0; | |
5837 else | |
5838 offset = *offp; | |
169 | 5839 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
|
5840 return 1; // Not a "find offset" and offset 0 _must_ be in line 1 |
7 | 5841 /* |
5842 * Find the last chunk before the one containing our line. Last chunk is | |
25624
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
5843 * special because it will never qualify. |
7 | 5844 */ |
5845 curline = 1; | |
5846 curix = size = 0; | |
5847 while (curix < buf->b_ml.ml_usedchunks - 1 | |
169 | 5848 && ((lnum != 0 |
5849 && lnum >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines) | |
7 | 5850 || (offset != 0 |
5851 && offset > size + buf->b_ml.ml_chunksize[curix].mlcs_totalsize | |
27453
c7f614c9ceb3
patch 8.2.4255: theoretical computation overflow
Bram Moolenaar <Bram@vim.org>
parents:
27426
diff
changeset
|
5852 + (long)ffdos * buf->b_ml.ml_chunksize[curix].mlcs_numlines))) |
7 | 5853 { |
5854 curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines; | |
5855 size += buf->b_ml.ml_chunksize[curix].mlcs_totalsize; | |
5856 if (offset && ffdos) | |
5857 size += buf->b_ml.ml_chunksize[curix].mlcs_numlines; | |
5858 curix++; | |
5859 } | |
5860 | |
169 | 5861 while ((lnum != 0 && curline < lnum) || (offset != 0 && size < offset)) |
7 | 5862 { |
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5863 #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
|
5864 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
|
5865 #endif |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5866 |
7 | 5867 if (curline > buf->b_ml.ml_line_count |
5868 || (hp = ml_find_line(buf, curline, ML_FIND)) == NULL) | |
5869 return -1; | |
5870 dp = (DATA_BL *)(hp->bh_data); | |
5871 count = (long)(buf->b_ml.ml_locked_high) - | |
5872 (long)(buf->b_ml.ml_locked_low) + 1; | |
5873 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
|
5874 if (idx == 0) // first line in block, text at the end |
7 | 5875 text_end = dp->db_txt_end; |
5876 else | |
5877 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
|
5878 // Compute index of last line to use in this MEMLINE |
169 | 5879 if (lnum != 0) |
7 | 5880 { |
169 | 5881 if (curline + (count - idx) >= lnum) |
5882 idx += lnum - curline - 1; | |
7 | 5883 else |
5884 idx = count - 1; | |
5885 } | |
5886 else | |
5887 { | |
5888 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
|
5889 for (;;) |
7 | 5890 { |
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5891 #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
|
5892 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
|
5893 |
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5894 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
|
5895 { |
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5896 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
|
5897 |
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5898 // 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
|
5899 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
|
5900 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
|
5901 : ((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
|
5902 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
|
5903 } |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5904 #endif |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5905 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
|
5906 + 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
|
5907 #ifdef FEAT_PROP_POPUP |
19133
dc6a0b05b082
patch 8.2.0126: textprop test fails
Bram Moolenaar <Bram@vim.org>
parents:
19129
diff
changeset
|
5908 - (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
|
5909 #endif |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5910 + ffdos)) |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5911 break; |
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5912 |
7 | 5913 if (ffdos) |
5914 size++; | |
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5915 #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
|
5916 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
|
5917 #endif |
7 | 5918 if (idx == count - 1) |
5919 { | |
5920 extra = 1; | |
5921 break; | |
5922 } | |
5923 idx++; | |
5924 } | |
5925 } | |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5926 #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
|
5927 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
|
5928 { |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5929 int i; |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5930 |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5931 // 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
|
5932 // lengths. |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5933 len = 0; |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5934 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
|
5935 { |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5936 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
|
5937 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
|
5938 } |
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5939 } |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5940 else |
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5941 #endif |
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5942 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
|
5943 #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
|
5944 - (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
|
5945 #endif |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5946 ; |
7 | 5947 size += len; |
5948 if (offset != 0 && size >= offset) | |
5949 { | |
5950 if (size + ffdos == offset) | |
5951 *offp = 0; | |
5952 else if (idx == start_idx) | |
5953 *offp = offset - size + len; | |
5954 else | |
5955 *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
|
5956 - (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
|
5957 #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
|
5958 + (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
|
5959 #endif |
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5960 ; |
7 | 5961 curline += idx - start_idx + extra; |
5962 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
|
5963 return -1; // exactly one byte beyond the end |
7 | 5964 return curline; |
5965 } | |
5966 curline = buf->b_ml.ml_locked_high + 1; | |
5967 } | |
5968 | |
169 | 5969 if (lnum != 0) |
20 | 5970 { |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5971 // Count extra CR characters. |
20 | 5972 if (ffdos) |
169 | 5973 size += lnum - 1; |
20 | 5974 |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5975 // 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
|
5976 // 'nofixeol'). |
6933 | 5977 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
|
5978 && lnum > buf->b_ml.ml_line_count) |
20 | 5979 size -= ffdos + 1; |
5980 } | |
5981 | |
7 | 5982 return size; |
5983 } | |
5984 | |
5985 /* | |
5986 * Goto byte in buffer with offset 'cnt'. | |
5987 */ | |
5988 void | |
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5989 goto_byte(long cnt) |
7 | 5990 { |
5991 long boff = cnt; | |
5992 linenr_T lnum; | |
5993 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5994 ml_flush_line(curbuf); // cached line may be dirty |
7 | 5995 setpcmark(); |
5996 if (boff) | |
5997 --boff; | |
5998 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
|
5999 if (lnum < 1) // past the end |
7 | 6000 { |
6001 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
6002 curwin->w_curswant = MAXCOL; | |
6003 coladvance((colnr_T)MAXCOL); | |
6004 } | |
6005 else | |
6006 { | |
6007 curwin->w_cursor.lnum = lnum; | |
6008 curwin->w_cursor.col = (colnr_T)boff; | |
572 | 6009 curwin->w_cursor.coladd = 0; |
7 | 6010 curwin->w_set_curswant = TRUE; |
6011 } | |
6012 check_cursor(); | |
6013 | |
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
6014 // Make sure the cursor is on the first byte of a multi-byte char. |
7 | 6015 if (has_mbyte) |
6016 mb_adjust_cursor(); | |
6017 } | |
6018 #endif |