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