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