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