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