Mercurial > vim
annotate src/memline.c @ 29543:b679513dc17c
Added tag v9.0.0112 for changeset 61b400b5e1a81aa992a50aeefcb5c5ab45a53e9e
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 30 Jul 2022 16:45:04 +0200 |
| parents | fba9e366ced4 |
| children | 23dceecc0bf8 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
10 // for debugging |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
11 // #define CHECK(c, s) do { if (c) emsg((s)); } while (0) |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
12 #define CHECK(c, s) do { /**/ } while (0) |
| 7 | 13 |
| 14 /* | |
| 15 * memline.c: Contains the functions for appending, deleting and changing the | |
| 625 | 16 * text lines. The memfile functions are used to store the information in |
| 17 * blocks of memory, backed up by a file. The structure of the information is | |
| 18 * a tree. The root of the tree is a pointer block. The leaves of the tree | |
| 19 * are data blocks. In between may be several layers of pointer blocks, | |
| 20 * forming branches. | |
| 7 | 21 * |
| 22 * Three types of blocks are used: | |
| 23 * - Block nr 0 contains information for recovery | |
| 24 * - Pointer blocks contain list of pointers to other blocks. | |
| 25 * - Data blocks contain the actual text. | |
| 26 * | |
| 27 * Block nr 0 contains the block0 structure (see below). | |
| 28 * | |
| 29 * Block nr 1 is the first pointer block. It is the root of the tree. | |
| 30 * Other pointer blocks are branches. | |
| 31 * | |
| 32 * If a line is too big to fit in a single page, the block containing that | |
| 33 * line is made big enough to hold the line. It may span several pages. | |
| 34 * Otherwise all blocks are one page. | |
| 35 * | |
| 36 * A data block that was filled when starting to edit a file and was not | |
| 37 * changed since then, can have a negative block number. This means that it | |
| 38 * has not yet been assigned a place in the file. When recovering, the lines | |
| 39 * in this data block can be read from the original file. When the block is | |
| 40 * changed (lines appended/deleted/changed) or when it is flushed it gets a | |
| 41 * positive number. Use mf_trans_del() to get the new number, before calling | |
| 42 * mf_get(). | |
| 43 */ | |
| 44 | |
| 45 #include "vim.h" | |
| 46 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
47 #ifndef UNIX // it's in os_unix.h for Unix |
| 7 | 48 # include <time.h> |
| 49 #endif | |
| 50 | |
| 1030 | 51 #if defined(SASC) || defined(__amigaos4__) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
52 # include <proto/dos.h> // for Open() and Close() |
| 7 | 53 #endif |
| 54 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
55 typedef struct block0 ZERO_BL; // contents of the first block |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
56 typedef struct pointer_block PTR_BL; // contents of a pointer block |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
57 typedef struct data_block DATA_BL; // contents of a data block |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
58 typedef struct pointer_entry PTR_EN; // block/line-count pair |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
59 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
60 #define DATA_ID (('d' << 8) + 'a') // data block id |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
61 #define PTR_ID (('p' << 8) + 't') // pointer block id |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
62 #define BLOCK0_ID0 'b' // block 0 id 0 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
63 #define BLOCK0_ID1 '0' // block 0 id 1 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
64 #define BLOCK0_ID1_C0 'c' // block 0 id 1 'cm' 0 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
65 #define BLOCK0_ID1_C1 'C' // block 0 id 1 'cm' 1 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
66 #define BLOCK0_ID1_C2 'd' // block 0 id 1 'cm' 2 |
|
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
67 #define BLOCK0_ID1_C3 'S' // block 0 id 1 'cm' 3 - but not actually used |
| 6122 | 68 |
| 69 #if defined(FEAT_CRYPT) | |
| 70 static int id1_codes[] = { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
71 BLOCK0_ID1_C0, // CRYPT_M_ZIP |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
72 BLOCK0_ID1_C1, // CRYPT_M_BF |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
73 BLOCK0_ID1_C2, // CRYPT_M_BF2 |
|
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
74 BLOCK0_ID1_C3, // CRYPT_M_SOD - Unused! |
| 6122 | 75 }; |
| 76 #endif | |
| 7 | 77 |
| 78 /* | |
| 79 * pointer to a block, used in a pointer block | |
| 80 */ | |
| 81 struct pointer_entry | |
| 82 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
83 blocknr_T pe_bnum; // block number |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
84 linenr_T pe_line_count; // number of lines in this branch |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
85 linenr_T pe_old_lnum; // lnum for this block (for recovery) |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
86 int pe_page_count; // number of pages in block pe_bnum |
| 7 | 87 }; |
| 88 | |
| 89 /* | |
| 90 * A pointer block contains a list of branches in the tree. | |
| 91 */ | |
| 92 struct pointer_block | |
| 93 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
94 short_u pb_id; // ID for pointer block: PTR_ID |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
95 short_u pb_count; // number of pointers in this block |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
96 short_u pb_count_max; // maximum value for pb_count |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
97 PTR_EN pb_pointer[1]; // list of pointers to blocks (actually longer) |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
98 // followed by empty space until end of page |
| 7 | 99 }; |
| 100 | |
| 101 /* | |
| 102 * A data block is a leaf in the tree. | |
| 103 * | |
| 104 * The text of the lines is at the end of the block. The text of the first line | |
| 105 * in the block is put at the end, the text of the second line in front of it, | |
| 106 * etc. Thus the order of the lines is the opposite of the line number. | |
| 107 */ | |
| 108 struct data_block | |
| 109 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
110 short_u db_id; // ID for data block: DATA_ID |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
111 unsigned db_free; // free space available |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
112 unsigned db_txt_start; // byte where text starts |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
113 unsigned db_txt_end; // byte just after data block |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
114 linenr_T db_line_count; // number of lines in this block |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
115 unsigned db_index[1]; // index for start of line (actually bigger) |
|
19195
2ef19eed524a
patch 8.2.0156: various typos in source files and tests
Bram Moolenaar <Bram@vim.org>
parents:
19133
diff
changeset
|
116 // followed by empty space up to db_txt_start |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
117 // followed by the text in the lines until |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
118 // end of page |
| 7 | 119 }; |
| 120 | |
| 121 /* | |
| 122 * The low bits of db_index hold the actual index. The topmost bit is | |
| 123 * used for the global command to be able to mark a line. | |
| 124 * This method is not clean, but otherwise there would be at least one extra | |
| 125 * byte used for each line. | |
| 126 * The mark has to be in this place to keep it with the correct line when other | |
| 127 * lines are inserted or deleted. | |
| 128 */ | |
| 129 #define DB_MARKED ((unsigned)1 << ((sizeof(unsigned) * 8) - 1)) | |
| 130 #define DB_INDEX_MASK (~DB_MARKED) | |
| 131 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
132 #define INDEX_SIZE (sizeof(unsigned)) // size of one db_index entry |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
133 #define HEADER_SIZE (sizeof(DATA_BL) - INDEX_SIZE) // size of data block header |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
134 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
135 #define B0_FNAME_SIZE_ORG 900 // what it was in older versions |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
136 #define B0_FNAME_SIZE_NOCRYPT 898 // 2 bytes used for other things |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
137 #define B0_FNAME_SIZE_CRYPT 890 // 10 bytes used for other things |
| 39 | 138 #define B0_UNAME_SIZE 40 |
| 139 #define B0_HNAME_SIZE 40 | |
| 7 | 140 /* |
| 141 * Restrict the numbers to 32 bits, otherwise most compilers will complain. | |
| 142 * This won't detect a 64 bit machine that only swaps a byte in the top 32 | |
| 143 * bits, but that is crazy anyway. | |
| 144 */ | |
| 145 #define B0_MAGIC_LONG 0x30313233L | |
| 146 #define B0_MAGIC_INT 0x20212223L | |
| 147 #define B0_MAGIC_SHORT 0x10111213L | |
| 148 #define B0_MAGIC_CHAR 0x55 | |
| 149 | |
| 150 /* | |
| 151 * Block zero holds all info about the swap file. | |
| 152 * | |
| 153 * NOTE: DEFINITION OF BLOCK 0 SHOULD NOT CHANGE! It would make all existing | |
| 154 * swap files unusable! | |
| 155 * | |
| 156 * If size of block0 changes anyway, adjust MIN_SWAP_PAGE_SIZE in vim.h!! | |
| 157 * | |
| 1228 | 158 * This block is built up of single bytes, to make it portable across |
| 7 | 159 * different machines. b0_magic_* is used to check the byte order and size of |
| 160 * variables, because the rest of the swap file is not portable. | |
| 161 */ | |
| 162 struct block0 | |
| 163 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
164 char_u b0_id[2]; // id for block 0: BLOCK0_ID0 and BLOCK0_ID1, |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
165 // BLOCK0_ID1_C0, BLOCK0_ID1_C1, etc. |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
166 char_u b0_version[10]; // Vim version string |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
167 char_u b0_page_size[4];// number of bytes per page |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
168 char_u b0_mtime[4]; // last modification time of file |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
169 char_u b0_ino[4]; // inode of b0_fname |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
170 char_u b0_pid[4]; // process id of creator (or 0) |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
171 char_u b0_uname[B0_UNAME_SIZE]; // name of user (uid if no name) |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
172 char_u b0_hname[B0_HNAME_SIZE]; // host name (if it has a name) |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
173 char_u b0_fname[B0_FNAME_SIZE_ORG]; // name of file being edited |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
174 long b0_magic_long; // check for byte order of long |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
175 int b0_magic_int; // check for byte order of int |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
176 short b0_magic_short; // check for byte order of short |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
177 char_u b0_magic_char; // check for last char |
| 7 | 178 }; |
| 39 | 179 |
| 180 /* | |
| 625 | 181 * Note: b0_dirty and b0_flags are put at the end of the file name. For very |
| 39 | 182 * long file names in older versions of Vim they are invalid. |
| 183 * The 'fileencoding' comes before b0_flags, with a NUL in front. But only | |
| 184 * when there is room, for very long file names it's omitted. | |
| 185 */ | |
| 186 #define B0_DIRTY 0x55 | |
| 2267 | 187 #define b0_dirty b0_fname[B0_FNAME_SIZE_ORG - 1] |
| 39 | 188 |
| 189 /* | |
| 190 * The b0_flags field is new in Vim 7.0. | |
| 191 */ | |
| 2267 | 192 #define b0_flags b0_fname[B0_FNAME_SIZE_ORG - 2] |
| 193 | |
| 194 /* | |
| 195 * Crypt seed goes here, 8 bytes. New in Vim 7.3. | |
| 196 * Without encryption these bytes may be used for 'fenc'. | |
| 197 */ | |
| 198 #define b0_seed b0_fname[B0_FNAME_SIZE_ORG - 2 - MF_SEED_LEN] | |
| 39 | 199 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
200 // The lowest two bits contain the fileformat. Zero means it's not set |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
201 // (compatible with Vim 6.x), otherwise it's EOL_UNIX + 1, EOL_DOS + 1 or |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
202 // EOL_MAC + 1. |
| 39 | 203 #define B0_FF_MASK 3 |
| 204 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
205 // Swap file is in directory of edited file. Used to find the file from |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
206 // different mount points. |
| 39 | 207 #define B0_SAME_DIR 4 |
| 208 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
209 // The 'fileencoding' is at the end of b0_fname[], with a NUL in front of it. |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
210 // When empty there is only the NUL. |
| 39 | 211 #define B0_HAS_FENC 8 |
| 7 | 212 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
213 #define STACK_INCR 5 // nr of entries added to ml_stack at a time |
| 7 | 214 |
| 215 /* | |
| 216 * The line number where the first mark may be is remembered. | |
| 217 * If it is 0 there are no marks at all. | |
| 218 * (always used for the current buffer only, no buffer change possible while | |
| 219 * executing a global command). | |
| 220 */ | |
| 221 static linenr_T lowest_marked = 0; | |
| 222 | |
| 223 /* | |
| 224 * arguments for ml_find_line() | |
| 225 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
226 #define ML_DELETE 0x11 // delete line |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
227 #define ML_INSERT 0x12 // insert line |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
228 #define ML_FIND 0x13 // just find the line |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
229 #define ML_FLUSH 0x02 // flush locked block |
|
27752
c1d1639b52dd
patch 8.2.4402: missing parenthesis may cause unexpected problems
Bram Moolenaar <Bram@vim.org>
parents:
27746
diff
changeset
|
230 #define ML_SIMPLE(x) ((x) & 0x10) // DEL, INS or FIND |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
231 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
232 // argument for ml_upd_block0() |
| 2267 | 233 typedef enum { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
234 UB_FNAME = 0 // update timestamp and filename |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
235 , UB_SAME_DIR // update the B0_SAME_DIR flag |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
236 , UB_CRYPT // update crypt key |
| 2267 | 237 } upd_block0_T; |
| 238 | |
| 239 #ifdef FEAT_CRYPT | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
240 static void ml_set_b0_crypt(buf_T *buf, ZERO_BL *b0p); |
| 2267 | 241 #endif |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
242 static void ml_upd_block0(buf_T *buf, upd_block0_T what); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
243 static void set_b0_fname(ZERO_BL *, buf_T *buf); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
244 static void set_b0_dir_flag(ZERO_BL *b0p, buf_T *buf); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
245 static void add_b0_fenc(ZERO_BL *b0p, buf_T *buf); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
246 static time_t swapfile_info(char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
247 static int recov_file_names(char_u **, char_u *, int prepend_dot); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
248 static char_u *findswapname(buf_T *, char_u **, char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
249 static void ml_flush_line(buf_T *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
250 static bhdr_T *ml_new_data(memfile_T *, int, int); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
251 static bhdr_T *ml_new_ptr(memfile_T *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
252 static bhdr_T *ml_find_line(buf_T *, linenr_T, int); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
253 static int ml_add_stack(buf_T *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
254 static void ml_lineadd(buf_T *, int); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
255 static int b0_magic_wrong(ZERO_BL *); |
| 7 | 256 #ifdef CHECK_INODE |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
257 static int fnamecmp_ino(char_u *, char_u *, long); |
| 7 | 258 #endif |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
259 static void long_to_char(long, char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
260 static long char_to_long(char_u *); |
| 2267 | 261 #ifdef FEAT_CRYPT |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
262 static cryptstate_T *ml_crypt_prepare(memfile_T *mfp, off_T offset, int reading); |
| 2267 | 263 #endif |
| 7 | 264 #ifdef FEAT_BYTEOFF |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7410
diff
changeset
|
265 static void ml_updatechunk(buf_T *buf, long line, long len, int updtype); |
| 7 | 266 #endif |
| 267 | |
| 268 /* | |
| 625 | 269 * Open a new memline for "buf". |
| 7 | 270 * |
| 625 | 271 * Return FAIL for failure, OK otherwise. |
| 7 | 272 */ |
| 273 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
274 ml_open(buf_T *buf) |
| 7 | 275 { |
| 276 memfile_T *mfp; | |
| 277 bhdr_T *hp = NULL; | |
| 278 ZERO_BL *b0p; | |
| 279 PTR_BL *pp; | |
| 280 DATA_BL *dp; | |
| 281 | |
| 625 | 282 /* |
| 283 * init fields in memline struct | |
| 284 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
285 buf->b_ml.ml_stack_size = 0; // no stack yet |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
286 buf->b_ml.ml_stack = NULL; // no stack yet |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
287 buf->b_ml.ml_stack_top = 0; // nothing in the stack |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
288 buf->b_ml.ml_locked = NULL; // no cached block |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
289 buf->b_ml.ml_line_lnum = 0; // no cached line |
| 7 | 290 #ifdef FEAT_BYTEOFF |
| 625 | 291 buf->b_ml.ml_chunksize = NULL; |
|
25678
4da50e168dc9
patch 8.2.3375: using uninitialized memory
Bram Moolenaar <Bram@vim.org>
parents:
25672
diff
changeset
|
292 buf->b_ml.ml_usedchunks = 0; |
| 7 | 293 #endif |
| 294 | |
|
22699
e82579016863
patch 8.2.1898: command modifier parsing always uses global cmdmod
Bram Moolenaar <Bram@vim.org>
parents:
22242
diff
changeset
|
295 if (cmdmod.cmod_flags & CMOD_NOSWAPFILE) |
| 5737 | 296 buf->b_p_swf = FALSE; |
| 297 | |
| 625 | 298 /* |
| 299 * When 'updatecount' is non-zero swap file may be opened later. | |
| 300 */ | |
| 301 if (p_uc && buf->b_p_swf) | |
| 302 buf->b_may_swap = TRUE; | |
| 7 | 303 else |
| 625 | 304 buf->b_may_swap = FALSE; |
| 305 | |
| 306 /* | |
| 307 * Open the memfile. No swap file is created yet. | |
| 308 */ | |
| 7 | 309 mfp = mf_open(NULL, 0); |
| 310 if (mfp == NULL) | |
| 311 goto error; | |
| 312 | |
| 625 | 313 buf->b_ml.ml_mfp = mfp; |
| 2267 | 314 #ifdef FEAT_CRYPT |
| 315 mfp->mf_buffer = buf; | |
| 316 #endif | |
| 625 | 317 buf->b_ml.ml_flags = ML_EMPTY; |
| 318 buf->b_ml.ml_line_count = 1; | |
| 13 | 319 #ifdef FEAT_LINEBREAK |
| 320 curwin->w_nrwidth_line_count = 0; | |
| 321 #endif | |
| 7 | 322 |
| 323 /* | |
| 324 * fill block0 struct and write page 0 | |
| 325 */ | |
| 326 if ((hp = mf_new(mfp, FALSE, 1)) == NULL) | |
| 327 goto error; | |
| 328 if (hp->bh_bnum != 0) | |
| 329 { | |
|
26897
d02d40f0261c
patch 8.2.3977: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
330 iemsg(_(e_didnt_get_block_nr_zero)); |
| 7 | 331 goto error; |
| 332 } | |
| 333 b0p = (ZERO_BL *)(hp->bh_data); | |
| 334 | |
| 335 b0p->b0_id[0] = BLOCK0_ID0; | |
| 336 b0p->b0_id[1] = BLOCK0_ID1; | |
| 337 b0p->b0_magic_long = (long)B0_MAGIC_LONG; | |
| 338 b0p->b0_magic_int = (int)B0_MAGIC_INT; | |
| 339 b0p->b0_magic_short = (short)B0_MAGIC_SHORT; | |
| 340 b0p->b0_magic_char = B0_MAGIC_CHAR; | |
|
14011
8631b54ae2a2
patch 8.1.0023: gcc 8.1 warns for use of strncpy()
Christian Brabandt <cb@256bit.org>
parents:
13896
diff
changeset
|
341 mch_memmove(b0p->b0_version, "VIM ", 4); |
| 7 | 342 STRNCPY(b0p->b0_version + 4, Version, 6); |
| 343 long_to_char((long)mfp->mf_page_size, b0p->b0_page_size); | |
| 625 | 344 |
| 800 | 345 #ifdef FEAT_SPELL |
| 346 if (!buf->b_spell) | |
| 347 #endif | |
| 625 | 348 { |
| 349 b0p->b0_dirty = buf->b_changed ? B0_DIRTY : 0; | |
| 350 b0p->b0_flags = get_fileformat(buf) + 1; | |
| 351 set_b0_fname(b0p, buf); | |
| 352 (void)get_user_name(b0p->b0_uname, B0_UNAME_SIZE); | |
| 353 b0p->b0_uname[B0_UNAME_SIZE - 1] = NUL; | |
| 354 mch_get_host_name(b0p->b0_hname, B0_HNAME_SIZE); | |
| 355 b0p->b0_hname[B0_HNAME_SIZE - 1] = NUL; | |
| 356 long_to_char(mch_get_pid(), b0p->b0_pid); | |
| 2267 | 357 #ifdef FEAT_CRYPT |
| 6122 | 358 ml_set_b0_crypt(buf, b0p); |
| 2267 | 359 #endif |
| 625 | 360 } |
| 7 | 361 |
| 362 /* | |
| 363 * Always sync block number 0 to disk, so we can check the file name in | |
| 2267 | 364 * the swap file in findswapname(). Don't do this for a help files or |
| 365 * a spell buffer though. | |
| 7 | 366 * Only works when there's a swapfile, otherwise it's done when the file |
| 367 * is created. | |
| 368 */ | |
| 369 mf_put(mfp, hp, TRUE, FALSE); | |
| 625 | 370 if (!buf->b_help && !B_SPELL(buf)) |
| 7 | 371 (void)mf_sync(mfp, 0); |
| 372 | |
| 625 | 373 /* |
| 374 * Fill in root pointer block and write page 1. | |
| 375 */ | |
| 7 | 376 if ((hp = ml_new_ptr(mfp)) == NULL) |
| 377 goto error; | |
| 378 if (hp->bh_bnum != 1) | |
| 379 { | |
|
26897
d02d40f0261c
patch 8.2.3977: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
380 iemsg(_(e_didnt_get_block_nr_one)); |
| 7 | 381 goto error; |
| 382 } | |
| 383 pp = (PTR_BL *)(hp->bh_data); | |
| 384 pp->pb_count = 1; | |
| 385 pp->pb_pointer[0].pe_bnum = 2; | |
| 386 pp->pb_pointer[0].pe_page_count = 1; | |
| 387 pp->pb_pointer[0].pe_old_lnum = 1; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
388 pp->pb_pointer[0].pe_line_count = 1; // line count after insertion |
| 7 | 389 mf_put(mfp, hp, TRUE, FALSE); |
| 390 | |
| 625 | 391 /* |
| 392 * Allocate first data block and create an empty line 1. | |
| 393 */ | |
| 7 | 394 if ((hp = ml_new_data(mfp, FALSE, 1)) == NULL) |
| 395 goto error; | |
| 396 if (hp->bh_bnum != 2) | |
| 397 { | |
|
26897
d02d40f0261c
patch 8.2.3977: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
398 iemsg(_(e_didnt_get_block_nr_two)); |
| 7 | 399 goto error; |
| 400 } | |
| 401 | |
| 402 dp = (DATA_BL *)(hp->bh_data); | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
403 dp->db_index[0] = --dp->db_txt_start; // at end of block |
| 7 | 404 dp->db_free -= 1 + INDEX_SIZE; |
| 405 dp->db_line_count = 1; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
406 *((char_u *)dp + dp->db_txt_start) = NUL; // empty line |
| 7 | 407 |
| 408 return OK; | |
| 409 | |
| 410 error: | |
| 411 if (mfp != NULL) | |
| 412 { | |
| 413 if (hp) | |
| 414 mf_put(mfp, hp, FALSE, FALSE); | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
415 mf_close(mfp, TRUE); // will also free(mfp->mf_fname) |
| 7 | 416 } |
| 625 | 417 buf->b_ml.ml_mfp = NULL; |
| 7 | 418 return FAIL; |
| 419 } | |
| 420 | |
| 2267 | 421 #if defined(FEAT_CRYPT) || defined(PROTO) |
| 422 /* | |
| 6130 | 423 * Prepare encryption for "buf" for the current key and method. |
| 424 */ | |
| 425 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
426 ml_set_mfp_crypt(buf_T *buf) |
| 6130 | 427 { |
| 428 if (*buf->b_p_key != NUL) | |
| 429 { | |
| 430 int method_nr = crypt_get_method_nr(buf); | |
| 431 | |
|
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
432 if (method_nr > CRYPT_M_ZIP && method_nr < CRYPT_M_SOD) |
| 6130 | 433 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
434 // Generate a seed and store it in the memfile. |
| 6130 | 435 sha2_seed(buf->b_ml.ml_mfp->mf_seed, MF_SEED_LEN, NULL, 0); |
| 436 } | |
|
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
437 #ifdef FEAT_SODIUM |
|
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
438 else if (method_nr == CRYPT_M_SOD) |
|
27231
e1cedf009920
patch 8.2.4144: cannot load libsodium dynamically
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
439 crypt_sodium_randombytes_buf(buf->b_ml.ml_mfp->mf_seed, |
|
e1cedf009920
patch 8.2.4144: cannot load libsodium dynamically
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
440 MF_SEED_LEN); |
|
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
441 #endif |
| 6130 | 442 } |
| 443 } | |
| 444 | |
| 445 /* | |
| 2267 | 446 * Prepare encryption for "buf" with block 0 "b0p". |
| 447 */ | |
| 448 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
449 ml_set_b0_crypt(buf_T *buf, ZERO_BL *b0p) |
| 2267 | 450 { |
| 451 if (*buf->b_p_key == NUL) | |
| 452 b0p->b0_id[1] = BLOCK0_ID1; | |
| 453 else | |
| 454 { | |
| 6122 | 455 int method_nr = crypt_get_method_nr(buf); |
| 456 | |
| 457 b0p->b0_id[1] = id1_codes[method_nr]; | |
|
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
458 if (method_nr > CRYPT_M_ZIP && method_nr < CRYPT_M_SOD) |
| 2267 | 459 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
460 // Generate a seed and store it in block 0 and in the memfile. |
| 2267 | 461 sha2_seed(&b0p->b0_seed, MF_SEED_LEN, NULL, 0); |
| 462 mch_memmove(buf->b_ml.ml_mfp->mf_seed, &b0p->b0_seed, MF_SEED_LEN); | |
| 463 } | |
| 464 } | |
| 465 } | |
| 466 | |
| 467 /* | |
| 468 * Called after the crypt key or 'cryptmethod' was changed for "buf". | |
| 469 * Will apply this to the swapfile. | |
| 470 * "old_key" is the previous key. It is equal to buf->b_p_key when | |
| 471 * 'cryptmethod' is changed. | |
|
2360
d8e4b27cef80
Change 'cryptmethod' from a number to a string option. Make it global-local.
Bram Moolenaar <bram@vim.org>
parents:
2283
diff
changeset
|
472 * "old_cm" is the previous 'cryptmethod'. It is equal to the current |
|
d8e4b27cef80
Change 'cryptmethod' from a number to a string option. Make it global-local.
Bram Moolenaar <bram@vim.org>
parents:
2283
diff
changeset
|
473 * 'cryptmethod' when 'key' is changed. |
| 2267 | 474 */ |
| 475 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
476 ml_set_crypt_key( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
477 buf_T *buf, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
478 char_u *old_key, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
479 char_u *old_cm) |
| 2267 | 480 { |
| 481 memfile_T *mfp = buf->b_ml.ml_mfp; | |
| 482 bhdr_T *hp; | |
| 483 int page_count; | |
| 484 int idx; | |
| 485 long error; | |
| 486 infoptr_T *ip; | |
| 487 PTR_BL *pp; | |
| 488 DATA_BL *dp; | |
| 489 blocknr_T bnum; | |
| 490 int top; | |
| 6817 | 491 int old_method; |
| 2267 | 492 |
|
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
493 if (mfp == NULL || mfp->mf_fd < 0) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
494 return; // no memfile yet, nothing to do |
| 6817 | 495 old_method = crypt_method_nr_from_name(old_cm); |
| 496 | |
|
24990
85d1e82ed134
patch 8.2.3032: build problems with MSVC, other crypt issues with libsodium
Bram Moolenaar <Bram@vim.org>
parents:
24970
diff
changeset
|
497 // Swapfile encryption not supported by XChaCha20 |
|
85d1e82ed134
patch 8.2.3032: build problems with MSVC, other crypt issues with libsodium
Bram Moolenaar <Bram@vim.org>
parents:
24970
diff
changeset
|
498 if (crypt_get_method_nr(buf) == CRYPT_M_SOD && *buf->b_p_key != NUL) |
|
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
499 { |
|
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
500 // close the swapfile |
|
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
501 mf_close_file(buf, TRUE); |
|
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
502 buf->b_p_swf = FALSE; |
|
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
503 return; |
|
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
504 } |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
505 // First make sure the swapfile is in a consistent state, using the old |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
506 // key and method. |
| 6817 | 507 { |
| 508 char_u *new_key = buf->b_p_key; | |
| 509 char_u *new_buf_cm = buf->b_p_cm; | |
| 510 | |
| 511 buf->b_p_key = old_key; | |
| 512 buf->b_p_cm = old_cm; | |
| 513 ml_preserve(buf, FALSE); | |
| 514 buf->b_p_key = new_key; | |
| 515 buf->b_p_cm = new_buf_cm; | |
| 516 } | |
| 2267 | 517 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
518 // Set the key, method and seed to be used for reading, these must be the |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
519 // old values. |
| 2267 | 520 mfp->mf_old_key = old_key; |
| 6817 | 521 mfp->mf_old_cm = old_method; |
| 522 if (old_method > 0 && *old_key != NUL) | |
| 2267 | 523 mch_memmove(mfp->mf_old_seed, mfp->mf_seed, MF_SEED_LEN); |
| 524 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
525 // Update block 0 with the crypt flag and may set a new seed. |
| 2267 | 526 ml_upd_block0(buf, UB_CRYPT); |
| 527 | |
| 528 if (mfp->mf_infile_count > 2) | |
| 529 { | |
| 530 /* | |
| 531 * Need to read back all data blocks from disk, decrypt them with the | |
| 532 * old key/method and mark them to be written. The algorithm is | |
| 533 * similar to what happens in ml_recover(), but we skip negative block | |
| 534 * numbers. | |
| 535 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
536 ml_flush_line(buf); // flush buffered line |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
537 (void)ml_find_line(buf, (linenr_T)0, ML_FLUSH); // flush locked block |
| 2267 | 538 |
| 539 hp = NULL; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
540 bnum = 1; // start with block 1 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
541 page_count = 1; // which is 1 page |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
542 idx = 0; // start with first index in block 1 |
| 2267 | 543 error = 0; |
| 544 buf->b_ml.ml_stack_top = 0; | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12975
diff
changeset
|
545 VIM_CLEAR(buf->b_ml.ml_stack); |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
546 buf->b_ml.ml_stack_size = 0; // no stack yet |
| 2267 | 547 |
| 548 for ( ; !got_int; line_breakcheck()) | |
| 549 { | |
| 550 if (hp != NULL) | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
551 mf_put(mfp, hp, FALSE, FALSE); // release previous block |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
552 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
553 // get the block (pointer or data) |
|
27426
41e0dcf38521
patch 8.2.4241: some type casts are redundant
Bram Moolenaar <Bram@vim.org>
parents:
27231
diff
changeset
|
554 if ((hp = mf_get(mfp, bnum, page_count)) == NULL) |
| 2267 | 555 { |
| 556 if (bnum == 1) | |
| 557 break; | |
| 558 ++error; | |
| 559 } | |
| 560 else | |
| 561 { | |
| 562 pp = (PTR_BL *)(hp->bh_data); | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
563 if (pp->pb_id == PTR_ID) // it is a pointer block |
| 2267 | 564 { |
| 565 if (pp->pb_count == 0) | |
| 566 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
567 // empty block? |
| 2267 | 568 ++error; |
| 569 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
570 else if (idx < (int)pp->pb_count) // go a block deeper |
| 2267 | 571 { |
| 572 if (pp->pb_pointer[idx].pe_bnum < 0) | |
| 573 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
574 // Skip data block with negative block number. |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
575 // Should not happen, because of the ml_preserve() |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
576 // above. Get same block again for next index. |
|
15353
21580db06cf3
patch 8.1.0684: warnings from 64-bit compiler
Bram Moolenaar <Bram@vim.org>
parents:
15294
diff
changeset
|
577 ++idx; |
| 2267 | 578 continue; |
| 579 } | |
| 580 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
581 // going one block deeper in the tree, new entry in |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
582 // stack |
| 2267 | 583 if ((top = ml_add_stack(buf)) < 0) |
| 584 { | |
| 585 ++error; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
586 break; // out of memory |
| 2267 | 587 } |
| 588 ip = &(buf->b_ml.ml_stack[top]); | |
| 589 ip->ip_bnum = bnum; | |
| 590 ip->ip_index = idx; | |
| 591 | |
| 592 bnum = pp->pb_pointer[idx].pe_bnum; | |
| 593 page_count = pp->pb_pointer[idx].pe_page_count; | |
| 6817 | 594 idx = 0; |
| 2267 | 595 continue; |
| 596 } | |
| 597 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
598 else // not a pointer block |
| 2267 | 599 { |
| 600 dp = (DATA_BL *)(hp->bh_data); | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
601 if (dp->db_id != DATA_ID) // block id wrong |
| 2267 | 602 ++error; |
| 603 else | |
| 604 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
605 // It is a data block, need to write it back to disk. |
| 2267 | 606 mf_put(mfp, hp, TRUE, FALSE); |
| 607 hp = NULL; | |
| 608 } | |
| 609 } | |
| 610 } | |
| 611 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
612 if (buf->b_ml.ml_stack_top == 0) // finished |
| 2267 | 613 break; |
| 614 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
615 // go one block up in the tree |
| 2267 | 616 ip = &(buf->b_ml.ml_stack[--(buf->b_ml.ml_stack_top)]); |
| 617 bnum = ip->ip_bnum; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
618 idx = ip->ip_index + 1; // go to next index |
| 2267 | 619 page_count = 1; |
| 620 } | |
| 6817 | 621 if (hp != NULL) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
622 mf_put(mfp, hp, FALSE, FALSE); // release previous block |
| 2657 | 623 |
| 624 if (error > 0) | |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
625 emsg(_(e_error_while_updating_swap_file_crypt)); |
| 2267 | 626 } |
| 627 | |
| 628 mfp->mf_old_key = NULL; | |
| 629 } | |
| 630 #endif | |
| 631 | |
| 7 | 632 /* |
| 633 * ml_setname() is called when the file name of "buf" has been changed. | |
| 634 * It may rename the swap file. | |
| 635 */ | |
| 636 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
637 ml_setname(buf_T *buf) |
| 7 | 638 { |
| 639 int success = FALSE; | |
| 640 memfile_T *mfp; | |
| 641 char_u *fname; | |
| 642 char_u *dirp; | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
643 #if defined(MSWIN) |
| 7 | 644 char_u *p; |
| 645 #endif | |
| 646 | |
| 647 mfp = buf->b_ml.ml_mfp; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
648 if (mfp->mf_fd < 0) // there is no swap file yet |
| 7 | 649 { |
| 650 /* | |
| 651 * When 'updatecount' is 0 and 'noswapfile' there is no swap file. | |
| 652 * For help files we will make a swap file now. | |
| 653 */ | |
|
22699
e82579016863
patch 8.2.1898: command modifier parsing always uses global cmdmod
Bram Moolenaar <Bram@vim.org>
parents:
22242
diff
changeset
|
654 if (p_uc != 0 && (cmdmod.cmod_flags & CMOD_NOSWAPFILE) == 0) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
655 ml_open_file(buf); // create a swap file |
| 7 | 656 return; |
| 657 } | |
| 658 | |
| 659 /* | |
| 660 * Try all directories in the 'directory' option. | |
| 661 */ | |
| 662 dirp = p_dir; | |
| 663 for (;;) | |
| 664 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
665 if (*dirp == NUL) // tried all directories, fail |
| 7 | 666 break; |
| 43 | 667 fname = findswapname(buf, &dirp, mfp->mf_fname); |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
668 // alloc's fname |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
669 if (dirp == NULL) // out of memory |
| 3158 | 670 break; |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
671 if (fname == NULL) // no file name found for this dir |
| 7 | 672 continue; |
| 673 | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
674 #if defined(MSWIN) |
| 7 | 675 /* |
| 676 * Set full pathname for swap file now, because a ":!cd dir" may | |
| 677 * change directory without us knowing it. | |
| 678 */ | |
| 679 p = FullName_save(fname, FALSE); | |
| 680 vim_free(fname); | |
| 681 fname = p; | |
| 682 if (fname == NULL) | |
| 683 continue; | |
| 684 #endif | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
685 // if the file name is the same we don't have to do anything |
| 7 | 686 if (fnamecmp(fname, mfp->mf_fname) == 0) |
| 687 { | |
| 688 vim_free(fname); | |
| 689 success = TRUE; | |
| 690 break; | |
| 691 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
692 // need to close the swap file before renaming |
| 7 | 693 if (mfp->mf_fd >= 0) |
| 694 { | |
| 695 close(mfp->mf_fd); | |
| 696 mfp->mf_fd = -1; | |
| 697 } | |
| 698 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
699 // try to rename the swap file |
| 7 | 700 if (vim_rename(mfp->mf_fname, fname) == 0) |
| 701 { | |
| 702 success = TRUE; | |
| 703 vim_free(mfp->mf_fname); | |
| 704 mfp->mf_fname = fname; | |
| 705 vim_free(mfp->mf_ffname); | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
706 #if defined(MSWIN) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
707 mfp->mf_ffname = NULL; // mf_fname is full pathname already |
| 7 | 708 #else |
| 709 mf_set_ffname(mfp); | |
| 710 #endif | |
| 2267 | 711 ml_upd_block0(buf, UB_SAME_DIR); |
| 7 | 712 break; |
| 713 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
714 vim_free(fname); // this fname didn't work, try another |
| 7 | 715 } |
| 716 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
717 if (mfp->mf_fd == -1) // need to (re)open the swap file |
| 7 | 718 { |
| 719 mfp->mf_fd = mch_open((char *)mfp->mf_fname, O_RDWR | O_EXTRA, 0); | |
| 720 if (mfp->mf_fd < 0) | |
| 721 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
722 // could not (re)open the swap file, what can we do???? |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
723 emsg(_(e_oops_lost_the_swap_file)); |
| 7 | 724 return; |
| 725 } | |
| 2003 | 726 #ifdef HAVE_FD_CLOEXEC |
| 727 { | |
| 728 int fdflags = fcntl(mfp->mf_fd, F_GETFD); | |
| 729 if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) | |
|
7961
a7e58c6e4e9a
commit https://github.com/vim/vim/commit/fbc4b4db3a9690906a96e16724350a6241cf32a5
Christian Brabandt <cb@256bit.org>
parents:
7881
diff
changeset
|
730 (void)fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC); |
| 2003 | 731 } |
| 732 #endif | |
| 7 | 733 } |
| 734 if (!success) | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
735 emsg(_(e_could_not_rename_swap_file)); |
| 7 | 736 } |
| 737 | |
| 738 /* | |
| 739 * Open a file for the memfile for all buffers that are not readonly or have | |
| 740 * been modified. | |
| 741 * Used when 'updatecount' changes from zero to non-zero. | |
| 742 */ | |
| 743 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
744 ml_open_files(void) |
| 7 | 745 { |
| 746 buf_T *buf; | |
| 747 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
748 FOR_ALL_BUFFERS(buf) |
| 7 | 749 if (!buf->b_p_ro || buf->b_changed) |
| 750 ml_open_file(buf); | |
| 751 } | |
| 752 | |
| 753 /* | |
| 754 * Open a swap file for an existing memfile, if there is no swap file yet. | |
| 755 * If we are unable to find a file name, mf_fname will be NULL | |
| 756 * and the memfile will be in memory only (no recovery possible). | |
| 757 */ | |
| 758 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
759 ml_open_file(buf_T *buf) |
| 7 | 760 { |
| 761 memfile_T *mfp; | |
| 762 char_u *fname; | |
| 763 char_u *dirp; | |
| 764 | |
| 765 mfp = buf->b_ml.ml_mfp; | |
|
22699
e82579016863
patch 8.2.1898: command modifier parsing always uses global cmdmod
Bram Moolenaar <Bram@vim.org>
parents:
22242
diff
changeset
|
766 if (mfp == NULL || mfp->mf_fd >= 0 || !buf->b_p_swf |
|
e82579016863
patch 8.2.1898: command modifier parsing always uses global cmdmod
Bram Moolenaar <Bram@vim.org>
parents:
22242
diff
changeset
|
767 || (cmdmod.cmod_flags & CMOD_NOSWAPFILE)) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
768 return; // nothing to do |
| 7 | 769 |
| 748 | 770 #ifdef FEAT_SPELL |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
771 // For a spell buffer use a temp file name. |
| 625 | 772 if (buf->b_spell) |
| 773 { | |
| 6721 | 774 fname = vim_tempname('s', FALSE); |
| 625 | 775 if (fname != NULL) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
776 (void)mf_open_file(mfp, fname); // consumes fname! |
| 625 | 777 buf->b_may_swap = FALSE; |
| 778 return; | |
| 779 } | |
| 780 #endif | |
| 781 | |
| 7 | 782 /* |
| 783 * Try all directories in 'directory' option. | |
| 784 */ | |
| 785 dirp = p_dir; | |
| 786 for (;;) | |
| 787 { | |
| 788 if (*dirp == NUL) | |
| 789 break; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
790 // There is a small chance that between choosing the swap file name |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
791 // and creating it, another Vim creates the file. In that case the |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
792 // creation will fail and we will use another directory. |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
793 fname = findswapname(buf, &dirp, NULL); // allocates fname |
| 3158 | 794 if (dirp == NULL) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
795 break; // out of memory |
| 7 | 796 if (fname == NULL) |
| 797 continue; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
798 if (mf_open_file(mfp, fname) == OK) // consumes fname! |
| 7 | 799 { |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
800 #if defined(MSWIN) |
| 7 | 801 /* |
| 802 * set full pathname for swap file now, because a ":!cd dir" may | |
| 803 * change directory without us knowing it. | |
| 804 */ | |
| 805 mf_fullname(mfp); | |
| 806 #endif | |
| 2267 | 807 ml_upd_block0(buf, UB_SAME_DIR); |
| 39 | 808 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
809 // Flush block zero, so others can read it |
| 7 | 810 if (mf_sync(mfp, MFS_ZERO) == OK) |
| 630 | 811 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
812 // Mark all blocks that should be in the swapfile as dirty. |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
813 // Needed for when the 'swapfile' option was reset, so that |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
814 // the swap file was deleted, and then on again. |
| 630 | 815 mf_set_dirty(mfp); |
| 7 | 816 break; |
| 630 | 817 } |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
818 // Writing block 0 failed: close the file and try another dir |
| 7 | 819 mf_close_file(buf, FALSE); |
| 820 } | |
| 821 } | |
| 822 | |
|
18372
11394af51615
patch 8.1.2180: Error E303 is not useful when 'directory' is empty
Bram Moolenaar <Bram@vim.org>
parents:
18139
diff
changeset
|
823 if (*p_dir != NUL && mfp->mf_fname == NULL) |
| 7 | 824 { |
|
18372
11394af51615
patch 8.1.2180: Error E303 is not useful when 'directory' is empty
Bram Moolenaar <Bram@vim.org>
parents:
18139
diff
changeset
|
825 need_wait_return = TRUE; // call wait_return later |
| 7 | 826 ++no_wait_return; |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
827 (void)semsg(_(e_unable_to_open_swap_file_for_str_recovery_impossible), |
| 3839 | 828 buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname); |
| 7 | 829 --no_wait_return; |
| 830 } | |
| 831 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
832 // don't try to open a swap file again |
| 7 | 833 buf->b_may_swap = FALSE; |
| 834 } | |
| 835 | |
| 836 /* | |
| 837 * If still need to create a swap file, and starting to edit a not-readonly | |
| 838 * file, or reading into an existing buffer, create a swap file now. | |
| 839 */ | |
| 840 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
841 check_need_swap( |
|
14593
b6b2f7d69c7f
patch 8.1.0310: file info msg not always suppressed with 'F' in 'shortmess'
Christian Brabandt <cb@256bit.org>
parents:
14579
diff
changeset
|
842 int newfile) // reading file into new buffer |
| 7 | 843 { |
|
14593
b6b2f7d69c7f
patch 8.1.0310: file info msg not always suppressed with 'F' in 'shortmess'
Christian Brabandt <cb@256bit.org>
parents:
14579
diff
changeset
|
844 int old_msg_silent = msg_silent; // might be reset by an E325 message |
|
b6b2f7d69c7f
patch 8.1.0310: file info msg not always suppressed with 'F' in 'shortmess'
Christian Brabandt <cb@256bit.org>
parents:
14579
diff
changeset
|
845 |
| 7 | 846 if (curbuf->b_may_swap && (!curbuf->b_p_ro || !newfile)) |
| 847 ml_open_file(curbuf); | |
|
14593
b6b2f7d69c7f
patch 8.1.0310: file info msg not always suppressed with 'F' in 'shortmess'
Christian Brabandt <cb@256bit.org>
parents:
14579
diff
changeset
|
848 msg_silent = old_msg_silent; |
| 7 | 849 } |
| 850 | |
| 851 /* | |
| 852 * Close memline for buffer 'buf'. | |
| 853 * If 'del_file' is TRUE, delete the swap file | |
| 854 */ | |
| 855 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
856 ml_close(buf_T *buf, int del_file) |
| 7 | 857 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
858 if (buf->b_ml.ml_mfp == NULL) // not open |
| 7 | 859 return; |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
860 mf_close(buf->b_ml.ml_mfp, del_file); // close the .swp file |
|
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
861 if (buf->b_ml.ml_line_lnum != 0 |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
862 && (buf->b_ml.ml_flags & (ML_LINE_DIRTY | ML_ALLOCATED))) |
| 7 | 863 vim_free(buf->b_ml.ml_line_ptr); |
| 864 vim_free(buf->b_ml.ml_stack); | |
| 865 #ifdef FEAT_BYTEOFF | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12975
diff
changeset
|
866 VIM_CLEAR(buf->b_ml.ml_chunksize); |
| 7 | 867 #endif |
| 868 buf->b_ml.ml_mfp = NULL; | |
| 869 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
870 // Reset the "recovered" flag, give the ATTENTION prompt the next time |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
871 // this buffer is loaded. |
| 7 | 872 buf->b_flags &= ~BF_RECOVERED; |
| 873 } | |
| 874 | |
| 875 /* | |
| 876 * Close all existing memlines and memfiles. | |
| 877 * Only used when exiting. | |
| 878 * When 'del_file' is TRUE, delete the memfiles. | |
| 165 | 879 * But don't delete files that were ":preserve"d when we are POSIX compatible. |
| 7 | 880 */ |
| 881 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
882 ml_close_all(int del_file) |
| 7 | 883 { |
| 884 buf_T *buf; | |
| 885 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
886 FOR_ALL_BUFFERS(buf) |
| 165 | 887 ml_close(buf, del_file && ((buf->b_flags & BF_PRESERVED) == 0 |
| 888 || vim_strchr(p_cpo, CPO_PRESERVE) == NULL)); | |
| 5519 | 889 #ifdef FEAT_SPELL |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
890 spell_delete_wordlist(); // delete the internal wordlist |
| 5519 | 891 #endif |
| 7 | 892 #ifdef TEMPDIRNAMES |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
893 vim_deltempdir(); // delete created temp directory |
| 7 | 894 #endif |
| 895 } | |
| 896 | |
| 897 /* | |
| 898 * Close all memfiles for not modified buffers. | |
| 899 * Only use just before exiting! | |
| 900 */ | |
| 901 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
902 ml_close_notmod(void) |
| 7 | 903 { |
| 904 buf_T *buf; | |
| 905 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
906 FOR_ALL_BUFFERS(buf) |
| 7 | 907 if (!bufIsChanged(buf)) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
908 ml_close(buf, TRUE); // close all not-modified buffers |
| 7 | 909 } |
| 910 | |
| 911 /* | |
| 912 * Update the timestamp in the .swp file. | |
| 913 * Used when the file has been written. | |
| 914 */ | |
| 915 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
916 ml_timestamp(buf_T *buf) |
| 7 | 917 { |
| 2267 | 918 ml_upd_block0(buf, UB_FNAME); |
| 919 } | |
| 920 | |
| 921 /* | |
| 922 * Return FAIL when the ID of "b0p" is wrong. | |
| 923 */ | |
| 924 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
925 ml_check_b0_id(ZERO_BL *b0p) |
| 2267 | 926 { |
| 927 if (b0p->b0_id[0] != BLOCK0_ID0 | |
| 928 || (b0p->b0_id[1] != BLOCK0_ID1 | |
| 929 && b0p->b0_id[1] != BLOCK0_ID1_C0 | |
| 6122 | 930 && b0p->b0_id[1] != BLOCK0_ID1_C1 |
|
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
931 && b0p->b0_id[1] != BLOCK0_ID1_C2 |
|
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
932 && b0p->b0_id[1] != BLOCK0_ID1_C3) |
| 2267 | 933 ) |
| 934 return FAIL; | |
| 935 return OK; | |
| 39 | 936 } |
| 937 | |
| 938 /* | |
| 939 * Update the timestamp or the B0_SAME_DIR flag of the .swp file. | |
| 940 */ | |
| 941 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
942 ml_upd_block0(buf_T *buf, upd_block0_T what) |
| 39 | 943 { |
| 7 | 944 memfile_T *mfp; |
| 945 bhdr_T *hp; | |
| 946 ZERO_BL *b0p; | |
| 947 | |
| 948 mfp = buf->b_ml.ml_mfp; | |
| 6130 | 949 if (mfp == NULL) |
| 7 | 950 return; |
| 6130 | 951 hp = mf_get(mfp, (blocknr_T)0, 1); |
| 952 if (hp == NULL) | |
| 953 { | |
| 954 #ifdef FEAT_CRYPT | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
955 // Possibly update the seed in the memfile before there is a block0. |
| 6130 | 956 if (what == UB_CRYPT) |
| 957 ml_set_mfp_crypt(buf); | |
| 958 #endif | |
| 959 return; | |
| 960 } | |
| 961 | |
| 7 | 962 b0p = (ZERO_BL *)(hp->bh_data); |
| 2267 | 963 if (ml_check_b0_id(b0p) == FAIL) |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
964 iemsg(_(e_ml_upd_block0_didnt_get_block_zero)); |
| 7 | 965 else |
| 39 | 966 { |
| 2267 | 967 if (what == UB_FNAME) |
| 39 | 968 set_b0_fname(b0p, buf); |
| 2267 | 969 #ifdef FEAT_CRYPT |
| 970 else if (what == UB_CRYPT) | |
| 971 ml_set_b0_crypt(buf, b0p); | |
| 972 #endif | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
973 else // what == UB_SAME_DIR |
| 39 | 974 set_b0_dir_flag(b0p, buf); |
| 975 } | |
| 7 | 976 mf_put(mfp, hp, TRUE, FALSE); |
| 977 } | |
| 978 | |
| 979 /* | |
| 980 * Write file name and timestamp into block 0 of a swap file. | |
| 981 * Also set buf->b_mtime. | |
| 982 * Don't use NameBuff[]!!! | |
| 983 */ | |
| 984 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
985 set_b0_fname(ZERO_BL *b0p, buf_T *buf) |
| 7 | 986 { |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
987 stat_T st; |
| 7 | 988 |
| 989 if (buf->b_ffname == NULL) | |
| 990 b0p->b0_fname[0] = NUL; | |
| 991 else | |
| 992 { | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
993 #if defined(MSWIN) || defined(AMIGA) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
994 // Systems that cannot translate "~user" back into a path: copy the |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
995 // file name unmodified. Do use slashes instead of backslashes for |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
996 // portability. |
| 2267 | 997 vim_strncpy(b0p->b0_fname, buf->b_ffname, B0_FNAME_SIZE_CRYPT - 1); |
| 39 | 998 # ifdef BACKSLASH_IN_FILENAME |
| 999 forward_slash(b0p->b0_fname); | |
| 1000 # endif | |
| 7 | 1001 #else |
| 1002 size_t flen, ulen; | |
| 1003 char_u uname[B0_UNAME_SIZE]; | |
| 1004 | |
| 1005 /* | |
| 1006 * For a file under the home directory of the current user, we try to | |
| 1007 * replace the home directory path with "~user". This helps when | |
| 1008 * editing the same file on different machines over a network. | |
| 1009 * First replace home dir path with "~/" with home_replace(). | |
| 1010 * Then insert the user name to get "~user/". | |
| 1011 */ | |
| 2267 | 1012 home_replace(NULL, buf->b_ffname, b0p->b0_fname, |
| 1013 B0_FNAME_SIZE_CRYPT, TRUE); | |
| 7 | 1014 if (b0p->b0_fname[0] == '~') |
| 1015 { | |
| 1016 flen = STRLEN(b0p->b0_fname); | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1017 // If there is no user name or it is too long, don't use "~/" |
| 7 | 1018 if (get_user_name(uname, B0_UNAME_SIZE) == FAIL |
| 2267 | 1019 || (ulen = STRLEN(uname)) + flen > B0_FNAME_SIZE_CRYPT - 1) |
| 1020 vim_strncpy(b0p->b0_fname, buf->b_ffname, | |
| 1021 B0_FNAME_SIZE_CRYPT - 1); | |
| 7 | 1022 else |
| 1023 { | |
| 1024 mch_memmove(b0p->b0_fname + ulen + 1, b0p->b0_fname + 1, flen); | |
| 1025 mch_memmove(b0p->b0_fname + 1, uname, ulen); | |
| 1026 } | |
| 1027 } | |
| 1028 #endif | |
| 1029 if (mch_stat((char *)buf->b_ffname, &st) >= 0) | |
| 1030 { | |
| 1031 long_to_char((long)st.st_mtime, b0p->b0_mtime); | |
| 1032 #ifdef CHECK_INODE | |
| 1033 long_to_char((long)st.st_ino, b0p->b0_ino); | |
| 1034 #endif | |
| 1035 buf_store_time(buf, &st, buf->b_ffname); | |
| 1036 buf->b_mtime_read = buf->b_mtime; | |
|
25953
d7e1cf30728c
patch 8.2.3510: changes are only detected with one second accuracy
Bram Moolenaar <Bram@vim.org>
parents:
25913
diff
changeset
|
1037 buf->b_mtime_read_ns = buf->b_mtime_ns; |
| 7 | 1038 } |
| 1039 else | |
| 1040 { | |
| 1041 long_to_char(0L, b0p->b0_mtime); | |
| 1042 #ifdef CHECK_INODE | |
| 1043 long_to_char(0L, b0p->b0_ino); | |
| 1044 #endif | |
| 1045 buf->b_mtime = 0; | |
|
25953
d7e1cf30728c
patch 8.2.3510: changes are only detected with one second accuracy
Bram Moolenaar <Bram@vim.org>
parents:
25913
diff
changeset
|
1046 buf->b_mtime_ns = 0; |
| 7 | 1047 buf->b_mtime_read = 0; |
|
25953
d7e1cf30728c
patch 8.2.3510: changes are only detected with one second accuracy
Bram Moolenaar <Bram@vim.org>
parents:
25913
diff
changeset
|
1048 buf->b_mtime_read_ns = 0; |
| 7 | 1049 buf->b_orig_size = 0; |
| 1050 buf->b_orig_mode = 0; | |
| 1051 } | |
| 1052 } | |
| 39 | 1053 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1054 // Also add the 'fileencoding' if there is room. |
| 39 | 1055 add_b0_fenc(b0p, curbuf); |
| 7 | 1056 } |
| 1057 | |
| 1058 /* | |
| 39 | 1059 * Update the B0_SAME_DIR flag of the swap file. It's set if the file and the |
| 1060 * swapfile for "buf" are in the same directory. | |
| 1061 * This is fail safe: if we are not sure the directories are equal the flag is | |
| 1062 * not set. | |
| 1063 */ | |
| 1064 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1065 set_b0_dir_flag(ZERO_BL *b0p, buf_T *buf) |
| 39 | 1066 { |
| 1067 if (same_directory(buf->b_ml.ml_mfp->mf_fname, buf->b_ffname)) | |
| 1068 b0p->b0_flags |= B0_SAME_DIR; | |
| 1069 else | |
| 1070 b0p->b0_flags &= ~B0_SAME_DIR; | |
| 1071 } | |
| 1072 | |
| 1073 /* | |
| 1074 * When there is room, add the 'fileencoding' to block zero. | |
| 1075 */ | |
| 1076 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1077 add_b0_fenc( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1078 ZERO_BL *b0p, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1079 buf_T *buf) |
| 39 | 1080 { |
| 1081 int n; | |
| 2267 | 1082 int size = B0_FNAME_SIZE_NOCRYPT; |
| 1083 | |
|
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1084 #ifdef FEAT_CRYPT |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1085 // Without encryption use the same offset as in Vim 7.2 to be compatible. |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1086 // With encryption it's OK to move elsewhere, the swap file is not |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1087 // compatible anyway. |
| 2267 | 1088 if (*buf->b_p_key != NUL) |
| 1089 size = B0_FNAME_SIZE_CRYPT; | |
|
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1090 #endif |
| 39 | 1091 |
| 835 | 1092 n = (int)STRLEN(buf->b_p_fenc); |
| 2267 | 1093 if ((int)STRLEN(b0p->b0_fname) + n + 1 > size) |
| 39 | 1094 b0p->b0_flags &= ~B0_HAS_FENC; |
| 1095 else | |
| 1096 { | |
| 2267 | 1097 mch_memmove((char *)b0p->b0_fname + size - n, |
| 39 | 1098 (char *)buf->b_p_fenc, (size_t)n); |
| 2267 | 1099 *(b0p->b0_fname + size - n - 1) = NUL; |
| 39 | 1100 b0p->b0_flags |= B0_HAS_FENC; |
| 1101 } | |
| 1102 } | |
| 1103 | |
|
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1104 #if defined(HAVE_SYS_SYSINFO_H) && defined(HAVE_SYSINFO_UPTIME) |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1105 # include <sys/sysinfo.h> |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1106 #endif |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1107 |
|
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1108 #if defined(UNIX) || defined(MSWIN) |
|
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1109 /* |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1110 * Return TRUE if the process with number "b0p->b0_pid" is still running. |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1111 * "swap_fname" is the name of the swap file, if it's from before a reboot then |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1112 * the result is FALSE; |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1113 */ |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1114 static int |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1115 swapfile_process_running(ZERO_BL *b0p, char_u *swap_fname UNUSED) |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1116 { |
|
25899
076f9b8e9632
patch 8.2.3483: #ifdef for using sysinfo() is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
25678
diff
changeset
|
1117 #if defined(HAVE_SYSINFO) && defined(HAVE_SYSINFO_UPTIME) |
|
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1118 stat_T st; |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1119 struct sysinfo sinfo; |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1120 |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1121 // If the system rebooted after when the swap file was written then the |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1122 // process can't be running now. |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1123 if (mch_stat((char *)swap_fname, &st) != -1 |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1124 && sysinfo(&sinfo) == 0 |
|
24093
5dfee9b1eabe
patch 8.2.2588: build failure with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
24089
diff
changeset
|
1125 && st.st_mtime < time(NULL) - ( |
|
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1126 # ifdef FEAT_EVAL |
|
24093
5dfee9b1eabe
patch 8.2.2588: build failure with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
24089
diff
changeset
|
1127 override_sysinfo_uptime >= 0 ? override_sysinfo_uptime : |
|
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1128 # endif |
|
24093
5dfee9b1eabe
patch 8.2.2588: build failure with tiny features
Bram Moolenaar <Bram@vim.org>
parents:
24089
diff
changeset
|
1129 sinfo.uptime)) |
|
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1130 return FALSE; |
|
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1131 # endif |
|
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1132 return mch_process_running(char_to_long(b0p->b0_pid)); |
|
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1133 } |
|
25155
a37cf57980f9
patch 8.2.3114: Amiga-like systems: build error using stat()
Bram Moolenaar <Bram@vim.org>
parents:
25050
diff
changeset
|
1134 #endif |
| 39 | 1135 |
| 1136 /* | |
| 2267 | 1137 * Try to recover curbuf from the .swp file. |
|
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1138 * If "checkext" is TRUE, check the extension and detect whether it is |
|
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1139 * a swap file. |
| 7 | 1140 */ |
| 1141 void | |
|
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1142 ml_recover(int checkext) |
| 7 | 1143 { |
| 1144 buf_T *buf = NULL; | |
| 1145 memfile_T *mfp = NULL; | |
| 1146 char_u *fname; | |
| 2267 | 1147 char_u *fname_used = NULL; |
| 7 | 1148 bhdr_T *hp = NULL; |
| 1149 ZERO_BL *b0p; | |
| 39 | 1150 int b0_ff; |
| 1151 char_u *b0_fenc = NULL; | |
| 2267 | 1152 #ifdef FEAT_CRYPT |
| 1153 int b0_cm = -1; | |
| 1154 #endif | |
| 7 | 1155 PTR_BL *pp; |
| 1156 DATA_BL *dp; | |
| 1157 infoptr_T *ip; | |
| 1158 blocknr_T bnum; | |
| 1159 int page_count; | |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
1160 stat_T org_stat, swp_stat; |
| 7 | 1161 int len; |
| 1162 int directly; | |
| 1163 linenr_T lnum; | |
| 1164 char_u *p; | |
| 1165 int i; | |
| 1166 long error; | |
| 1167 int cannot_open; | |
| 1168 linenr_T line_count; | |
| 1169 int has_error; | |
| 1170 int idx; | |
| 1171 int top; | |
| 1172 int txt_start; | |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
1173 off_T size; |
| 7 | 1174 int called_from_main; |
| 1175 int serious_error = TRUE; | |
| 1176 long mtime; | |
| 1177 int attr; | |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1178 int orig_file_status = NOTDONE; |
| 7 | 1179 |
| 1180 recoverymode = TRUE; | |
| 1181 called_from_main = (curbuf->b_ml.ml_mfp == NULL); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1182 attr = HL_ATTR(HLF_E); |
| 1975 | 1183 |
| 1184 /* | |
|
12975
e311187347c1
patch 8.0.1363: recovering does not work when swap file ends in .stz
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1185 * If the file name ends in ".s[a-w][a-z]" we assume this is the swap file. |
| 1975 | 1186 * Otherwise a search is done to find the swap file(s). |
| 1187 */ | |
| 7 | 1188 fname = curbuf->b_fname; |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1189 if (fname == NULL) // When there is no file name |
| 7 | 1190 fname = (char_u *)""; |
| 1191 len = (int)STRLEN(fname); | |
|
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1192 if (checkext && len >= 4 && |
| 2823 | 1193 #if defined(VMS) |
|
10889
5780bd3a5a7e
patch 8.0.0334: can't access b:changedtick from a dict reference
Christian Brabandt <cb@256bit.org>
parents:
10575
diff
changeset
|
1194 STRNICMP(fname + len - 4, "_s", 2) |
| 7 | 1195 #else |
|
10889
5780bd3a5a7e
patch 8.0.0334: can't access b:changedtick from a dict reference
Christian Brabandt <cb@256bit.org>
parents:
10575
diff
changeset
|
1196 STRNICMP(fname + len - 4, ".s", 2) |
| 7 | 1197 #endif |
|
10889
5780bd3a5a7e
patch 8.0.0334: can't access b:changedtick from a dict reference
Christian Brabandt <cb@256bit.org>
parents:
10575
diff
changeset
|
1198 == 0 |
|
12975
e311187347c1
patch 8.0.1363: recovering does not work when swap file ends in .stz
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1199 && vim_strchr((char_u *)"abcdefghijklmnopqrstuvw", |
|
e311187347c1
patch 8.0.1363: recovering does not work when swap file ends in .stz
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1200 TOLOWER_ASC(fname[len - 2])) != NULL |
| 1975 | 1201 && ASCII_ISALPHA(fname[len - 1])) |
| 7 | 1202 { |
| 1203 directly = TRUE; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1204 fname_used = vim_strsave(fname); // make a copy for mf_open() |
| 7 | 1205 } |
| 1206 else | |
| 1207 { | |
| 1208 directly = FALSE; | |
| 1209 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1210 // count the number of matching swap files |
| 2267 | 1211 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
|
1212 if (len == 0) // no swap files found |
| 7 | 1213 { |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1214 semsg(_(e_no_swap_file_found_for_str), fname); |
| 7 | 1215 goto theend; |
| 1216 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1217 if (len == 1) // one swap file found, use it |
| 7 | 1218 i = 1; |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1219 else // several swap files found, choose |
| 7 | 1220 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1221 // list the names of the swap files |
| 2267 | 1222 (void)recover_names(fname, TRUE, 0, NULL); |
| 7 | 1223 msg_putchar('\n'); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1224 msg_puts(_("Enter number of swap file to use (0 to quit): ")); |
| 374 | 1225 i = get_number(FALSE, NULL); |
| 7 | 1226 if (i < 1 || i > len) |
| 1227 goto theend; | |
| 1228 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1229 // get the swap file name that will be used |
| 2267 | 1230 (void)recover_names(fname, FALSE, i, &fname_used); |
| 7 | 1231 } |
| 2267 | 1232 if (fname_used == NULL) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1233 goto theend; // out of memory |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1234 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1235 // When called from main() still need to initialize storage structure |
| 625 | 1236 if (called_from_main && ml_open(curbuf) == FAIL) |
| 7 | 1237 getout(1); |
| 1238 | |
| 2267 | 1239 /* |
| 1240 * Allocate a buffer structure for the swap file that is used for recovery. | |
|
2407
6bc102a4bff8
Fix memory access to 'cryptmethod' during recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2394
diff
changeset
|
1241 * Only the memline and crypt information in it are really used. |
| 2267 | 1242 */ |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16786
diff
changeset
|
1243 buf = ALLOC_ONE(buf_T); |
| 7 | 1244 if (buf == NULL) |
| 1245 goto theend; | |
| 2267 | 1246 |
| 1247 /* | |
| 1248 * init fields in memline struct | |
| 1249 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1250 buf->b_ml.ml_stack_size = 0; // no stack yet |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1251 buf->b_ml.ml_stack = NULL; // no stack yet |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1252 buf->b_ml.ml_stack_top = 0; // nothing in the stack |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1253 buf->b_ml.ml_line_lnum = 0; // no cached line |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1254 buf->b_ml.ml_locked = NULL; // no locked block |
| 7 | 1255 buf->b_ml.ml_flags = 0; |
|
2408
9e2e63af1641
Better fix for memory access in recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2407
diff
changeset
|
1256 #ifdef FEAT_CRYPT |
|
9e2e63af1641
Better fix for memory access in recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2407
diff
changeset
|
1257 buf->b_p_key = empty_option; |
|
9e2e63af1641
Better fix for memory access in recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2407
diff
changeset
|
1258 buf->b_p_cm = empty_option; |
|
9e2e63af1641
Better fix for memory access in recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2407
diff
changeset
|
1259 #endif |
| 7 | 1260 |
| 2267 | 1261 /* |
| 1262 * open the memfile from the old swap file | |
| 1263 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1264 p = vim_strsave(fname_used); // save "fname_used" for the message: |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1265 // mf_open() will consume "fname_used"! |
| 2267 | 1266 mfp = mf_open(fname_used, O_RDONLY); |
| 1267 fname_used = p; | |
| 7 | 1268 if (mfp == NULL || mfp->mf_fd < 0) |
| 1269 { | |
| 2267 | 1270 if (fname_used != NULL) |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1271 semsg(_(e_cannot_open_str), fname_used); |
| 7 | 1272 goto theend; |
| 1273 } | |
| 1274 buf->b_ml.ml_mfp = mfp; | |
| 2267 | 1275 #ifdef FEAT_CRYPT |
| 1276 mfp->mf_buffer = buf; | |
| 1277 #endif | |
| 7 | 1278 |
| 1279 /* | |
| 1280 * The page size set in mf_open() might be different from the page size | |
| 1281 * used in the swap file, we must get it from block 0. But to read block | |
| 1282 * 0 we need a page size. Use the minimal size for block 0 here, it will | |
| 1283 * be set to the real value below. | |
| 1284 */ | |
| 1285 mfp->mf_page_size = MIN_SWAP_PAGE_SIZE; | |
| 1286 | |
| 2267 | 1287 /* |
| 1288 * try to read block 0 | |
| 1289 */ | |
| 7 | 1290 if ((hp = mf_get(mfp, (blocknr_T)0, 1)) == NULL) |
| 1291 { | |
| 1292 msg_start(); | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1293 msg_puts_attr(_("Unable to read block 0 from "), attr | MSG_HIST); |
| 7 | 1294 msg_outtrans_attr(mfp->mf_fname, attr | MSG_HIST); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1295 msg_puts_attr(_("\nMaybe no changes were made or Vim did not update the swap file."), |
| 7 | 1296 attr | MSG_HIST); |
| 1297 msg_end(); | |
| 1298 goto theend; | |
| 1299 } | |
| 1300 b0p = (ZERO_BL *)(hp->bh_data); | |
| 1301 if (STRNCMP(b0p->b0_version, "VIM 3.0", 7) == 0) | |
| 1302 { | |
| 1303 msg_start(); | |
| 1304 msg_outtrans_attr(mfp->mf_fname, MSG_HIST); | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1305 msg_puts_attr(_(" cannot be used with this version of Vim.\n"), |
| 7 | 1306 MSG_HIST); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1307 msg_puts_attr(_("Use Vim version 3.0.\n"), MSG_HIST); |
| 7 | 1308 msg_end(); |
| 1309 goto theend; | |
| 1310 } | |
| 2267 | 1311 if (ml_check_b0_id(b0p) == FAIL) |
| 7 | 1312 { |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1313 semsg(_(e_str_does_not_look_like_vim_swap_file), mfp->mf_fname); |
| 7 | 1314 goto theend; |
| 1315 } | |
| 1316 if (b0_magic_wrong(b0p)) | |
| 1317 { | |
| 1318 msg_start(); | |
| 1319 msg_outtrans_attr(mfp->mf_fname, attr | MSG_HIST); | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
1320 #if defined(MSWIN) |
| 7 | 1321 if (STRNCMP(b0p->b0_hname, "PC ", 3) == 0) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1322 msg_puts_attr(_(" cannot be used with this version of Vim.\n"), |
| 7 | 1323 attr | MSG_HIST); |
| 1324 else | |
| 1325 #endif | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1326 msg_puts_attr(_(" cannot be used on this computer.\n"), |
| 7 | 1327 attr | MSG_HIST); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1328 msg_puts_attr(_("The file was created on "), attr | MSG_HIST); |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1329 // avoid going past the end of a corrupted hostname |
| 7 | 1330 b0p->b0_fname[0] = NUL; |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1331 msg_puts_attr((char *)b0p->b0_hname, attr | MSG_HIST); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1332 msg_puts_attr(_(",\nor the file has been damaged."), attr | MSG_HIST); |
| 7 | 1333 msg_end(); |
| 1334 goto theend; | |
| 1335 } | |
| 1105 | 1336 |
| 2267 | 1337 #ifdef FEAT_CRYPT |
|
24768
7334bf933510
patch 8.2.2922: computing array length is done in various ways
Bram Moolenaar <Bram@vim.org>
parents:
24703
diff
changeset
|
1338 for (i = 0; i < (int)ARRAY_LENGTH(id1_codes); ++i) |
| 6122 | 1339 if (id1_codes[i] == b0p->b0_id[1]) |
| 1340 b0_cm = i; | |
| 1341 if (b0_cm > 0) | |
| 2267 | 1342 mch_memmove(mfp->mf_seed, &b0p->b0_seed, MF_SEED_LEN); |
| 6122 | 1343 crypt_set_cm_option(buf, b0_cm < 0 ? 0 : b0_cm); |
| 2267 | 1344 #else |
| 1345 if (b0p->b0_id[1] != BLOCK0_ID1) | |
| 1346 { | |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
1347 semsg(_(e_str_is_encrypted_and_this_version_of_vim_does_not_support_encryption), mfp->mf_fname); |
| 2267 | 1348 goto theend; |
| 1349 } | |
| 1350 #endif | |
| 1351 | |
| 7 | 1352 /* |
| 1353 * If we guessed the wrong page size, we have to recalculate the | |
| 1354 * highest block number in the file. | |
| 1355 */ | |
| 1356 if (mfp->mf_page_size != (unsigned)char_to_long(b0p->b0_page_size)) | |
| 1357 { | |
| 1105 | 1358 unsigned previous_page_size = mfp->mf_page_size; |
| 1359 | |
| 7 | 1360 mf_new_page_size(mfp, (unsigned)char_to_long(b0p->b0_page_size)); |
| 1105 | 1361 if (mfp->mf_page_size < previous_page_size) |
| 1362 { | |
| 1363 msg_start(); | |
| 1364 msg_outtrans_attr(mfp->mf_fname, attr | MSG_HIST); | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1365 msg_puts_attr(_(" has been damaged (page size is smaller than minimum value).\n"), |
| 1105 | 1366 attr | MSG_HIST); |
| 1367 msg_end(); | |
| 1368 goto theend; | |
| 1369 } | |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
1370 if ((size = vim_lseek(mfp->mf_fd, (off_T)0L, SEEK_END)) <= 0) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1371 mfp->mf_blocknr_max = 0; // no file or empty file |
| 7 | 1372 else |
| 1373 mfp->mf_blocknr_max = (blocknr_T)(size / mfp->mf_page_size); | |
| 1374 mfp->mf_infile_count = mfp->mf_blocknr_max; | |
| 1105 | 1375 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1376 // need to reallocate the memory used to store the data |
| 1105 | 1377 p = alloc(mfp->mf_page_size); |
| 1378 if (p == NULL) | |
| 1379 goto theend; | |
| 1380 mch_memmove(p, hp->bh_data, previous_page_size); | |
| 1381 vim_free(hp->bh_data); | |
| 1382 hp->bh_data = p; | |
| 1383 b0p = (ZERO_BL *)(hp->bh_data); | |
| 7 | 1384 } |
| 1385 | |
| 2267 | 1386 /* |
| 1387 * If .swp file name given directly, use name from swap file for buffer. | |
| 1388 */ | |
| 7 | 1389 if (directly) |
| 1390 { | |
| 1391 expand_env(b0p->b0_fname, NameBuff, MAXPATHL); | |
| 1392 if (setfname(curbuf, NameBuff, NULL, TRUE) == FAIL) | |
| 1393 goto theend; | |
| 1394 } | |
| 1395 | |
| 1396 home_replace(NULL, mfp->mf_fname, NameBuff, MAXPATHL, TRUE); | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1397 smsg(_("Using swap file \"%s\""), NameBuff); |
| 7 | 1398 |
| 1399 if (buf_spname(curbuf) != NULL) | |
| 3839 | 1400 vim_strncpy(NameBuff, buf_spname(curbuf), MAXPATHL - 1); |
| 7 | 1401 else |
| 1402 home_replace(NULL, curbuf->b_ffname, NameBuff, MAXPATHL, TRUE); | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1403 smsg(_("Original file \"%s\""), NameBuff); |
| 7 | 1404 msg_putchar('\n'); |
| 1405 | |
| 2267 | 1406 /* |
| 1407 * check date of swap file and original file | |
| 1408 */ | |
| 7 | 1409 mtime = char_to_long(b0p->b0_mtime); |
| 1410 if (curbuf->b_ffname != NULL | |
| 1411 && mch_stat((char *)curbuf->b_ffname, &org_stat) != -1 | |
| 1412 && ((mch_stat((char *)mfp->mf_fname, &swp_stat) != -1 | |
| 1413 && org_stat.st_mtime > swp_stat.st_mtime) | |
| 1414 || org_stat.st_mtime != mtime)) | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1415 emsg(_(e_warning_original_file_may_have_been_changed)); |
| 7 | 1416 out_flush(); |
| 39 | 1417 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1418 // Get the 'fileformat' and 'fileencoding' from block zero. |
| 39 | 1419 b0_ff = (b0p->b0_flags & B0_FF_MASK); |
| 1420 if (b0p->b0_flags & B0_HAS_FENC) | |
| 1421 { | |
|
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2267
diff
changeset
|
1422 int fnsize = B0_FNAME_SIZE_NOCRYPT; |
| 2267 | 1423 |
| 1424 #ifdef FEAT_CRYPT | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1425 // Use the same size as in add_b0_fenc(). |
| 2267 | 1426 if (b0p->b0_id[1] != BLOCK0_ID1) |
|
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2267
diff
changeset
|
1427 fnsize = B0_FNAME_SIZE_CRYPT; |
| 2267 | 1428 #endif |
|
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2267
diff
changeset
|
1429 for (p = b0p->b0_fname + fnsize; p > b0p->b0_fname && p[-1] != NUL; --p) |
| 39 | 1430 ; |
|
20830
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20599
diff
changeset
|
1431 b0_fenc = vim_strnsave(p, b0p->b0_fname + fnsize - p); |
| 39 | 1432 } |
| 1433 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1434 mf_put(mfp, hp, FALSE, FALSE); // release block 0 |
| 7 | 1435 hp = NULL; |
| 1436 | |
| 1437 /* | |
| 1438 * Now that we are sure that the file is going to be recovered, clear the | |
| 1439 * contents of the current buffer. | |
| 1440 */ | |
| 1441 while (!(curbuf->b_ml.ml_flags & ML_EMPTY)) | |
|
20599
d571231175b4
patch 8.2.0853: ml_delete() often called with FALSE argument
Bram Moolenaar <Bram@vim.org>
parents:
20583
diff
changeset
|
1442 ml_delete((linenr_T)1); |
| 7 | 1443 |
| 1444 /* | |
| 1445 * Try reading the original file to obtain the values of 'fileformat', | |
| 1446 * 'fileencoding', etc. Ignore errors. The text itself is not used. | |
| 2267 | 1447 * When the file is encrypted the user is asked to enter the key. |
| 7 | 1448 */ |
| 1449 if (curbuf->b_ffname != NULL) | |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1450 orig_file_status = readfile(curbuf->b_ffname, NULL, (linenr_T)0, |
| 7 | 1451 (linenr_T)0, (linenr_T)MAXLNUM, NULL, READ_NEW); |
| 1452 | |
| 2267 | 1453 #ifdef FEAT_CRYPT |
| 1454 if (b0_cm >= 0) | |
| 1455 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1456 // Need to ask the user for the crypt key. If this fails we continue |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1457 // without a key, will probably get garbage text. |
| 2267 | 1458 if (*curbuf->b_p_key != NUL) |
| 1459 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1460 smsg(_("Swap file is encrypted: \"%s\""), fname_used); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1461 msg_puts(_("\nIf you entered a new crypt key but did not write the text file,")); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1462 msg_puts(_("\nenter the new crypt key.")); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1463 msg_puts(_("\nIf you wrote the text file after changing the crypt key press enter")); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1464 msg_puts(_("\nto use the same key for text file and swap file")); |
| 2267 | 1465 } |
| 1466 else | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15361
diff
changeset
|
1467 smsg(_(need_key_msg), fname_used); |
| 6122 | 1468 buf->b_p_key = crypt_get_key(FALSE, FALSE); |
| 2267 | 1469 if (buf->b_p_key == NULL) |
| 1470 buf->b_p_key = curbuf->b_p_key; | |
| 1471 else if (*buf->b_p_key == NUL) | |
| 1472 { | |
| 1473 vim_free(buf->b_p_key); | |
| 1474 buf->b_p_key = curbuf->b_p_key; | |
| 1475 } | |
| 1476 if (buf->b_p_key == NULL) | |
| 1477 buf->b_p_key = empty_option; | |
|
2165
733f0dc510c3
Undo changes that are meant for the Vim 7.3 branch.
Bram Moolenaar <bram@vim.org>
parents:
2162
diff
changeset
|
1478 } |
| 2267 | 1479 #endif |
| 7 | 1480 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1481 // Use the 'fileformat' and 'fileencoding' as stored in the swap file. |
| 39 | 1482 if (b0_ff != 0) |
| 1483 set_fileformat(b0_ff - 1, OPT_LOCAL); | |
| 1484 if (b0_fenc != NULL) | |
| 1485 { | |
|
28457
4dcccb2673fe
patch 8.2.4753: error from setting an option is silently ignored
Bram Moolenaar <Bram@vim.org>
parents:
28357
diff
changeset
|
1486 set_option_value_give_err((char_u *)"fenc", 0L, b0_fenc, OPT_LOCAL); |
| 39 | 1487 vim_free(b0_fenc); |
| 1488 } | |
|
16996
d5e1e09a829f
patch 8.1.1498: ":write" increments b:changedtick even though nothing changed
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
1489 unchanged(curbuf, TRUE, TRUE); |
| 39 | 1490 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1491 bnum = 1; // start with block 1 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1492 page_count = 1; // which is 1 page |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1493 lnum = 0; // append after line 0 in curbuf |
| 7 | 1494 line_count = 0; |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1495 idx = 0; // start with first index in block 1 |
| 7 | 1496 error = 0; |
| 1497 buf->b_ml.ml_stack_top = 0; | |
| 1498 buf->b_ml.ml_stack = NULL; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1499 buf->b_ml.ml_stack_size = 0; // no stack yet |
| 7 | 1500 |
| 1501 if (curbuf->b_ffname == NULL) | |
| 1502 cannot_open = TRUE; | |
| 1503 else | |
| 1504 cannot_open = FALSE; | |
| 1505 | |
| 1506 serious_error = FALSE; | |
| 1507 for ( ; !got_int; line_breakcheck()) | |
| 1508 { | |
| 1509 if (hp != NULL) | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1510 mf_put(mfp, hp, FALSE, FALSE); // release previous block |
| 7 | 1511 |
| 1512 /* | |
| 1513 * get block | |
| 1514 */ | |
|
27426
41e0dcf38521
patch 8.2.4241: some type casts are redundant
Bram Moolenaar <Bram@vim.org>
parents:
27231
diff
changeset
|
1515 if ((hp = mf_get(mfp, bnum, page_count)) == NULL) |
| 7 | 1516 { |
| 1517 if (bnum == 1) | |
| 1518 { | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1519 semsg(_(e_unable_to_read_block_one_from_str), mfp->mf_fname); |
| 7 | 1520 goto theend; |
| 1521 } | |
| 1522 ++error; | |
| 1523 ml_append(lnum++, (char_u *)_("???MANY LINES MISSING"), | |
| 1524 (colnr_T)0, TRUE); | |
| 1525 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1526 else // there is a block |
| 7 | 1527 { |
| 1528 pp = (PTR_BL *)(hp->bh_data); | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1529 if (pp->pb_id == PTR_ID) // it is a pointer block |
| 7 | 1530 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1531 // check line count when using pointer block first time |
| 7 | 1532 if (idx == 0 && line_count != 0) |
| 1533 { | |
| 1534 for (i = 0; i < (int)pp->pb_count; ++i) | |
| 1535 line_count -= pp->pb_pointer[i].pe_line_count; | |
| 1536 if (line_count != 0) | |
| 1537 { | |
| 1538 ++error; | |
| 1539 ml_append(lnum++, (char_u *)_("???LINE COUNT WRONG"), | |
| 1540 (colnr_T)0, TRUE); | |
| 1541 } | |
| 1542 } | |
| 1543 | |
| 1544 if (pp->pb_count == 0) | |
| 1545 { | |
| 1546 ml_append(lnum++, (char_u *)_("???EMPTY BLOCK"), | |
| 1547 (colnr_T)0, TRUE); | |
| 1548 ++error; | |
| 1549 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1550 else if (idx < (int)pp->pb_count) // go a block deeper |
| 7 | 1551 { |
| 1552 if (pp->pb_pointer[idx].pe_bnum < 0) | |
| 1553 { | |
| 1554 /* | |
| 1555 * Data block with negative block number. | |
| 1556 * Try to read lines from the original file. | |
| 1557 * This is slow, but it works. | |
| 1558 */ | |
| 1559 if (!cannot_open) | |
| 1560 { | |
| 1561 line_count = pp->pb_pointer[idx].pe_line_count; | |
| 1562 if (readfile(curbuf->b_ffname, NULL, lnum, | |
| 1563 pp->pb_pointer[idx].pe_old_lnum - 1, | |
|
10575
01a5f64a7a20
patch 8.0.0177: BufEnter autocommand not fired for a directory
Christian Brabandt <cb@256bit.org>
parents:
10359
diff
changeset
|
1564 line_count, NULL, 0) != OK) |
| 7 | 1565 cannot_open = TRUE; |
| 1566 else | |
| 1567 lnum += line_count; | |
| 1568 } | |
| 1569 if (cannot_open) | |
| 1570 { | |
| 1571 ++error; | |
| 1572 ml_append(lnum++, (char_u *)_("???LINES MISSING"), | |
| 1573 (colnr_T)0, TRUE); | |
| 1574 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1575 ++idx; // get same block again for next index |
| 7 | 1576 continue; |
| 1577 } | |
| 1578 | |
| 1579 /* | |
| 1580 * going one block deeper in the tree | |
| 1581 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1582 if ((top = ml_add_stack(buf)) < 0) // new entry in stack |
| 7 | 1583 { |
| 1584 ++error; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1585 break; // out of memory |
| 7 | 1586 } |
| 1587 ip = &(buf->b_ml.ml_stack[top]); | |
| 1588 ip->ip_bnum = bnum; | |
| 1589 ip->ip_index = idx; | |
| 1590 | |
| 1591 bnum = pp->pb_pointer[idx].pe_bnum; | |
| 1592 line_count = pp->pb_pointer[idx].pe_line_count; | |
| 1593 page_count = pp->pb_pointer[idx].pe_page_count; | |
| 2885 | 1594 idx = 0; |
| 7 | 1595 continue; |
| 1596 } | |
| 1597 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1598 else // not a pointer block |
| 7 | 1599 { |
| 1600 dp = (DATA_BL *)(hp->bh_data); | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1601 if (dp->db_id != DATA_ID) // block id wrong |
| 7 | 1602 { |
| 1603 if (bnum == 1) | |
| 1604 { | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1605 semsg(_(e_block_one_id_wrong_str_not_swp_file), |
| 7 | 1606 mfp->mf_fname); |
| 1607 goto theend; | |
| 1608 } | |
| 1609 ++error; | |
| 1610 ml_append(lnum++, (char_u *)_("???BLOCK MISSING"), | |
| 1611 (colnr_T)0, TRUE); | |
| 1612 } | |
| 1613 else | |
| 1614 { | |
| 1615 /* | |
| 1616 * it is a data block | |
| 1617 * Append all the lines in this block | |
| 1618 */ | |
| 1619 has_error = FALSE; | |
| 1620 /* | |
| 1621 * check length of block | |
| 1622 * if wrong, use length in pointer block | |
| 1623 */ | |
| 1624 if (page_count * mfp->mf_page_size != dp->db_txt_end) | |
| 1625 { | |
| 1626 ml_append(lnum++, (char_u *)_("??? from here until ???END lines may be messed up"), | |
| 1627 (colnr_T)0, TRUE); | |
| 1628 ++error; | |
| 1629 has_error = TRUE; | |
| 1630 dp->db_txt_end = page_count * mfp->mf_page_size; | |
| 1631 } | |
| 1632 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1633 // make sure there is a NUL at the end of the block |
| 7 | 1634 *((char_u *)dp + dp->db_txt_end - 1) = NUL; |
| 1635 | |
| 1636 /* | |
| 1637 * check number of lines in block | |
| 1638 * if wrong, use count in data block | |
| 1639 */ | |
| 1640 if (line_count != dp->db_line_count) | |
| 1641 { | |
| 1642 ml_append(lnum++, (char_u *)_("??? from here until ???END lines may have been inserted/deleted"), | |
| 1643 (colnr_T)0, TRUE); | |
| 1644 ++error; | |
| 1645 has_error = TRUE; | |
| 1646 } | |
| 1647 | |
| 1648 for (i = 0; i < dp->db_line_count; ++i) | |
| 1649 { | |
| 1650 txt_start = (dp->db_index[i] & DB_INDEX_MASK); | |
| 1978 | 1651 if (txt_start <= (int)HEADER_SIZE |
| 7 | 1652 || txt_start >= (int)dp->db_txt_end) |
| 1653 { | |
| 1654 p = (char_u *)"???"; | |
| 1655 ++error; | |
| 1656 } | |
| 1657 else | |
| 1658 p = (char_u *)dp + txt_start; | |
| 1659 ml_append(lnum++, p, (colnr_T)0, TRUE); | |
| 1660 } | |
| 1661 if (has_error) | |
| 1978 | 1662 ml_append(lnum++, (char_u *)_("???END"), |
| 1663 (colnr_T)0, TRUE); | |
| 7 | 1664 } |
| 1665 } | |
| 1666 } | |
| 1667 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1668 if (buf->b_ml.ml_stack_top == 0) // finished |
| 7 | 1669 break; |
| 1670 | |
| 1671 /* | |
| 1672 * go one block up in the tree | |
| 1673 */ | |
| 1674 ip = &(buf->b_ml.ml_stack[--(buf->b_ml.ml_stack_top)]); | |
| 1675 bnum = ip->ip_bnum; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1676 idx = ip->ip_index + 1; // go to next index |
| 7 | 1677 page_count = 1; |
| 1678 } | |
| 1679 | |
| 1680 /* | |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1681 * Compare the buffer contents with the original file. When they differ |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1682 * set the 'modified' flag. |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1683 * Lines 1 - lnum are the new contents. |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1684 * Lines lnum + 1 to ml_line_count are the original contents. |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1685 * Line ml_line_count + 1 in the dummy empty line. |
| 7 | 1686 */ |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1687 if (orig_file_status != OK || curbuf->b_ml.ml_line_count != lnum * 2 + 1) |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1688 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1689 // Recovering an empty file results in two lines and the first line is |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1690 // empty. Don't set the modified flag then. |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1691 if (!(curbuf->b_ml.ml_line_count == 2 && *ml_get(1) == NUL)) |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1692 { |
|
16632
30de89c1d090
patch 8.1.1318: code for text changes is in a "misc" file
Bram Moolenaar <Bram@vim.org>
parents:
16621
diff
changeset
|
1693 changed_internal(); |
|
10952
835604f3c37a
patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents:
10896
diff
changeset
|
1694 ++CHANGEDTICK(curbuf); |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1695 } |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1696 } |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1697 else |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1698 { |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1699 for (idx = 1; idx <= lnum; ++idx) |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1700 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1701 // Need to copy one line, fetching the other one may flush it. |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1702 p = vim_strsave(ml_get(idx)); |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1703 i = STRCMP(p, ml_get(idx + lnum)); |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1704 vim_free(p); |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1705 if (i != 0) |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1706 { |
|
16632
30de89c1d090
patch 8.1.1318: code for text changes is in a "misc" file
Bram Moolenaar <Bram@vim.org>
parents:
16621
diff
changeset
|
1707 changed_internal(); |
|
10952
835604f3c37a
patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents:
10896
diff
changeset
|
1708 ++CHANGEDTICK(curbuf); |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1709 break; |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1710 } |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1711 } |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1712 } |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1713 |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1714 /* |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1715 * Delete the lines from the original file and the dummy line from the |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1716 * empty buffer. These will now be after the last line in the buffer. |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1717 */ |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1718 while (curbuf->b_ml.ml_line_count > lnum |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1719 && !(curbuf->b_ml.ml_flags & ML_EMPTY)) |
|
20599
d571231175b4
patch 8.2.0853: ml_delete() often called with FALSE argument
Bram Moolenaar <Bram@vim.org>
parents:
20583
diff
changeset
|
1720 ml_delete(curbuf->b_ml.ml_line_count); |
| 7 | 1721 curbuf->b_flags |= BF_RECOVERED; |
|
24856
a81b883576d6
patch 8.2.2966: ml_get errors after recovering a file
Bram Moolenaar <Bram@vim.org>
parents:
24768
diff
changeset
|
1722 check_cursor(); |
| 7 | 1723 |
| 1724 recoverymode = FALSE; | |
| 1725 if (got_int) | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1726 emsg(_(e_recovery_interrupted)); |
| 7 | 1727 else if (error) |
| 1728 { | |
| 1729 ++no_wait_return; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1730 msg(">>>>>>>>>>>>>"); |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1731 emsg(_(e_errors_detected_while_recovering_look_for_lines_starting_with_questions)); |
| 7 | 1732 --no_wait_return; |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1733 msg(_("See \":help E312\" for more information.")); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1734 msg(">>>>>>>>>>>>>"); |
| 7 | 1735 } |
| 1736 else | |
| 1737 { | |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1738 if (curbuf->b_changed) |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1739 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1740 msg(_("Recovery completed. You should check if everything is OK.")); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1741 msg_puts(_("\n(You might want to write out this file under another name\n")); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1742 msg_puts(_("and run diff with the original file to check for changes)")); |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1743 } |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2145
diff
changeset
|
1744 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1745 msg(_("Recovery completed. Buffer contents equals file contents.")); |
|
22846
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1746 msg_puts(_("\nYou may want to delete the .swp file now.")); |
|
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1747 #if defined(UNIX) || defined(MSWIN) |
|
24089
cdeec1389c8c
patch 8.2.2586: process id may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23776
diff
changeset
|
1748 if (swapfile_process_running(b0p, fname_used)) |
|
22846
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1749 { |
|
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1750 // Warn there could be an active Vim on the same file, the user may |
|
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1751 // want to kill it. |
|
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1752 msg_puts(_("\nNote: process STILL RUNNING: ")); |
|
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1753 msg_outnum(char_to_long(b0p->b0_pid)); |
|
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1754 } |
|
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1755 #endif |
|
83c2c489cb1b
patch 8.2.1970: it is easy to make mistakes when cleaning up swap files
Bram Moolenaar <Bram@vim.org>
parents:
22699
diff
changeset
|
1756 msg_puts("\n\n"); |
| 7 | 1757 cmdline_row = msg_row; |
| 1758 } | |
| 2267 | 1759 #ifdef FEAT_CRYPT |
| 1760 if (*buf->b_p_key != NUL && STRCMP(curbuf->b_p_key, buf->b_p_key) != 0) | |
| 1761 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1762 msg_puts(_("Using crypt key from swap file for the text file.\n")); |
|
28457
4dcccb2673fe
patch 8.2.4753: error from setting an option is silently ignored
Bram Moolenaar <Bram@vim.org>
parents:
28357
diff
changeset
|
1763 set_option_value_give_err((char_u *)"key", 0L, buf->b_p_key, OPT_LOCAL); |
| 2267 | 1764 } |
| 1765 #endif | |
| 7 | 1766 redraw_curbuf_later(NOT_VALID); |
| 1767 | |
| 1768 theend: | |
| 2267 | 1769 vim_free(fname_used); |
| 7 | 1770 recoverymode = FALSE; |
| 1771 if (mfp != NULL) | |
| 1772 { | |
| 1773 if (hp != NULL) | |
| 1774 mf_put(mfp, hp, FALSE, FALSE); | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1775 mf_close(mfp, FALSE); // will also vim_free(mfp->mf_fname) |
| 7 | 1776 } |
| 1053 | 1777 if (buf != NULL) |
| 1778 { | |
| 2267 | 1779 #ifdef FEAT_CRYPT |
| 1780 if (buf->b_p_key != curbuf->b_p_key) | |
| 1781 free_string_option(buf->b_p_key); | |
|
2407
6bc102a4bff8
Fix memory access to 'cryptmethod' during recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2394
diff
changeset
|
1782 free_string_option(buf->b_p_cm); |
| 2267 | 1783 #endif |
| 1053 | 1784 vim_free(buf->b_ml.ml_stack); |
| 1785 vim_free(buf); | |
| 1786 } | |
| 7 | 1787 if (serious_error && called_from_main) |
| 1788 ml_close(curbuf, TRUE); | |
| 1789 else | |
| 1790 { | |
| 1791 apply_autocmds(EVENT_BUFREADPOST, NULL, curbuf->b_fname, FALSE, curbuf); | |
| 1792 apply_autocmds(EVENT_BUFWINENTER, NULL, curbuf->b_fname, FALSE, curbuf); | |
| 1793 } | |
| 1794 } | |
| 1795 | |
| 1796 /* | |
| 1797 * Find the names of swap files in current directory and the directory given | |
| 1798 * with the 'directory' option. | |
| 1799 * | |
| 1800 * Used to: | |
| 1801 * - list the swap files for "vim -r" | |
| 1802 * - count the number of swap files when recovering | |
| 1803 * - list the swap files when recovering | |
| 1804 * - find the name of the n'th swap file when recovering | |
| 1805 */ | |
| 1806 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1807 recover_names( |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1808 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
|
1809 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
|
1810 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
|
1811 char_u **fname_out) // result when "nr" > 0 |
| 7 | 1812 { |
| 1813 int num_names; | |
| 1814 char_u *(names[6]); | |
| 1815 char_u *tail; | |
| 1816 char_u *p; | |
| 1817 int num_files; | |
| 1818 int file_count = 0; | |
| 1819 char_u **files; | |
| 1820 int i; | |
| 1821 char_u *dirp; | |
| 1822 char_u *dir_name; | |
| 2175 | 1823 char_u *fname_res = NULL; |
|
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1824 #ifdef HAVE_READLINK |
|
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1825 char_u fname_buf[MAXPATHL]; |
| 2175 | 1826 #endif |
| 1827 | |
| 1828 if (fname != NULL) | |
| 1829 { | |
| 1830 #ifdef HAVE_READLINK | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1831 // 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
|
1832 // with the actual file instead of with the symlink. |
| 2267 | 1833 if (resolve_symlink(fname, fname_buf) == OK) |
| 1834 fname_res = fname_buf; | |
| 1835 else | |
|
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1836 #endif |
| 2267 | 1837 fname_res = fname; |
| 2175 | 1838 } |
| 7 | 1839 |
| 1840 if (list) | |
| 1841 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1842 // 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
|
1843 msg(_("Swap files found:")); |
| 7 | 1844 msg_putchar('\n'); |
| 1845 } | |
| 1846 | |
| 1847 /* | |
| 1848 * Do the loop for every directory in 'directory'. | |
| 1849 * First allocate some memory to put the directory name in. | |
| 1850 */ | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1851 dir_name = alloc(STRLEN(p_dir) + 1); |
| 7 | 1852 dirp = p_dir; |
| 1853 while (dir_name != NULL && *dirp) | |
| 1854 { | |
| 1855 /* | |
| 1856 * Isolate a directory name from *dirp and put it in dir_name (we know | |
| 1857 * it is large enough, so use 31000 for length). | |
| 1858 * Advance dirp to next directory name. | |
| 1859 */ | |
| 1860 (void)copy_option_part(&dirp, dir_name, 31000, ","); | |
| 1861 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1862 if (dir_name[0] == '.' && dir_name[1] == NUL) // check current dir |
| 7 | 1863 { |
| 2267 | 1864 if (fname == NULL) |
| 7 | 1865 { |
| 1866 #ifdef VMS | |
| 1867 names[0] = vim_strsave((char_u *)"*_sw%"); | |
| 1868 #else | |
| 1869 names[0] = vim_strsave((char_u *)"*.sw?"); | |
| 1870 #endif | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
1871 #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
|
1872 // 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
|
1873 // supports this too, on some file systems. |
| 7 | 1874 names[1] = vim_strsave((char_u *)".*.sw?"); |
| 1875 names[2] = vim_strsave((char_u *)".sw?"); | |
| 1876 num_names = 3; | |
| 1877 #else | |
| 1878 # ifdef VMS | |
| 1879 names[1] = vim_strsave((char_u *)".*_sw%"); | |
| 1880 num_names = 2; | |
| 1881 # else | |
| 1882 num_names = 1; | |
| 1883 # endif | |
| 1884 #endif | |
| 1885 } | |
| 1886 else | |
|
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1887 num_names = recov_file_names(names, fname_res, TRUE); |
| 7 | 1888 } |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1889 else // check directory dir_name |
| 7 | 1890 { |
| 2267 | 1891 if (fname == NULL) |
| 7 | 1892 { |
| 1893 #ifdef VMS | |
| 1894 names[0] = concat_fnames(dir_name, (char_u *)"*_sw%", TRUE); | |
| 1895 #else | |
| 1896 names[0] = concat_fnames(dir_name, (char_u *)"*.sw?", TRUE); | |
| 1897 #endif | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
1898 #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
|
1899 // 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
|
1900 // supports this too, on some file systems. |
| 7 | 1901 names[1] = concat_fnames(dir_name, (char_u *)".*.sw?", TRUE); |
| 1902 names[2] = concat_fnames(dir_name, (char_u *)".sw?", TRUE); | |
| 1903 num_names = 3; | |
| 1904 #else | |
| 1905 # ifdef VMS | |
| 1906 names[1] = concat_fnames(dir_name, (char_u *)".*_sw%", TRUE); | |
| 1907 num_names = 2; | |
| 1908 # else | |
| 1909 num_names = 1; | |
| 1910 # endif | |
| 1911 #endif | |
| 1912 } | |
| 1913 else | |
| 1914 { | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
1915 #if defined(UNIX) || defined(MSWIN) |
|
10996
2f041b367cd9
patch 8.0.0387: compiler warnings
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1916 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
|
1917 |
|
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
1918 p = dir_name + len; |
|
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
1919 if (after_pathsep(dir_name, p) && len > 1 && p[-1] == p[-2]) |
| 7 | 1920 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1921 // 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
|
1922 tail = make_percent_swname(dir_name, fname_res); |
| 7 | 1923 } |
| 1924 else | |
| 1925 #endif | |
| 1926 { | |
|
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1927 tail = gettail(fname_res); |
| 7 | 1928 tail = concat_fnames(dir_name, tail, TRUE); |
| 1929 } | |
| 1930 if (tail == NULL) | |
| 1931 num_names = 0; | |
| 1932 else | |
| 1933 { | |
| 1934 num_names = recov_file_names(names, tail, FALSE); | |
| 1935 vim_free(tail); | |
| 1936 } | |
| 1937 } | |
| 1938 } | |
| 1939 | |
|
16684
1c2d9f67d98f
patch 8.1.1344: Coverity complains about possibly using a NULL pointer
Bram Moolenaar <Bram@vim.org>
parents:
16666
diff
changeset
|
1940 // check for out-of-memory |
| 7 | 1941 for (i = 0; i < num_names; ++i) |
| 1942 { | |
| 1943 if (names[i] == NULL) | |
| 1944 { | |
| 1945 for (i = 0; i < num_names; ++i) | |
| 1946 vim_free(names[i]); | |
| 1947 num_names = 0; | |
| 1948 } | |
| 1949 } | |
| 1950 if (num_names == 0) | |
| 1951 num_files = 0; | |
| 1952 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
|
1953 EW_NOTENV|EW_KEEPALL|EW_FILE|EW_SILENT) == FAIL) |
| 7 | 1954 num_files = 0; |
| 1955 | |
| 1956 /* | |
| 1957 * When no swap file found, wildcard expansion might have failed (e.g. | |
| 1958 * not able to execute the shell). | |
| 1959 * Try finding a swap file by simply adding ".swp" to the file name. | |
| 1960 */ | |
| 2267 | 1961 if (*dirp == NUL && file_count + num_files == 0 && fname != NULL) |
| 7 | 1962 { |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
1963 stat_T st; |
| 7 | 1964 char_u *swapname; |
| 1965 | |
|
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1966 swapname = modname(fname_res, |
| 2823 | 1967 #if defined(VMS) |
|
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1968 (char_u *)"_swp", FALSE |
| 7 | 1969 #else |
|
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1970 (char_u *)".swp", TRUE |
| 7 | 1971 #endif |
|
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
1972 ); |
| 7 | 1973 if (swapname != NULL) |
| 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 if (mch_stat((char *)swapname, &st) != -1) // It exists! |
| 7 | 1976 { |
|
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
|
1977 files = ALLOC_ONE(char_u *); |
| 7 | 1978 if (files != NULL) |
| 1979 { | |
| 1980 files[0] = swapname; | |
| 1981 swapname = NULL; | |
| 1982 num_files = 1; | |
| 1983 } | |
| 1984 } | |
| 1985 vim_free(swapname); | |
| 1986 } | |
| 1987 } | |
| 1988 | |
| 1989 /* | |
| 1990 * remove swapfile name of the current buffer, it must be ignored | |
| 1991 */ | |
| 1992 if (curbuf->b_ml.ml_mfp != NULL | |
| 1993 && (p = curbuf->b_ml.ml_mfp->mf_fname) != NULL) | |
| 1994 { | |
| 1995 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
|
1996 // Do not expand wildcards, on windows would try to expand |
|
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1997 // "%tmp%" in "%tmp%file". |
|
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
1998 if (fullpathcmp(p, files[i], TRUE, FALSE) & FPC_SAME) |
| 7 | 1999 { |
|
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
2000 // Remove the name from files[i]. Move further entries |
|
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
2001 // down. When the array becomes empty free it here, since |
|
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16684
diff
changeset
|
2002 // FreeWild() won't be called below. |
| 7 | 2003 vim_free(files[i]); |
| 1855 | 2004 if (--num_files == 0) |
| 2005 vim_free(files); | |
| 2006 else | |
| 2007 for ( ; i < num_files; ++i) | |
| 2008 files[i] = files[i + 1]; | |
| 7 | 2009 } |
| 2010 } | |
| 838 | 2011 if (nr > 0) |
| 7 | 2012 { |
| 2013 file_count += num_files; | |
| 2014 if (nr <= file_count) | |
| 2015 { | |
| 2267 | 2016 *fname_out = vim_strsave( |
| 2017 files[nr - 1 + num_files - file_count]); | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2018 dirp = (char_u *)""; // stop searching |
| 7 | 2019 } |
| 2020 } | |
| 2021 else if (list) | |
| 2022 { | |
| 2023 if (dir_name[0] == '.' && dir_name[1] == NUL) | |
| 2024 { | |
| 2267 | 2025 if (fname == NULL) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2026 msg_puts(_(" In current directory:\n")); |
| 7 | 2027 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2028 msg_puts(_(" Using specified name:\n")); |
| 7 | 2029 } |
| 2030 else | |
| 2031 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2032 msg_puts(_(" In directory ")); |
| 7 | 2033 msg_home_replace(dir_name); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2034 msg_puts(":\n"); |
| 7 | 2035 } |
| 2036 | |
| 2037 if (num_files) | |
| 2038 { | |
| 2039 for (i = 0; i < num_files; ++i) | |
| 2040 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2041 // print the swap file name |
| 7 | 2042 msg_outnum((long)++file_count); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2043 msg_puts(". "); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2044 msg_puts((char *)gettail(files[i])); |
| 7 | 2045 msg_putchar('\n'); |
| 2046 (void)swapfile_info(files[i]); | |
| 2047 } | |
| 2048 } | |
| 2049 else | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2050 msg_puts(_(" -- none --\n")); |
| 7 | 2051 out_flush(); |
| 2052 } | |
| 2053 else | |
| 2054 file_count += num_files; | |
| 2055 | |
| 2056 for (i = 0; i < num_names; ++i) | |
| 2057 vim_free(names[i]); | |
| 838 | 2058 if (num_files > 0) |
| 2059 FreeWild(num_files, files); | |
| 7 | 2060 } |
| 2061 vim_free(dir_name); | |
| 2062 return file_count; | |
| 2063 } | |
| 2064 | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2065 #if defined(UNIX) || defined(MSWIN) || defined(PROTO) |
| 7 | 2066 /* |
|
14475
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2067 * Need _very_ long file names. |
| 7 | 2068 * Append the full path to name with path separators made into percent |
|
26018
c2d4e40a32a6
patch 8.2.3543: swapname has double slash when 'directory' ends in it
Bram Moolenaar <Bram@vim.org>
parents:
25953
diff
changeset
|
2069 * signs, to "dir". An unnamed buffer is handled as "" (<currentdir>/"") |
|
c2d4e40a32a6
patch 8.2.3543: swapname has double slash when 'directory' ends in it
Bram Moolenaar <Bram@vim.org>
parents:
25953
diff
changeset
|
2070 * The last character in "dir" must be an extra slash or backslash, it is |
|
c2d4e40a32a6
patch 8.2.3543: swapname has double slash when 'directory' ends in it
Bram Moolenaar <Bram@vim.org>
parents:
25953
diff
changeset
|
2071 * removed. |
| 7 | 2072 */ |
|
14475
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2073 char_u * |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2074 make_percent_swname(char_u *dir, char_u *name) |
| 7 | 2075 { |
|
14475
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2076 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
|
2077 |
|
dddba3937532
patch 8.1.0251: using full path is not supported for 'backupdir'
Christian Brabandt <cb@256bit.org>
parents:
14011
diff
changeset
|
2078 f = fix_fname(name != NULL ? name : (char_u *)""); |
| 7 | 2079 if (f != NULL) |
| 2080 { | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
2081 s = alloc(STRLEN(f) + 1); |
| 7 | 2082 if (s != NULL) |
| 2083 { | |
| 39 | 2084 STRCPY(s, f); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10996
diff
changeset
|
2085 for (d = s; *d != NUL; MB_PTR_ADV(d)) |
| 39 | 2086 if (vim_ispathsep(*d)) |
| 2087 *d = '%'; | |
|
26018
c2d4e40a32a6
patch 8.2.3543: swapname has double slash when 'directory' ends in it
Bram Moolenaar <Bram@vim.org>
parents:
25953
diff
changeset
|
2088 |
|
c2d4e40a32a6
patch 8.2.3543: swapname has double slash when 'directory' ends in it
Bram Moolenaar <Bram@vim.org>
parents:
25953
diff
changeset
|
2089 dir[STRLEN(dir) - 1] = NUL; // remove one trailing slash |
| 7 | 2090 d = concat_fnames(dir, s, TRUE); |
| 2091 vim_free(s); | |
| 2092 } | |
| 2093 vim_free(f); | |
| 2094 } | |
| 2095 return d; | |
| 2096 } | |
| 2097 #endif | |
| 2098 | |
|
16455
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
2099 #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
|
2100 && (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
|
2101 # define HAVE_PROCESS_STILL_RUNNING |
| 7 | 2102 static int process_still_running; |
| 2103 #endif | |
| 2104 | |
|
14601
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2105 #if defined(FEAT_EVAL) || defined(PROTO) |
| 7 | 2106 /* |
|
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2107 * 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
|
2108 * 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
|
2109 */ |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2110 void |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2111 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
|
2112 { |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2113 int fd; |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2114 struct block0 b0; |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2115 |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2116 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
|
2117 { |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2118 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
|
2119 { |
|
14601
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2120 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
|
2121 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
|
2122 else if (b0_magic_wrong(&b0)) |
|
15267
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2123 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
|
2124 else |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2125 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2126 // we have swap information |
|
15267
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2127 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
|
2128 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
|
2129 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
|
2130 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
|
2131 |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2132 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
|
2133 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
|
2134 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
|
2135 # 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
|
2136 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
|
2137 # endif |
|
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2138 } |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2139 } |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2140 else |
|
15267
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2141 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
|
2142 close(fd); |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2143 } |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2144 else |
|
15267
762fccd84b7c
patch 8.1.0642: swapinfo() leaks memory
Bram Moolenaar <Bram@vim.org>
parents:
15255
diff
changeset
|
2145 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
|
2146 } |
|
14601
d0ff19a55579
patch 8.1.0314: build failure without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14599
diff
changeset
|
2147 #endif |
|
14599
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2148 |
|
72d6f6f7ead7
patch 8.1.0313: information about a swap file is unavailable
Christian Brabandt <cb@256bit.org>
parents:
14593
diff
changeset
|
2149 /* |
| 580 | 2150 * Give information about an existing swap file. |
| 7 | 2151 * Returns timestamp (0 when unknown). |
| 2152 */ | |
| 2153 static time_t | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2154 swapfile_info(char_u *fname) |
| 7 | 2155 { |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
2156 stat_T st; |
| 7 | 2157 int fd; |
| 2158 struct block0 b0; | |
| 2159 #ifdef UNIX | |
| 2160 char_u uname[B0_UNAME_SIZE]; | |
| 2161 #endif | |
| 2162 | |
|
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2163 // print the swap file date |
| 7 | 2164 if (mch_stat((char *)fname, &st) != -1) |
| 2165 { | |
| 2166 #ifdef UNIX | |
|
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2167 // print name of owner of the file |
| 7 | 2168 if (mch_get_uname(st.st_uid, uname, B0_UNAME_SIZE) == OK) |
| 2169 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2170 msg_puts(_(" owned by: ")); |
| 7 | 2171 msg_outtrans(uname); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2172 msg_puts(_(" dated: ")); |
| 7 | 2173 } |
| 2174 else | |
| 2175 #endif | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2176 msg_puts(_(" dated: ")); |
|
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2177 msg_puts(get_ctime(st.st_mtime, TRUE)); |
| 7 | 2178 } |
|
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2179 else |
|
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2180 st.st_mtime = 0; |
| 7 | 2181 |
| 2182 /* | |
| 2183 * print the original file name | |
| 2184 */ | |
| 2185 fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0); | |
| 2186 if (fd >= 0) | |
| 2187 { | |
| 2664 | 2188 if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0)) |
| 7 | 2189 { |
| 2190 if (STRNCMP(b0.b0_version, "VIM 3.0", 7) == 0) | |
| 2191 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2192 msg_puts(_(" [from Vim version 3.0]")); |
| 7 | 2193 } |
| 2267 | 2194 else if (ml_check_b0_id(&b0) == FAIL) |
| 7 | 2195 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2196 msg_puts(_(" [does not look like a Vim swap file]")); |
| 7 | 2197 } |
| 2198 else | |
| 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(_(" file name: ")); |
| 7 | 2201 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
|
2202 msg_puts(_("[No Name]")); |
| 7 | 2203 else |
| 2204 msg_outtrans(b0.b0_fname); | |
| 2205 | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2206 msg_puts(_("\n modified: ")); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2207 msg_puts(b0.b0_dirty ? _("YES") : _("no")); |
| 7 | 2208 |
| 2209 if (*(b0.b0_uname) != NUL) | |
| 2210 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2211 msg_puts(_("\n user name: ")); |
| 7 | 2212 msg_outtrans(b0.b0_uname); |
| 2213 } | |
| 2214 | |
| 2215 if (*(b0.b0_hname) != NUL) | |
| 2216 { | |
| 2217 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
|
2218 msg_puts(_(" host name: ")); |
| 7 | 2219 else |
|
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 host name: ")); |
| 7 | 2221 msg_outtrans(b0.b0_hname); |
| 2222 } | |
| 2223 | |
| 2224 if (char_to_long(b0.b0_pid) != 0L) | |
| 2225 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2226 msg_puts(_("\n process ID: ")); |
| 7 | 2227 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
|
2228 #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
|
2229 if (swapfile_process_running(&b0, fname)) |
| 7 | 2230 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2231 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
|
2232 # ifdef HAVE_PROCESS_STILL_RUNNING |
| 7 | 2233 process_still_running = TRUE; |
| 2234 # endif | |
| 2235 } | |
| 2236 #endif | |
| 2237 } | |
| 2238 | |
| 2239 if (b0_magic_wrong(&b0)) | |
| 2240 { | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
2241 #if defined(MSWIN) |
| 7 | 2242 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
|
2243 msg_puts(_("\n [not usable with this version of Vim]")); |
| 7 | 2244 else |
| 2245 #endif | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2246 msg_puts(_("\n [not usable on this computer]")); |
| 7 | 2247 } |
| 2248 } | |
| 2249 } | |
| 2250 else | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2251 msg_puts(_(" [cannot be read]")); |
| 7 | 2252 close(fd); |
| 2253 } | |
| 2254 else | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2255 msg_puts(_(" [cannot be opened]")); |
| 7 | 2256 msg_putchar('\n'); |
| 2257 | |
|
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
2258 return st.st_mtime; |
| 7 | 2259 } |
| 2260 | |
|
16453
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 * 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
|
2263 * be safely deleted. |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2264 */ |
|
28175
3cc909ea91a8
patch 8.2.4613: return type of swapfile_unchanged() is wrong
Bram Moolenaar <Bram@vim.org>
parents:
27752
diff
changeset
|
2265 static int |
|
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2266 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
|
2267 { |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2268 stat_T st; |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2269 int fd; |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2270 struct block0 b0; |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2271 int ret = TRUE; |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2272 |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2273 // 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
|
2274 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
|
2275 return FALSE; |
|
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 // 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
|
2278 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
|
2279 if (fd < 0) |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2280 return FALSE; |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2281 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
|
2282 { |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2283 close(fd); |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2284 return FALSE; |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2285 } |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2286 |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2287 // 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
|
2288 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
|
2289 ret = FALSE; |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2290 |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2291 // must be unchanged |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2292 if (b0.b0_dirty) |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2293 ret = FALSE; |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2294 |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2295 #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
|
2296 // 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
|
2297 // 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
|
2298 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
|
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 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
|
2301 } |
|
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
|
2302 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
|
2303 { |
|
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 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
|
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 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
|
2307 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
|
2308 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
|
2309 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
|
2310 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
|
2311 } |
|
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 |
|
18498
9e6d5a4abb1c
patch 8.1.2243: typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
18459
diff
changeset
|
2313 // 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
|
2314 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
|
2315 ret = FALSE; |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2316 #endif |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2317 |
|
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
|
2318 // 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
|
2319 // 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
|
2320 |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2321 close(fd); |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2322 return ret; |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2323 } |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
2324 |
| 7 | 2325 static int |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2326 recov_file_names(char_u **names, char_u *path, int prepend_dot) |
| 7 | 2327 { |
| 2328 int num_names; | |
| 2329 | |
| 2330 /* | |
| 2331 * (Win32 and Win64) never short names, but do prepend a dot. | |
| 2332 * (Not MS-DOS or Win32 or Win64) maybe short name, maybe not: Try both. | |
| 2333 * Only use the short name if it is different. | |
| 2334 */ | |
| 2335 char_u *p; | |
| 2336 int i; | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2337 # ifndef MSWIN |
| 7 | 2338 int shortname = curbuf->b_shortname; |
| 2339 | |
| 2340 curbuf->b_shortname = FALSE; | |
| 2341 # endif | |
| 2342 | |
| 2343 num_names = 0; | |
| 2344 | |
| 2345 /* | |
| 2346 * May also add the file name with a dot prepended, for swap file in same | |
| 2347 * dir as original file. | |
| 2348 */ | |
| 2349 if (prepend_dot) | |
| 2350 { | |
| 2351 names[num_names] = modname(path, (char_u *)".sw?", TRUE); | |
| 2352 if (names[num_names] == NULL) | |
| 2353 goto end; | |
| 2354 ++num_names; | |
| 2355 } | |
| 2356 | |
| 2357 /* | |
| 2358 * Form the normal swap file name pattern by appending ".sw?". | |
| 2359 */ | |
| 2360 #ifdef VMS | |
| 2361 names[num_names] = concat_fnames(path, (char_u *)"_sw%", FALSE); | |
| 2362 #else | |
| 2363 names[num_names] = concat_fnames(path, (char_u *)".sw?", FALSE); | |
| 2364 #endif | |
| 2365 if (names[num_names] == NULL) | |
| 2366 goto end; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2367 if (num_names >= 1) // check if we have the same name twice |
| 7 | 2368 { |
| 2369 p = names[num_names - 1]; | |
| 2370 i = (int)STRLEN(names[num_names - 1]) - (int)STRLEN(names[num_names]); | |
| 2371 if (i > 0) | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2372 p += i; // file name has been expanded to full path |
| 7 | 2373 |
| 2374 if (STRCMP(p, names[num_names]) != 0) | |
| 2375 ++num_names; | |
| 2376 else | |
| 2377 vim_free(names[num_names]); | |
| 2378 } | |
| 2379 else | |
| 2380 ++num_names; | |
| 2381 | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2382 # ifndef MSWIN |
| 7 | 2383 /* |
| 2384 * Also try with 'shortname' set, in case the file is on a DOS filesystem. | |
| 2385 */ | |
| 2386 curbuf->b_shortname = TRUE; | |
| 2387 #ifdef VMS | |
| 2388 names[num_names] = modname(path, (char_u *)"_sw%", FALSE); | |
| 2389 #else | |
| 2390 names[num_names] = modname(path, (char_u *)".sw?", FALSE); | |
| 2391 #endif | |
| 2392 if (names[num_names] == NULL) | |
| 2393 goto end; | |
| 2394 | |
| 2395 /* | |
| 2396 * Remove the one from 'shortname', if it's the same as with 'noshortname'. | |
| 2397 */ | |
| 2398 p = names[num_names]; | |
| 2399 i = STRLEN(names[num_names]) - STRLEN(names[num_names - 1]); | |
| 2400 if (i > 0) | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2401 p += i; // file name has been expanded to full path |
| 7 | 2402 if (STRCMP(names[num_names - 1], p) == 0) |
| 2403 vim_free(names[num_names]); | |
| 2404 else | |
| 2405 ++num_names; | |
| 2406 # endif | |
| 2407 | |
| 2408 end: | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2409 # ifndef MSWIN |
| 7 | 2410 curbuf->b_shortname = shortname; |
| 2411 # endif | |
| 2412 | |
| 2413 return num_names; | |
| 2414 } | |
| 2415 | |
| 2416 /* | |
| 2417 * sync all memlines | |
| 2418 * | |
| 2419 * If 'check_file' is TRUE, check if original file exists and was not changed. | |
| 2420 * If 'check_char' is TRUE, stop syncing when character becomes available, but | |
| 2421 * always sync at least one block. | |
| 2422 */ | |
| 2423 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2424 ml_sync_all(int check_file, int check_char) |
| 7 | 2425 { |
| 2426 buf_T *buf; | |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
2427 stat_T st; |
| 7 | 2428 |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
2429 FOR_ALL_BUFFERS(buf) |
| 7 | 2430 { |
|
24970
7e9e53a0368f
patch 8.2.3022: available encryption methods are not strong enough
Bram Moolenaar <Bram@vim.org>
parents:
24856
diff
changeset
|
2431 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
|
2432 || 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
|
2433 || 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
|
2434 continue; // no file |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2435 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2436 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
|
2437 // flush locked block |
| 7 | 2438 (void)ml_find_line(buf, (linenr_T)0, ML_FLUSH); |
| 2439 if (bufIsChanged(buf) && check_file && mf_need_trans(buf->b_ml.ml_mfp) | |
| 2440 && buf->b_ffname != NULL) | |
| 2441 { | |
| 2442 /* | |
| 2443 * If the original file does not exist anymore or has been changed | |
| 2444 * call ml_preserve() to get rid of all negative numbered blocks. | |
| 2445 */ | |
| 2446 if (mch_stat((char *)buf->b_ffname, &st) == -1 | |
| 2447 || st.st_mtime != buf->b_mtime_read | |
|
25953
d7e1cf30728c
patch 8.2.3510: changes are only detected with one second accuracy
Bram Moolenaar <Bram@vim.org>
parents:
25913
diff
changeset
|
2448 #ifdef ST_MTIM_NSEC |
|
d7e1cf30728c
patch 8.2.3510: changes are only detected with one second accuracy
Bram Moolenaar <Bram@vim.org>
parents:
25913
diff
changeset
|
2449 || st.ST_MTIM_NSEC != buf->b_mtime_read_ns |
|
d7e1cf30728c
patch 8.2.3510: changes are only detected with one second accuracy
Bram Moolenaar <Bram@vim.org>
parents:
25913
diff
changeset
|
2450 #endif |
|
2241
60da25e3aab7
Correct use of long instead of off_t for file size. (James Vega)
Bram Moolenaar <bram@vim.org>
parents:
2240
diff
changeset
|
2451 || st.st_size != buf->b_orig_size) |
| 7 | 2452 { |
| 2453 ml_preserve(buf, FALSE); | |
| 2454 did_check_timestamps = FALSE; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2455 need_check_timestamps = TRUE; // give message later |
| 7 | 2456 } |
| 2457 } | |
| 2458 if (buf->b_ml.ml_mfp->mf_dirty) | |
| 2459 { | |
| 2460 (void)mf_sync(buf->b_ml.ml_mfp, (check_char ? MFS_STOP : 0) | |
| 2461 | (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
|
2462 if (check_char && ui_char_avail()) // character available now |
| 7 | 2463 break; |
| 2464 } | |
| 2465 } | |
| 2466 } | |
| 2467 | |
| 2468 /* | |
| 2469 * sync one buffer, including negative blocks | |
| 2470 * | |
| 2471 * after this all the blocks are in the swap file | |
| 2472 * | |
| 2473 * Used for the :preserve command and when the original file has been | |
| 2474 * changed or deleted. | |
| 2475 * | |
| 2476 * when message is TRUE the success of preserving is reported | |
| 2477 */ | |
| 2478 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2479 ml_preserve(buf_T *buf, int message) |
| 7 | 2480 { |
| 2481 bhdr_T *hp; | |
| 2482 linenr_T lnum; | |
| 2483 memfile_T *mfp = buf->b_ml.ml_mfp; | |
| 2484 int status; | |
| 2485 int got_int_save = got_int; | |
| 2486 | |
| 2487 if (mfp == NULL || mfp->mf_fname == NULL) | |
| 2488 { | |
| 2489 if (message) | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
2490 emsg(_(e_cannot_preserve_there_is_no_swap_file)); |
| 7 | 2491 return; |
| 2492 } | |
| 2493 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2494 // 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
|
2495 // before. |
| 7 | 2496 got_int = FALSE; |
| 2497 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2498 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
|
2499 (void)ml_find_line(buf, (linenr_T)0, ML_FLUSH); // flush locked block |
| 7 | 2500 status = mf_sync(mfp, MFS_ALL | MFS_FLUSH); |
| 2501 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2502 // stack is invalid after mf_sync(.., MFS_ALL) |
| 7 | 2503 buf->b_ml.ml_stack_top = 0; |
| 2504 | |
| 2505 /* | |
| 2506 * Some of the data blocks may have been changed from negative to | |
| 2507 * positive block number. In that case the pointer blocks need to be | |
| 2508 * updated. | |
| 2509 * | |
| 2510 * We don't know in which pointer block the references are, so we visit | |
| 2511 * all data blocks until there are no more translations to be done (or | |
| 2512 * we hit the end of the file, which can only happen in case a write fails, | |
| 2513 * e.g. when file system if full). | |
| 2514 * ml_find_line() does the work by translating the negative block numbers | |
| 2515 * when getting the first line of each data block. | |
| 2516 */ | |
| 2517 if (mf_need_trans(mfp) && !got_int) | |
| 2518 { | |
| 2519 lnum = 1; | |
| 2520 while (mf_need_trans(mfp) && lnum <= buf->b_ml.ml_line_count) | |
| 2521 { | |
| 2522 hp = ml_find_line(buf, lnum, ML_FIND); | |
| 2523 if (hp == NULL) | |
| 2524 { | |
| 2525 status = FAIL; | |
| 2526 goto theend; | |
| 2527 } | |
| 2528 CHECK(buf->b_ml.ml_locked_low != lnum, "low != lnum"); | |
| 2529 lnum = buf->b_ml.ml_locked_high + 1; | |
| 2530 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2531 (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
|
2532 // sync the updated pointer blocks |
| 7 | 2533 if (mf_sync(mfp, MFS_ALL | MFS_FLUSH) == FAIL) |
| 2534 status = FAIL; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2535 buf->b_ml.ml_stack_top = 0; // stack is invalid now |
| 7 | 2536 } |
| 2537 theend: | |
| 2538 got_int |= got_int_save; | |
| 2539 | |
| 2540 if (message) | |
| 2541 { | |
| 2542 if (status == OK) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
2543 msg(_("File preserved")); |
| 7 | 2544 else |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
2545 emsg(_(e_preserve_failed)); |
| 7 | 2546 } |
| 2547 } | |
| 2548 | |
| 2549 /* | |
| 2550 * NOTE: The pointer returned by the ml_get_*() functions only remains valid | |
| 2551 * until the next call! | |
| 2552 * line1 = ml_get(1); | |
| 2553 * line2 = ml_get(2); // line1 is now invalid! | |
| 2554 * Make a copy of the line if necessary. | |
| 2555 */ | |
| 2556 /* | |
| 2657 | 2557 * Return a pointer to a (read-only copy of a) line. |
| 7 | 2558 * |
| 2559 * On failure an error message is given and IObuff is returned (to avoid | |
| 2560 * having to check for error everywhere). | |
| 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(linenr_T lnum) |
| 7 | 2564 { |
| 2565 return ml_get_buf(curbuf, lnum, FALSE); | |
| 2566 } | |
| 2567 | |
| 2568 /* | |
| 2657 | 2569 * Return pointer to position "pos". |
| 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_pos(pos_T *pos) |
| 7 | 2573 { |
| 2574 return (ml_get_buf(curbuf, pos->lnum, FALSE) + pos->col); | |
| 2575 } | |
| 2576 | |
| 2577 /* | |
| 2657 | 2578 * Return pointer to cursor line. |
| 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_curline(void) |
| 7 | 2582 { |
| 2583 return ml_get_buf(curbuf, curwin->w_cursor.lnum, FALSE); | |
| 2584 } | |
| 2585 | |
| 2586 /* | |
| 2657 | 2587 * Return pointer to cursor position. |
| 7 | 2588 */ |
| 2589 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2590 ml_get_cursor(void) |
| 7 | 2591 { |
| 2592 return (ml_get_buf(curbuf, curwin->w_cursor.lnum, FALSE) + | |
| 2593 curwin->w_cursor.col); | |
| 2594 } | |
| 2595 | |
| 2596 /* | |
| 2657 | 2597 * Return a pointer to a line in a specific buffer |
| 7 | 2598 * |
| 2599 * "will_change": if TRUE mark the buffer dirty (chars in the line will be | |
| 2600 * changed) | |
| 2601 */ | |
| 2602 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2603 ml_get_buf( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2604 buf_T *buf, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2605 linenr_T lnum, |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2606 int will_change) // line will be changed |
| 7 | 2607 { |
| 1068 | 2608 bhdr_T *hp; |
| 2609 DATA_BL *dp; | |
| 2610 static int recursive = 0; | |
|
26286
2815b25993fb
patch 8.2.3674: when ml_get_buf() fails it messes up IObuff
Bram Moolenaar <Bram@vim.org>
parents:
26018
diff
changeset
|
2611 static char_u questions[4]; |
| 7 | 2612 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2613 if (lnum > buf->b_ml.ml_line_count) // invalid line number |
| 7 | 2614 { |
| 1068 | 2615 if (recursive == 0) |
| 2616 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2617 // 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
|
2618 // the GUI redraws part of the text. |
| 1068 | 2619 ++recursive; |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
2620 siemsg(_(e_ml_get_invalid_lnum_nr), lnum); |
| 1068 | 2621 --recursive; |
| 2622 } | |
|
27746
2d24aad37e60
patch 8.2.4399: crash after ml_get error
Bram Moolenaar <Bram@vim.org>
parents:
27453
diff
changeset
|
2623 ml_flush_line(buf); |
| 7 | 2624 errorret: |
|
26286
2815b25993fb
patch 8.2.3674: when ml_get_buf() fails it messes up IObuff
Bram Moolenaar <Bram@vim.org>
parents:
26018
diff
changeset
|
2625 STRCPY(questions, "???"); |
|
16786
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2626 buf->b_ml.ml_line_len = 4; |
|
27746
2d24aad37e60
patch 8.2.4399: crash after ml_get error
Bram Moolenaar <Bram@vim.org>
parents:
27453
diff
changeset
|
2627 buf->b_ml.ml_line_lnum = lnum; |
|
26286
2815b25993fb
patch 8.2.3674: when ml_get_buf() fails it messes up IObuff
Bram Moolenaar <Bram@vim.org>
parents:
26018
diff
changeset
|
2628 return questions; |
| 7 | 2629 } |
|
16786
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2630 if (lnum <= 0) // pretend line 0 is line 1 |
| 7 | 2631 lnum = 1; |
| 2632 | |
|
16786
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2633 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
|
2634 { |
|
98ca522e6453
patch 8.1.1395: saving for undo may access invalid memory
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
2635 buf->b_ml.ml_line_len = 1; |
| 7 | 2636 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
|
2637 } |
| 7 | 2638 |
|
2108
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2639 /* |
|
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2640 * 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
|
2641 * Otherwise may need to flush last used line. |
|
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2642 * 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
|
2643 * blocks. |
|
3cdf2a653e00
updated for version 7.2.391
Bram Moolenaar <bram@zimbu.org>
parents:
2075
diff
changeset
|
2644 */ |
| 1066 | 2645 if (buf->b_ml.ml_line_lnum != lnum || mf_dont_release) |
| 7 | 2646 { |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2647 unsigned start, end; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2648 colnr_T len; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2649 int idx; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2650 |
| 7 | 2651 ml_flush_line(buf); |
| 2652 | |
| 2653 /* | |
| 2654 * Find the data block containing the line. | |
| 2655 * This also fills the stack with the blocks from the root to the data | |
| 2656 * block and releases any locked block. | |
| 2657 */ | |
| 2658 if ((hp = ml_find_line(buf, lnum, ML_FIND)) == NULL) | |
| 2659 { | |
| 1068 | 2660 if (recursive == 0) |
| 2661 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2662 // 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
|
2663 // when the GUI redraws part of the text. |
| 1068 | 2664 ++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
|
2665 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
|
2666 shorten_dir(NameBuff); |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
2667 siemsg(_(e_ml_get_cannot_find_line_nr_in_buffer_nr_str), |
|
18459
5c0437acebb7
patch 8.1.2223: cannot see what buffer an ml_get error is for
Bram Moolenaar <Bram@vim.org>
parents:
18372
diff
changeset
|
2668 lnum, buf->b_fnum, NameBuff); |
| 1068 | 2669 --recursive; |
| 2670 } | |
| 7 | 2671 goto errorret; |
| 2672 } | |
| 2673 | |
| 2674 dp = (DATA_BL *)(hp->bh_data); | |
| 2675 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2676 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
|
2677 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
|
2678 // 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
|
2679 // 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
|
2680 if (idx == 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2681 end = dp->db_txt_end; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2682 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2683 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
|
2684 len = end - start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2685 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2686 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
|
2687 buf->b_ml.ml_line_len = len; |
| 7 | 2688 buf->b_ml.ml_line_lnum = lnum; |
|
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2689 buf->b_ml.ml_flags &= ~(ML_LINE_DIRTY | ML_ALLOCATED); |
| 7 | 2690 } |
| 2691 if (will_change) | |
|
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2692 { |
| 7 | 2693 buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS); |
|
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2694 #ifdef FEAT_EVAL |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2695 if (ml_get_alloc_lines && (buf->b_ml.ml_flags & ML_ALLOCATED)) |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2696 // can't make the change in the data block |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2697 buf->b_ml.ml_flags |= ML_LINE_DIRTY; |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2698 #endif |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2699 } |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2700 |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2701 #ifdef FEAT_EVAL |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2702 if (ml_get_alloc_lines |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2703 && (buf->b_ml.ml_flags & (ML_LINE_DIRTY | ML_ALLOCATED)) == 0) |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2704 { |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2705 char_u *p = alloc(buf->b_ml.ml_line_len); |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2706 |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2707 // make sure the text is in allocated memory |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2708 if (p != NULL) |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2709 { |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2710 memmove(p, buf->b_ml.ml_line_ptr, buf->b_ml.ml_line_len); |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2711 buf->b_ml.ml_line_ptr = p; |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2712 buf->b_ml.ml_flags |= ML_ALLOCATED; |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2713 if (will_change) |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2714 // can't make the change in the data block |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2715 buf->b_ml.ml_flags |= ML_LINE_DIRTY; |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2716 } |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2717 } |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2718 #endif |
| 7 | 2719 return buf->b_ml.ml_line_ptr; |
| 2720 } | |
| 2721 | |
| 2722 /* | |
| 2723 * Check if a line that was just obtained by a call to ml_get | |
| 2724 * is in allocated memory. | |
|
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2725 * This ignores ML_ALLOCATED to get the same behavior as without the test |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
2726 * override. |
| 7 | 2727 */ |
| 2728 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2729 ml_line_alloced(void) |
| 7 | 2730 { |
| 2731 return (curbuf->b_ml.ml_flags & ML_LINE_DIRTY); | |
| 2732 } | |
| 2733 | |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2734 #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
|
2735 /* |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2736 * 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
|
2737 */ |
|
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
|
2738 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
|
2739 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
|
2740 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
|
2741 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
|
2742 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
|
2743 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
|
2744 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
|
2745 { |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2746 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
|
2747 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
|
2748 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
|
2749 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
|
2750 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
|
2751 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
|
2752 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
|
2753 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
|
2754 |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2755 // 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
|
2756 // 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
|
2757 // 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
|
2758 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
|
2759 { |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2760 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
|
2761 { |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2762 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
|
2763 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
|
2764 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
|
2765 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
|
2766 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
|
2767 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
|
2768 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
|
2769 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
|
2770 } |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2771 |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2772 // 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
|
2773 // 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
|
2774 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
|
2775 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
|
2776 { |
|
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
2777 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
|
2778 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
|
2779 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
|
2780 { |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2781 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
|
2782 { |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2783 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
|
2784 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
|
2785 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
|
2786 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
|
2787 * 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
|
2788 } |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2789 ++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
|
2790 } |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2791 } |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2792 } |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2793 *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
|
2794 *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
|
2795 *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
|
2796 } |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2797 #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
|
2798 |
| 7 | 2799 static int |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2800 ml_append_int( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2801 buf_T *buf, |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2802 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
|
2803 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
|
2804 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
|
2805 int flags) // ML_APPEND_ flags |
| 7 | 2806 { |
|
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
|
2807 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
|
2808 colnr_T len = len_arg; |
| 7 | 2809 int i; |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2810 int line_count; // number of indexes in current block |
| 7 | 2811 int offset; |
| 2812 int from, to; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2813 int space_needed; // space needed for new line |
| 7 | 2814 int page_size; |
| 2815 int page_count; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2816 int db_idx; // index for lnum in data block |
| 7 | 2817 bhdr_T *hp; |
| 2818 memfile_T *mfp; | |
| 2819 DATA_BL *dp; | |
| 2820 PTR_BL *pp; | |
| 2821 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
|
2822 #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
|
2823 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
|
2824 #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
|
2825 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
|
2826 |
| 7 | 2827 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
|
2828 return FAIL; // lnum out of range |
| 7 | 2829 |
| 2830 if (lowest_marked && lowest_marked > lnum) | |
| 2831 lowest_marked = lnum + 1; | |
| 2832 | |
| 2833 if (len == 0) | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2834 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
|
2835 |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2836 #ifdef FEAT_PROP_POPUP |
|
24703
4bc0bda6857d
patch 8.2.2890: text property duplicated when data block splits
Bram Moolenaar <Bram@vim.org>
parents:
24093
diff
changeset
|
2837 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
|
2838 && !(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
|
2839 // 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
|
2840 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
|
2841 #endif |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2842 |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2843 space_needed = len + INDEX_SIZE; // space needed for text + index |
| 7 | 2844 |
| 2845 mfp = buf->b_ml.ml_mfp; | |
| 2846 page_size = mfp->mf_page_size; | |
| 2847 | |
| 2848 /* | |
| 2849 * find the data block containing the previous line | |
| 2850 * This also fills the stack with the blocks from the root to the data block | |
| 2851 * This also releases any locked block. | |
| 2852 */ | |
| 2853 if ((hp = ml_find_line(buf, lnum == 0 ? (linenr_T)1 : lnum, | |
| 2854 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
|
2855 goto theend; |
| 7 | 2856 |
| 2857 buf->b_ml.ml_flags &= ~ML_EMPTY; | |
| 2858 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2859 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
|
2860 db_idx = -1; // careful, it is negative! |
| 7 | 2861 else |
| 2862 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
|
2863 // get line count before the insertion |
| 7 | 2864 line_count = buf->b_ml.ml_locked_high - buf->b_ml.ml_locked_low; |
| 2865 | |
| 2866 dp = (DATA_BL *)(hp->bh_data); | |
| 2867 | |
| 2868 /* | |
| 2869 * If | |
| 2870 * - there is not enough room in the current block | |
| 2871 * - appending to the last line in the block | |
| 2872 * - not appending to the last line in the file | |
| 2873 * insert in front of the next block. | |
| 2874 */ | |
| 2875 if ((int)dp->db_free < space_needed && db_idx == line_count - 1 | |
| 2876 && lnum < buf->b_ml.ml_line_count) | |
| 2877 { | |
| 2878 /* | |
| 2879 * Now that the line is not going to be inserted in the block that we | |
| 2880 * expected, the line count has to be adjusted in the pointer blocks | |
| 2881 * by using ml_locked_lineadd. | |
| 2882 */ | |
| 2883 --(buf->b_ml.ml_locked_lineadd); | |
| 2884 --(buf->b_ml.ml_locked_high); | |
| 2885 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
|
2886 goto theend; |
| 7 | 2887 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2888 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
|
2889 // get line count before the insertion |
| 7 | 2890 line_count = buf->b_ml.ml_locked_high - buf->b_ml.ml_locked_low; |
| 2891 CHECK(buf->b_ml.ml_locked_low != lnum + 1, "locked_low != lnum + 1"); | |
| 2892 | |
| 2893 dp = (DATA_BL *)(hp->bh_data); | |
| 2894 } | |
| 2895 | |
| 2896 ++buf->b_ml.ml_line_count; | |
| 2897 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2898 if ((int)dp->db_free >= space_needed) // enough room in data block |
| 7 | 2899 { |
|
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
|
2900 /* |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
2901 * 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
|
2902 * 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
|
2903 */ |
| 7 | 2904 dp->db_txt_start -= len; |
| 2905 dp->db_free -= space_needed; | |
| 2906 ++(dp->db_line_count); | |
| 2907 | |
| 2908 /* | |
| 2909 * move the text of the lines that follow to the front | |
| 2910 * adjust the indexes of the lines that follow | |
| 2911 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2912 if (line_count > db_idx + 1) // if there are following lines |
| 7 | 2913 { |
| 2914 /* | |
| 2915 * Offset is the start of the previous line. | |
| 2916 * This will become the character just after the new line. | |
| 2917 */ | |
| 2918 if (db_idx < 0) | |
| 2919 offset = dp->db_txt_end; | |
| 2920 else | |
| 2921 offset = ((dp->db_index[db_idx]) & DB_INDEX_MASK); | |
| 2922 mch_memmove((char *)dp + dp->db_txt_start, | |
| 2923 (char *)dp + dp->db_txt_start + len, | |
| 2924 (size_t)(offset - (dp->db_txt_start + len))); | |
| 2925 for (i = line_count - 1; i > db_idx; --i) | |
| 2926 dp->db_index[i + 1] = dp->db_index[i] - len; | |
| 2927 dp->db_index[db_idx + 1] = offset - len; | |
| 2928 } | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2929 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
2930 // add line at the end (which is the start of the text) |
| 7 | 2931 dp->db_index[db_idx + 1] = dp->db_txt_start; |
| 2932 | |
| 2933 /* | |
| 2934 * copy the text into the block | |
| 2935 */ | |
| 2936 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
|
2937 if (flags & ML_APPEND_MARK) |
| 7 | 2938 dp->db_index[db_idx + 1] |= DB_MARKED; |
| 2939 | |
| 2940 /* | |
| 2941 * Mark the block dirty. | |
| 2942 */ | |
| 2943 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
|
2944 if (!(flags & ML_APPEND_NEW)) |
| 7 | 2945 buf->b_ml.ml_flags |= ML_LOCKED_POS; |
| 2946 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2947 else // not enough space in data block |
| 7 | 2948 { |
| 2949 long line_count_left, line_count_right; | |
| 2950 int page_count_left, page_count_right; | |
| 2951 bhdr_T *hp_left; | |
| 2952 bhdr_T *hp_right; | |
| 2953 bhdr_T *hp_new; | |
| 2954 int lines_moved; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2955 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
|
2956 int total_moved = 0; // init to shut up gcc |
| 7 | 2957 DATA_BL *dp_right, *dp_left; |
| 2958 int stack_idx; | |
| 2959 int in_left; | |
| 2960 int lineadd; | |
| 2961 blocknr_T bnum_left, bnum_right; | |
| 2962 linenr_T lnum_left, lnum_right; | |
| 2963 int pb_idx; | |
| 2964 PTR_BL *pp_new; | |
| 2965 | |
| 2966 /* | |
|
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
|
2967 * 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
|
2968 * 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
|
2969 * 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
|
2970 * 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
|
2971 * 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
|
2972 * 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
|
2973 * 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
|
2974 * |
| 7 | 2975 * We are going to allocate a new data block. Depending on the |
| 2976 * situation it will be put to the left or right of the existing | |
| 2977 * block. If possible we put the new line in the left block and move | |
| 2978 * the lines after it to the right block. Otherwise the new line is | |
| 2979 * also put in the right block. This method is more efficient when | |
| 2980 * inserting a lot of lines at one place. | |
| 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, right block is existing |
| 7 | 2983 { |
| 2984 lines_moved = 0; | |
| 2985 in_left = TRUE; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2986 // space_needed does not change |
| 7 | 2987 } |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2988 else // left block is existing, right block is new |
| 7 | 2989 { |
| 2990 lines_moved = line_count - db_idx - 1; | |
| 2991 if (lines_moved == 0) | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2992 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
|
2993 // space_needed does not change |
| 7 | 2994 else |
| 2995 { | |
| 2996 data_moved = ((dp->db_index[db_idx]) & DB_INDEX_MASK) - | |
| 2997 dp->db_txt_start; | |
| 2998 total_moved = data_moved + lines_moved * INDEX_SIZE; | |
| 2999 if ((int)dp->db_free + total_moved >= space_needed) | |
| 3000 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3001 in_left = TRUE; // put new line in left block |
| 7 | 3002 space_needed = total_moved; |
| 3003 } | |
| 3004 else | |
| 3005 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3006 in_left = FALSE; // put new line in right block |
| 7 | 3007 space_needed += total_moved; |
| 3008 } | |
| 3009 } | |
| 3010 } | |
| 3011 | |
| 3012 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
|
3013 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
|
3014 == NULL) |
| 7 | 3015 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3016 // correct line counts in pointer blocks |
| 7 | 3017 --(buf->b_ml.ml_locked_lineadd); |
| 3018 --(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
|
3019 goto theend; |
| 7 | 3020 } |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3021 if (db_idx < 0) // left block is new |
| 7 | 3022 { |
| 3023 hp_left = hp_new; | |
| 3024 hp_right = hp; | |
| 3025 line_count_left = 0; | |
| 3026 line_count_right = line_count; | |
| 3027 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3028 else // right block is new |
| 7 | 3029 { |
| 3030 hp_left = hp; | |
| 3031 hp_right = hp_new; | |
| 3032 line_count_left = line_count; | |
| 3033 line_count_right = 0; | |
| 3034 } | |
| 3035 dp_right = (DATA_BL *)(hp_right->bh_data); | |
| 3036 dp_left = (DATA_BL *)(hp_left->bh_data); | |
| 3037 bnum_left = hp_left->bh_bnum; | |
| 3038 bnum_right = hp_right->bh_bnum; | |
| 3039 page_count_left = hp_left->bh_page_count; | |
| 3040 page_count_right = hp_right->bh_page_count; | |
| 3041 | |
| 3042 /* | |
| 3043 * May move the new line into the right/new block. | |
| 3044 */ | |
| 3045 if (!in_left) | |
| 3046 { | |
| 3047 dp_right->db_txt_start -= len; | |
| 3048 dp_right->db_free -= len + INDEX_SIZE; | |
| 3049 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
|
3050 if (flags & ML_APPEND_MARK) |
| 7 | 3051 dp_right->db_index[0] |= DB_MARKED; |
| 3052 | |
| 3053 mch_memmove((char *)dp_right + dp_right->db_txt_start, | |
| 3054 line, (size_t)len); | |
| 3055 ++line_count_right; | |
| 3056 } | |
| 3057 /* | |
| 3058 * may move lines from the left/old block to the right/new one. | |
| 3059 */ | |
| 3060 if (lines_moved) | |
| 3061 { | |
| 3062 /* | |
| 3063 */ | |
| 3064 dp_right->db_txt_start -= data_moved; | |
| 3065 dp_right->db_free -= total_moved; | |
| 3066 mch_memmove((char *)dp_right + dp_right->db_txt_start, | |
| 3067 (char *)dp_left + dp_left->db_txt_start, | |
| 3068 (size_t)data_moved); | |
| 3069 offset = dp_right->db_txt_start - dp_left->db_txt_start; | |
| 3070 dp_left->db_txt_start += data_moved; | |
| 3071 dp_left->db_free += total_moved; | |
| 3072 | |
| 3073 /* | |
| 3074 * update indexes in the new block | |
| 3075 */ | |
| 3076 for (to = line_count_right, from = db_idx + 1; | |
| 3077 from < line_count_left; ++from, ++to) | |
| 3078 dp_right->db_index[to] = dp->db_index[from] + offset; | |
| 3079 line_count_right += lines_moved; | |
| 3080 line_count_left -= lines_moved; | |
| 3081 } | |
| 3082 | |
| 3083 /* | |
| 3084 * May move the new line into the left (old or new) block. | |
| 3085 */ | |
| 3086 if (in_left) | |
| 3087 { | |
| 3088 dp_left->db_txt_start -= len; | |
| 3089 dp_left->db_free -= len + INDEX_SIZE; | |
| 3090 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
|
3091 if (flags & ML_APPEND_MARK) |
| 7 | 3092 dp_left->db_index[line_count_left] |= DB_MARKED; |
| 3093 mch_memmove((char *)dp_left + dp_left->db_txt_start, | |
| 3094 line, (size_t)len); | |
| 3095 ++line_count_left; | |
| 3096 } | |
| 3097 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3098 if (db_idx < 0) // left block is new |
| 7 | 3099 { |
| 3100 lnum_left = lnum + 1; | |
| 3101 lnum_right = 0; | |
| 3102 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3103 else // right block is new |
| 7 | 3104 { |
| 3105 lnum_left = 0; | |
| 3106 if (in_left) | |
| 3107 lnum_right = lnum + 2; | |
| 3108 else | |
| 3109 lnum_right = lnum + 1; | |
| 3110 } | |
| 3111 dp_left->db_line_count = line_count_left; | |
| 3112 dp_right->db_line_count = line_count_right; | |
| 3113 | |
| 3114 /* | |
| 3115 * release the two data blocks | |
| 3116 * The new one (hp_new) already has a correct blocknumber. | |
| 3117 * The old one (hp, in ml_locked) gets a positive blocknumber if | |
| 3118 * we changed it and we are not editing a new file. | |
| 3119 */ | |
| 3120 if (lines_moved || in_left) | |
| 3121 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
|
3122 if (!(flags & ML_APPEND_NEW) && db_idx >= 0 && in_left) |
| 7 | 3123 buf->b_ml.ml_flags |= ML_LOCKED_POS; |
| 3124 mf_put(mfp, hp_new, TRUE, FALSE); | |
| 3125 | |
| 3126 /* | |
| 3127 * flush the old data block | |
| 3128 * set ml_locked_lineadd to 0, because the updating of the | |
| 3129 * pointer blocks is done below | |
| 3130 */ | |
| 3131 lineadd = buf->b_ml.ml_locked_lineadd; | |
| 3132 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
|
3133 ml_find_line(buf, (linenr_T)0, ML_FLUSH); // flush data block |
| 7 | 3134 |
| 3135 /* | |
| 3136 * update pointer blocks for the new data block | |
| 3137 */ | |
| 3138 for (stack_idx = buf->b_ml.ml_stack_top - 1; stack_idx >= 0; | |
| 3139 --stack_idx) | |
| 3140 { | |
| 3141 ip = &(buf->b_ml.ml_stack[stack_idx]); | |
| 3142 pb_idx = ip->ip_index; | |
| 3143 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
|
3144 goto theend; |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3145 pp = (PTR_BL *)(hp->bh_data); // must be pointer block |
| 7 | 3146 if (pp->pb_id != PTR_ID) |
| 3147 { | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
3148 iemsg(_(e_pointer_block_id_wrong_three)); |
| 7 | 3149 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
|
3150 goto theend; |
| 7 | 3151 } |
| 3152 /* | |
| 3153 * TODO: If the pointer block is full and we are adding at the end | |
| 3154 * try to insert in front of the next block | |
| 3155 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3156 // block not full, add one entry |
| 7 | 3157 if (pp->pb_count < pp->pb_count_max) |
| 3158 { | |
| 3159 if (pb_idx + 1 < (int)pp->pb_count) | |
| 3160 mch_memmove(&pp->pb_pointer[pb_idx + 2], | |
| 3161 &pp->pb_pointer[pb_idx + 1], | |
| 3162 (size_t)(pp->pb_count - pb_idx - 1) * sizeof(PTR_EN)); | |
| 3163 ++pp->pb_count; | |
| 3164 pp->pb_pointer[pb_idx].pe_line_count = line_count_left; | |
| 3165 pp->pb_pointer[pb_idx].pe_bnum = bnum_left; | |
| 3166 pp->pb_pointer[pb_idx].pe_page_count = page_count_left; | |
| 3167 pp->pb_pointer[pb_idx + 1].pe_line_count = line_count_right; | |
| 3168 pp->pb_pointer[pb_idx + 1].pe_bnum = bnum_right; | |
| 3169 pp->pb_pointer[pb_idx + 1].pe_page_count = page_count_right; | |
| 3170 | |
| 3171 if (lnum_left != 0) | |
| 3172 pp->pb_pointer[pb_idx].pe_old_lnum = lnum_left; | |
| 3173 if (lnum_right != 0) | |
| 3174 pp->pb_pointer[pb_idx + 1].pe_old_lnum = lnum_right; | |
| 3175 | |
| 3176 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
|
3177 buf->b_ml.ml_stack_top = stack_idx + 1; // truncate stack |
| 7 | 3178 |
| 3179 if (lineadd) | |
| 3180 { | |
| 3181 --(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
|
3182 // fix line count for rest of blocks in the stack |
| 7 | 3183 ml_lineadd(buf, lineadd); |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3184 // fix stack itself |
| 7 | 3185 buf->b_ml.ml_stack[buf->b_ml.ml_stack_top].ip_high += |
| 3186 lineadd; | |
| 3187 ++(buf->b_ml.ml_stack_top); | |
| 3188 } | |
| 3189 | |
| 3190 /* | |
| 3191 * We are finished, break the loop here. | |
| 3192 */ | |
| 3193 break; | |
| 3194 } | |
|
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3195 // pointer block full |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3196 /* |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3197 * split the pointer block |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3198 * allocate a new pointer block |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3199 * move some of the pointer into the new block |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3200 * prepare for updating the parent block |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3201 */ |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3202 for (;;) // do this twice when splitting block 1 |
| 7 | 3203 { |
|
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3204 hp_new = ml_new_ptr(mfp); |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3205 if (hp_new == NULL) // TODO: try to fix tree |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3206 goto theend; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3207 pp_new = (PTR_BL *)(hp_new->bh_data); |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3208 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3209 if (hp->bh_bnum != 1) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3210 break; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3211 |
| 7 | 3212 /* |
|
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3213 * if block 1 becomes full the tree is given an extra level |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3214 * The pointers from block 1 are moved into the new block. |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3215 * block 1 is updated to point to the new block |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3216 * then continue to split the new block |
| 7 | 3217 */ |
|
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3218 mch_memmove(pp_new, pp, (size_t)page_size); |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3219 pp->pb_count = 1; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3220 pp->pb_pointer[0].pe_bnum = hp_new->bh_bnum; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3221 pp->pb_pointer[0].pe_line_count = buf->b_ml.ml_line_count; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3222 pp->pb_pointer[0].pe_old_lnum = 1; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3223 pp->pb_pointer[0].pe_page_count = 1; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3224 mf_put(mfp, hp, TRUE, FALSE); // release block 1 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3225 hp = hp_new; // new block is to be split |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3226 pp = pp_new; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3227 CHECK(stack_idx != 0, _("stack_idx should be 0")); |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3228 ip->ip_index = 0; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3229 ++stack_idx; // do block 1 again later |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3230 } |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3231 /* |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3232 * move the pointers after the current one to the new block |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3233 * If there are none, the new entry will be in the new block. |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3234 */ |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3235 total_moved = pp->pb_count - pb_idx - 1; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3236 if (total_moved) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3237 { |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3238 mch_memmove(&pp_new->pb_pointer[0], |
| 7 | 3239 &pp->pb_pointer[pb_idx + 1], |
| 3240 (size_t)(total_moved) * sizeof(PTR_EN)); | |
|
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3241 pp_new->pb_count = total_moved; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3242 pp->pb_count -= total_moved - 1; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3243 pp->pb_pointer[pb_idx + 1].pe_bnum = bnum_right; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3244 pp->pb_pointer[pb_idx + 1].pe_line_count = line_count_right; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3245 pp->pb_pointer[pb_idx + 1].pe_page_count = page_count_right; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3246 if (lnum_right) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3247 pp->pb_pointer[pb_idx + 1].pe_old_lnum = lnum_right; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3248 } |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3249 else |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3250 { |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3251 pp_new->pb_count = 1; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3252 pp_new->pb_pointer[0].pe_bnum = bnum_right; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3253 pp_new->pb_pointer[0].pe_line_count = line_count_right; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3254 pp_new->pb_pointer[0].pe_page_count = page_count_right; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3255 pp_new->pb_pointer[0].pe_old_lnum = lnum_right; |
| 7 | 3256 } |
|
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3257 pp->pb_pointer[pb_idx].pe_bnum = bnum_left; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3258 pp->pb_pointer[pb_idx].pe_line_count = line_count_left; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3259 pp->pb_pointer[pb_idx].pe_page_count = page_count_left; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3260 if (lnum_left) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3261 pp->pb_pointer[pb_idx].pe_old_lnum = lnum_left; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3262 lnum_left = 0; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3263 lnum_right = 0; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3264 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3265 /* |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3266 * recompute line counts |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3267 */ |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3268 line_count_right = 0; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3269 for (i = 0; i < (int)pp_new->pb_count; ++i) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3270 line_count_right += pp_new->pb_pointer[i].pe_line_count; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3271 line_count_left = 0; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3272 for (i = 0; i < (int)pp->pb_count; ++i) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3273 line_count_left += pp->pb_pointer[i].pe_line_count; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3274 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3275 bnum_left = hp->bh_bnum; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3276 bnum_right = hp_new->bh_bnum; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3277 page_count_left = 1; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3278 page_count_right = 1; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3279 mf_put(mfp, hp, TRUE, FALSE); |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3280 mf_put(mfp, hp_new, TRUE, FALSE); |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28319
diff
changeset
|
3281 |
| 7 | 3282 } |
| 3283 | |
| 3284 /* | |
| 3285 * Safety check: fallen out of for loop? | |
| 3286 */ | |
| 3287 if (stack_idx < 0) | |
| 3288 { | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
3289 iemsg(_(e_updated_too_many_blocks)); |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3290 buf->b_ml.ml_stack_top = 0; // invalidate stack |
| 7 | 3291 } |
| 3292 } | |
| 3293 | |
| 3294 #ifdef FEAT_BYTEOFF | |
|
25672
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3295 # ifdef FEAT_PROP_POPUP |
|
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3296 if (curbuf->b_has_textprop) |
|
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3297 // only use the space needed for the text, ignore properties |
|
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3298 len = (colnr_T)STRLEN(line) + 1; |
|
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3299 # endif |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3300 // The line was inserted below 'lnum' |
| 7 | 3301 ml_updatechunk(buf, lnum + 1, (long)len, ML_CHNK_ADDLINE); |
| 3302 #endif | |
|
25672
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3303 |
| 7 | 3304 #ifdef FEAT_NETBEANS_INTG |
| 2210 | 3305 if (netbeans_active()) |
| 7 | 3306 { |
| 3307 if (STRLEN(line) > 0) | |
| 835 | 3308 netbeans_inserted(buf, lnum+1, (colnr_T)0, line, (int)STRLEN(line)); |
| 34 | 3309 netbeans_inserted(buf, lnum+1, (colnr_T)STRLEN(line), |
| 7 | 3310 (char_u *)"\n", 1); |
| 3311 } | |
| 3312 #endif | |
|
8493
caed4b2d305f
commit https://github.com/vim/vim/commit/509ce2a558e7e0c03242e32e844255af52f1c821
Christian Brabandt <cb@256bit.org>
parents:
8422
diff
changeset
|
3313 #ifdef FEAT_JOB_CHANNEL |
|
8422
5d2c84be23b5
commit https://github.com/vim/vim/commit/99ef06296f3c37490511c03786a2c8672e015c56
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
3314 if (buf->b_write_to_channel) |
|
5d2c84be23b5
commit https://github.com/vim/vim/commit/99ef06296f3c37490511c03786a2c8672e015c56
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
3315 channel_write_new_lines(buf); |
|
5d2c84be23b5
commit https://github.com/vim/vim/commit/99ef06296f3c37490511c03786a2c8672e015c56
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
3316 #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
|
3317 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
|
3318 |
|
2d8225cc1315
patch 8.1.0655: when appending a line text property flags are not added
Bram Moolenaar <Bram@vim.org>
parents:
15292
diff
changeset
|
3319 theend: |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3320 #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
|
3321 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
|
3322 #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
|
3323 return ret; |
| 7 | 3324 } |
| 3325 | |
| 3326 /* | |
|
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3327 * 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
|
3328 */ |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3329 static int |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3330 ml_append_flush( |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3331 buf_T *buf, |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3332 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
|
3333 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
|
3334 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
|
3335 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
|
3336 { |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3337 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
|
3338 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
|
3339 |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3340 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
|
3341 // 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
|
3342 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
|
3343 |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3344 #ifdef FEAT_EVAL |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3345 // 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
|
3346 // 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
|
3347 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
|
3348 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
|
3349 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
|
3350 #endif |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3351 |
|
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3352 return ml_append_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
|
3353 } |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3354 |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3355 /* |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3356 * 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
|
3357 * "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
|
3358 * 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
|
3359 * |
|
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3360 * "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
|
3361 * 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
|
3362 * 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
|
3363 * appended_lines(). |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3364 * |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3365 * 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
|
3366 */ |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3367 int |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3368 ml_append( |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3369 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
|
3370 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
|
3371 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
|
3372 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
|
3373 { |
|
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3374 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
|
3375 } |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3376 |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3377 int |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3378 ml_append_flags( |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3379 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
|
3380 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
|
3381 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
|
3382 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
|
3383 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3384 // 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
|
3385 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
|
3386 return FAIL; |
|
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3387 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
|
3388 } |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3389 |
|
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3390 |
|
28877
f13fcdacb57f
patch 8.2.4961: build error with a certain combination of features
Bram Moolenaar <Bram@vim.org>
parents:
28875
diff
changeset
|
3391 #if defined(FEAT_SPELL) || defined(FEAT_QUICKFIX) || defined(FEAT_PROP_POPUP) \ |
|
f13fcdacb57f
patch 8.2.4961: build error with a certain combination of features
Bram Moolenaar <Bram@vim.org>
parents:
28875
diff
changeset
|
3392 || defined(PROTO) |
|
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3393 /* |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3394 * 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
|
3395 * a memline. |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3396 */ |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3397 int |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3398 ml_append_buf( |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3399 buf_T *buf, |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3400 linenr_T lnum, // append after this line (can be 0) |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3401 char_u *line, // text of the new line |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3402 colnr_T len, // length of new line, including NUL, or 0 |
|
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3403 int newfile) // flag, see above |
|
17403
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3404 { |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3405 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
|
3406 return FAIL; |
|
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3407 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
|
3408 } |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3409 #endif |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3410 |
|
9b6c0ef29c20
patch 8.1.1700: listener callback called for the wrong buffer
Bram Moolenaar <Bram@vim.org>
parents:
17364
diff
changeset
|
3411 /* |
|
21337
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
3412 * Replace line "lnum", with buffering, in current buffer. |
| 7 | 3413 * |
| 720 | 3414 * If "copy" is TRUE, make a copy of the line, otherwise the line has been |
| 7 | 3415 * 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
|
3416 * 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
|
3417 * Do not use it after calling ml_replace(). |
| 7 | 3418 * |
| 3419 * Check: The caller of this function should probably also call | |
| 3420 * changed_lines(), unless update_screen(NOT_VALID) is used. | |
| 3421 * | |
| 3422 * return FAIL for failure, OK otherwise | |
| 3423 */ | |
| 3424 int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3425 ml_replace(linenr_T lnum, char_u *line, int copy) |
| 7 | 3426 { |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3427 colnr_T len = -1; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3428 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3429 if (line != NULL) |
|
15182
4b2de998ebd6
patch 8.1.0601: a few compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
15142
diff
changeset
|
3430 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
|
3431 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
|
3432 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3433 |
|
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3434 /* |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3435 * 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
|
3436 * "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
|
3437 * 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
|
3438 * "len_arg" includes the NUL of the text. |
|
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
3439 * When "copy" is TRUE copy the text into allocated memory, otherwise |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
3440 * "line_arg" must be allocated and will be consumed here. |
|
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3441 */ |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3442 int |
|
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3443 ml_replace_len( |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3444 linenr_T lnum, |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3445 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
|
3446 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
|
3447 int has_props, |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3448 int copy) |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3449 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3450 char_u *line = line_arg; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3451 colnr_T len = len_arg; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3452 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3453 if (line == NULL) // just checking... |
| 7 | 3454 return FAIL; |
| 3455 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3456 // When starting up, we might still need to create the memfile |
|
2394
a3aca345aafa
Add the 'undoreload' option to be able to undo a file reload.
Bram Moolenaar <bram@vim.org>
parents:
2360
diff
changeset
|
3457 if (curbuf->b_ml.ml_mfp == NULL && open_buffer(FALSE, NULL, 0) == FAIL) |
| 7 | 3458 return FAIL; |
| 3459 | |
|
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3460 if (!has_props) |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3461 ++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
|
3462 if (copy) |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3463 { |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3464 // 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
|
3465 #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
|
3466 if (has_props) |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3467 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
|
3468 else |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3469 #endif |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3470 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
|
3471 if (line == NULL) |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3472 return FAIL; |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3473 } |
|
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3474 |
| 7 | 3475 #ifdef FEAT_NETBEANS_INTG |
| 2210 | 3476 if (netbeans_active()) |
| 7 | 3477 { |
| 3478 netbeans_removed(curbuf, lnum, 0, (long)STRLEN(ml_get(lnum))); | |
| 835 | 3479 netbeans_inserted(curbuf, lnum, 0, line, (int)STRLEN(line)); |
| 7 | 3480 } |
| 3481 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3482 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
|
3483 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3484 // 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
|
3485 ml_flush_line(curbuf); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3486 |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3487 #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
|
3488 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
|
3489 // 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
|
3490 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
|
3491 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3492 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3493 |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3494 #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
|
3495 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
|
3496 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3497 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
|
3498 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3499 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
|
3500 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3501 char_u *newline; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3502 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
|
3503 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3504 // 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
|
3505 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
|
3506 if (newline != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3507 { |
|
15361
58b125df3e9b
patch 8.1.0688: text properties are not restored by undo
Bram Moolenaar <Bram@vim.org>
parents:
15353
diff
changeset
|
3508 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
|
3509 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
|
3510 + oldtextlen, textproplen); |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3511 vim_free(line); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3512 line = newline; |
|
15182
4b2de998ebd6
patch 8.1.0601: a few compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
15142
diff
changeset
|
3513 len += (colnr_T)textproplen; |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3514 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3515 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3516 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3517 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3518 |
|
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
3519 if (curbuf->b_ml.ml_flags & (ML_LINE_DIRTY | ML_ALLOCATED)) |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
3520 vim_free(curbuf->b_ml.ml_line_ptr); // free allocated line |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
14980
diff
changeset
|
3521 |
| 7 | 3522 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
|
3523 curbuf->b_ml.ml_line_len = len; |
| 7 | 3524 curbuf->b_ml.ml_line_lnum = lnum; |
| 3525 curbuf->b_ml.ml_flags = (curbuf->b_ml.ml_flags | ML_LINE_DIRTY) & ~ML_EMPTY; | |
| 3526 | |
| 3527 return OK; | |
| 3528 } | |
| 3529 | |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3530 #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
|
3531 /* |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3532 * Adjust text properties in line "lnum" for a deleted line. |
|
28875
78ebb50d6fcb
patch 8.2.4960: text properties that cross lines not updated for deleted line
Bram Moolenaar <Bram@vim.org>
parents:
28457
diff
changeset
|
3533 * When "above" is true this is the line above the deleted line, otherwise this |
|
78ebb50d6fcb
patch 8.2.4960: text properties that cross lines not updated for deleted line
Bram Moolenaar <Bram@vim.org>
parents:
28457
diff
changeset
|
3534 * is the line below the deleted line. |
|
78ebb50d6fcb
patch 8.2.4960: text properties that cross lines not updated for deleted line
Bram Moolenaar <Bram@vim.org>
parents:
28457
diff
changeset
|
3535 * "del_props[del_props_len]" are the properties of the deleted line. |
|
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3536 */ |
|
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 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
|
3538 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
|
3539 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
|
3540 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
|
3541 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
|
3542 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
|
3543 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
|
3544 { |
|
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 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
|
3546 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
|
3547 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
|
3548 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
|
3549 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
|
3550 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
|
3551 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
|
3552 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
|
3553 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
|
3554 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
|
3555 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
|
3556 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
|
3557 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
|
3558 |
|
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 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
|
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 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
|
3562 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
|
3563 && !(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
|
3564 || (!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
|
3565 && !(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
|
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 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
|
3568 { |
|
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 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
|
3570 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
|
3571 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
|
3572 |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3573 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
|
3574 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
|
3575 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
|
3576 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
|
3577 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
|
3578 else |
|
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3579 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
|
3580 - 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
|
3581 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
|
3582 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
|
3583 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
|
3584 { |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3585 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
|
3586 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
|
3587 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
|
3588 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
|
3589 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
|
3590 } |
|
15353
21580db06cf3
patch 8.1.0684: warnings from 64-bit compiler
Bram Moolenaar <Bram@vim.org>
parents:
15294
diff
changeset
|
3591 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
|
3592 } |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3593 |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3594 found = FALSE; |
|
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3595 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
|
3596 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
|
3597 { |
|
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3598 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
|
3599 : 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
|
3600 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
|
3601 |
|
28875
78ebb50d6fcb
patch 8.2.4960: text properties that cross lines not updated for deleted line
Bram Moolenaar <Bram@vim.org>
parents:
28457
diff
changeset
|
3602 mch_memmove(&prop_this, text + textlen + done_this, |
|
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3603 sizeof(textprop_T)); |
|
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3604 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
|
3605 && 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
|
3606 && 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
|
3607 { |
|
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 found = TRUE; |
|
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3609 prop_this.tp_flags &= ~flag; |
|
28875
78ebb50d6fcb
patch 8.2.4960: text properties that cross lines not updated for deleted line
Bram Moolenaar <Bram@vim.org>
parents:
28457
diff
changeset
|
3610 mch_memmove(text + textlen + done_this, &prop_this, |
|
20583
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3611 sizeof(textprop_T)); |
|
d067be761cd7
patch 8.2.0845: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
20581
diff
changeset
|
3612 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
|
3613 } |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3614 } |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3615 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
|
3616 { |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3617 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
|
3618 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
|
3619 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
|
3620 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
|
3621 } |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3622 |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3623 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
|
3624 } |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3625 } |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3626 } |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3627 #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
|
3628 |
| 7 | 3629 /* |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
3630 * 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
|
3631 * 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
|
3632 * When "flags" has ML_DEL_UNDO this is called from undo. |
| 7 | 3633 * |
| 3634 * return FAIL for failure, OK otherwise | |
| 3635 */ | |
| 3636 static int | |
|
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3637 ml_delete_int(buf_T *buf, linenr_T lnum, int flags) |
| 7 | 3638 { |
| 3639 bhdr_T *hp; | |
| 3640 memfile_T *mfp; | |
| 3641 DATA_BL *dp; | |
| 3642 PTR_BL *pp; | |
| 3643 infoptr_T *ip; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3644 int count; // number of entries in block |
| 7 | 3645 int idx; |
| 3646 int stack_idx; | |
| 3647 int text_start; | |
| 3648 int line_start; | |
| 3649 long line_size; | |
| 3650 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
|
3651 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
|
3652 #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
|
3653 char_u *textprop_save = NULL; |
|
25678
4da50e168dc9
patch 8.2.3375: using uninitialized memory
Bram Moolenaar <Bram@vim.org>
parents:
25672
diff
changeset
|
3654 int textprop_save_len = 0; |
|
15292
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3655 #endif |
| 7 | 3656 |
| 3657 if (lowest_marked && lowest_marked > lnum) | |
| 3658 lowest_marked--; | |
| 3659 | |
| 3660 /* | |
| 3661 * If the file becomes empty the last line is replaced by an empty line. | |
| 3662 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3663 if (buf->b_ml.ml_line_count == 1) // file becomes empty |
| 7 | 3664 { |
|
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3665 if ((flags & ML_DEL_MESSAGE) |
| 7 | 3666 #ifdef FEAT_NETBEANS_INTG |
| 3667 && !netbeansSuppressNoLines | |
| 3668 #endif | |
| 3669 ) | |
| 680 | 3670 set_keep_msg((char_u *)_(no_lines_msg), 0); |
| 3671 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3672 // FEAT_BYTEOFF already handled in there, don't worry 'bout it below |
| 7 | 3673 i = ml_replace((linenr_T)1, (char_u *)"", TRUE); |
| 3674 buf->b_ml.ml_flags |= ML_EMPTY; | |
| 3675 | |
| 3676 return i; | |
| 3677 } | |
| 3678 | |
| 3679 /* | |
|
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
|
3680 * 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
|
3681 * 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
|
3682 * This also releases any locked block.. |
| 7 | 3683 */ |
| 3684 mfp = buf->b_ml.ml_mfp; | |
| 3685 if (mfp == NULL) | |
| 3686 return FAIL; | |
| 3687 | |
| 3688 if ((hp = ml_find_line(buf, lnum, ML_DELETE)) == NULL) | |
| 3689 return FAIL; | |
| 3690 | |
| 3691 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
|
3692 // compute line count before the delete |
| 7 | 3693 count = (long)(buf->b_ml.ml_locked_high) |
| 3694 - (long)(buf->b_ml.ml_locked_low) + 2; | |
| 3695 idx = lnum - buf->b_ml.ml_locked_low; | |
| 3696 | |
| 3697 --buf->b_ml.ml_line_count; | |
| 3698 | |
| 3699 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
|
3700 if (idx == 0) // first line in block, text at the end |
| 7 | 3701 line_size = dp->db_txt_end - line_start; |
| 3702 else | |
| 3703 line_size = ((dp->db_index[idx - 1]) & DB_INDEX_MASK) - line_start; | |
| 3704 | |
| 3705 #ifdef FEAT_NETBEANS_INTG | |
| 2210 | 3706 if (netbeans_active()) |
|
27426
41e0dcf38521
patch 8.2.4241: some type casts are redundant
Bram Moolenaar <Bram@vim.org>
parents:
27231
diff
changeset
|
3707 netbeans_removed(buf, lnum, 0, line_size); |
| 7 | 3708 #endif |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3709 #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
|
3710 // 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
|
3711 // 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
|
3712 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
|
3713 { |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3714 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
|
3715 |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3716 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
|
3717 { |
|
15353
21580db06cf3
patch 8.1.0684: warnings from 64-bit compiler
Bram Moolenaar <Bram@vim.org>
parents:
15294
diff
changeset
|
3718 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
|
3719 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
|
3720 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
|
3721 } |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3722 } |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3723 #endif |
| 7 | 3724 |
| 3725 /* | |
| 3726 * special case: If there is only one line in the data block it becomes empty. | |
| 3727 * Then we have to remove the entry, pointing to this data block, from the | |
| 3728 * pointer block. If this pointer block also becomes empty, we go up another | |
| 3729 * block, and so on, up to the root if necessary. | |
| 3730 * The line counts in the pointer blocks have already been adjusted by | |
| 3731 * ml_find_line(). | |
| 3732 */ | |
| 3733 if (count == 1) | |
| 3734 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3735 mf_free(mfp, hp); // free the data block |
| 7 | 3736 buf->b_ml.ml_locked = NULL; |
| 3737 | |
| 2823 | 3738 for (stack_idx = buf->b_ml.ml_stack_top - 1; stack_idx >= 0; |
| 3739 --stack_idx) | |
| 7 | 3740 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3741 buf->b_ml.ml_stack_top = 0; // stack is invalid when failing |
| 7 | 3742 ip = &(buf->b_ml.ml_stack[stack_idx]); |
| 3743 idx = ip->ip_index; | |
| 3744 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
|
3745 goto theend; |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3746 pp = (PTR_BL *)(hp->bh_data); // must be pointer block |
| 7 | 3747 if (pp->pb_id != PTR_ID) |
| 3748 { | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
3749 iemsg(_(e_pointer_block_id_wrong_four)); |
| 7 | 3750 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
|
3751 goto theend; |
| 7 | 3752 } |
| 3753 count = --(pp->pb_count); | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3754 if (count == 0) // the pointer block becomes empty! |
| 7 | 3755 mf_free(mfp, hp); |
| 3756 else | |
| 3757 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3758 if (count != idx) // move entries after the deleted one |
| 7 | 3759 mch_memmove(&pp->pb_pointer[idx], &pp->pb_pointer[idx + 1], |
| 3760 (size_t)(count - idx) * sizeof(PTR_EN)); | |
| 3761 mf_put(mfp, hp, TRUE, FALSE); | |
| 3762 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3763 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
|
3764 // fix line count for rest of blocks in the stack |
| 1167 | 3765 if (buf->b_ml.ml_locked_lineadd != 0) |
| 7 | 3766 { |
| 3767 ml_lineadd(buf, buf->b_ml.ml_locked_lineadd); | |
| 3768 buf->b_ml.ml_stack[buf->b_ml.ml_stack_top].ip_high += | |
| 1167 | 3769 buf->b_ml.ml_locked_lineadd; |
| 7 | 3770 } |
| 3771 ++(buf->b_ml.ml_stack_top); | |
| 3772 | |
| 3773 break; | |
| 3774 } | |
| 3775 } | |
| 3776 CHECK(stack_idx < 0, _("deleted block 1?")); | |
| 3777 } | |
| 3778 else | |
| 3779 { | |
| 3780 /* | |
| 3781 * delete the text by moving the next lines forwards | |
| 3782 */ | |
| 3783 text_start = dp->db_txt_start; | |
| 3784 mch_memmove((char *)dp + text_start + line_size, | |
| 3785 (char *)dp + text_start, (size_t)(line_start - text_start)); | |
| 3786 | |
| 3787 /* | |
| 3788 * delete the index by moving the next indexes backwards | |
| 3789 * Adjust the indexes for the text movement. | |
| 3790 */ | |
| 3791 for (i = idx; i < count - 1; ++i) | |
| 3792 dp->db_index[i] = dp->db_index[i + 1] + line_size; | |
| 3793 | |
| 3794 dp->db_free += line_size + INDEX_SIZE; | |
| 3795 dp->db_txt_start += line_size; | |
| 3796 --(dp->db_line_count); | |
| 3797 | |
| 3798 /* | |
| 3799 * mark the block dirty and make sure it is in the file (for recovery) | |
| 3800 */ | |
| 3801 buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS); | |
| 3802 } | |
| 3803 | |
| 3804 #ifdef FEAT_BYTEOFF | |
|
25672
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3805 ml_updatechunk(buf, lnum, line_size |
|
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3806 # ifdef FEAT_PROP_POPUP |
|
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3807 - textprop_save_len |
|
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3808 # endif |
|
ab42c36d1a27
patch 8.2.3372: line2byte() value wrong when adding a text property
Bram Moolenaar <Bram@vim.org>
parents:
25638
diff
changeset
|
3809 , ML_CHNK_DELLINE); |
| 7 | 3810 #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
|
3811 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
|
3812 |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3813 theend: |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3814 #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
|
3815 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
|
3816 { |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3817 // 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
|
3818 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
|
3819 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
|
3820 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
|
3821 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
|
3822 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
|
3823 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
|
3824 } |
|
ba6f0f1bb9d0
patch 8.1.0654: when deleting a line text property flags are not adjusted
Bram Moolenaar <Bram@vim.org>
parents:
15269
diff
changeset
|
3825 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
|
3826 #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
|
3827 return ret; |
| 7 | 3828 } |
| 3829 | |
| 3830 /* | |
|
20581
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3831 * 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
|
3832 * 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
|
3833 * |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3834 * 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
|
3835 * 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
|
3836 * |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3837 * 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
|
3838 */ |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3839 int |
|
20599
d571231175b4
patch 8.2.0853: ml_delete() often called with FALSE argument
Bram Moolenaar <Bram@vim.org>
parents:
20583
diff
changeset
|
3840 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
|
3841 { |
|
20599
d571231175b4
patch 8.2.0853: ml_delete() often called with FALSE argument
Bram Moolenaar <Bram@vim.org>
parents:
20583
diff
changeset
|
3842 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
|
3843 } |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3844 |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3845 /* |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3846 * 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
|
3847 */ |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3848 int |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3849 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
|
3850 { |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3851 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
|
3852 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
|
3853 return FAIL; |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3854 |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3855 #ifdef FEAT_EVAL |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3856 // 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
|
3857 // the text. |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3858 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
|
3859 #endif |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3860 |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3861 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
|
3862 } |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3863 |
|
e529690f27bc
patch 8.2.0844: text properties crossing lines not handled correctly
Bram Moolenaar <Bram@vim.org>
parents:
19396
diff
changeset
|
3864 /* |
|
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
|
3865 * set the DB_MARKED flag for line 'lnum' |
| 7 | 3866 */ |
| 3867 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3868 ml_setmarked(linenr_T lnum) |
| 7 | 3869 { |
| 3870 bhdr_T *hp; | |
| 3871 DATA_BL *dp; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3872 // invalid line number |
| 7 | 3873 if (lnum < 1 || lnum > curbuf->b_ml.ml_line_count |
| 3874 || 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
|
3875 return; // give error message? |
| 7 | 3876 |
| 3877 if (lowest_marked == 0 || lowest_marked > lnum) | |
| 3878 lowest_marked = lnum; | |
| 3879 | |
| 3880 /* | |
| 3881 * find the data block containing the line | |
| 3882 * This also fills the stack with the blocks from the root to the data block | |
| 3883 * This also releases any locked block. | |
| 3884 */ | |
| 3885 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
|
3886 return; // give error message? |
| 7 | 3887 |
| 3888 dp = (DATA_BL *)(hp->bh_data); | |
| 3889 dp->db_index[lnum - curbuf->b_ml.ml_locked_low] |= DB_MARKED; | |
| 3890 curbuf->b_ml.ml_flags |= ML_LOCKED_DIRTY; | |
| 3891 } | |
| 3892 | |
| 3893 /* | |
|
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
|
3894 * find the first line with its DB_MARKED flag set |
| 7 | 3895 */ |
| 3896 linenr_T | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3897 ml_firstmarked(void) |
| 7 | 3898 { |
| 3899 bhdr_T *hp; | |
| 3900 DATA_BL *dp; | |
| 3901 linenr_T lnum; | |
| 3902 int i; | |
| 3903 | |
| 3904 if (curbuf->b_ml.ml_mfp == NULL) | |
| 3905 return (linenr_T) 0; | |
| 3906 | |
| 3907 /* | |
| 3908 * The search starts with lowest_marked line. This is the last line where | |
| 3909 * a mark was found, adjusted by inserting/deleting lines. | |
| 3910 */ | |
| 3911 for (lnum = lowest_marked; lnum <= curbuf->b_ml.ml_line_count; ) | |
| 3912 { | |
| 3913 /* | |
| 3914 * Find the data block containing the line. | |
| 3915 * This also fills the stack with the blocks from the root to the data | |
| 3916 * block This also releases any locked block. | |
| 3917 */ | |
| 3918 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
|
3919 return (linenr_T)0; // give error message? |
| 7 | 3920 |
| 3921 dp = (DATA_BL *)(hp->bh_data); | |
| 3922 | |
| 3923 for (i = lnum - curbuf->b_ml.ml_locked_low; | |
| 3924 lnum <= curbuf->b_ml.ml_locked_high; ++i, ++lnum) | |
| 3925 if ((dp->db_index[i]) & DB_MARKED) | |
| 3926 { | |
| 3927 (dp->db_index[i]) &= DB_INDEX_MASK; | |
| 3928 curbuf->b_ml.ml_flags |= ML_LOCKED_DIRTY; | |
| 3929 lowest_marked = lnum + 1; | |
| 3930 return lnum; | |
| 3931 } | |
| 3932 } | |
| 3933 | |
| 3934 return (linenr_T) 0; | |
| 3935 } | |
| 3936 | |
| 3937 /* | |
| 3938 * clear all DB_MARKED flags | |
| 3939 */ | |
| 3940 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3941 ml_clearmarked(void) |
| 7 | 3942 { |
| 3943 bhdr_T *hp; | |
| 3944 DATA_BL *dp; | |
| 3945 linenr_T lnum; | |
| 3946 int i; | |
| 3947 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3948 if (curbuf->b_ml.ml_mfp == NULL) // nothing to do |
| 7 | 3949 return; |
| 3950 | |
| 3951 /* | |
| 3952 * The search starts with line lowest_marked. | |
| 3953 */ | |
| 3954 for (lnum = lowest_marked; lnum <= curbuf->b_ml.ml_line_count; ) | |
| 3955 { | |
| 3956 /* | |
| 3957 * Find the data block containing the line. | |
| 3958 * This also fills the stack with the blocks from the root to the data | |
| 3959 * block and releases any locked block. | |
| 3960 */ | |
| 3961 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
|
3962 return; // give error message? |
| 7 | 3963 |
| 3964 dp = (DATA_BL *)(hp->bh_data); | |
| 3965 | |
| 3966 for (i = lnum - curbuf->b_ml.ml_locked_low; | |
| 3967 lnum <= curbuf->b_ml.ml_locked_high; ++i, ++lnum) | |
| 3968 if ((dp->db_index[i]) & DB_MARKED) | |
| 3969 { | |
| 3970 (dp->db_index[i]) &= DB_INDEX_MASK; | |
| 3971 curbuf->b_ml.ml_flags |= ML_LOCKED_DIRTY; | |
| 3972 } | |
| 3973 } | |
| 3974 | |
| 3975 lowest_marked = 0; | |
| 3976 } | |
| 3977 | |
| 3978 /* | |
| 3979 * flush ml_line if necessary | |
| 3980 */ | |
| 3981 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3982 ml_flush_line(buf_T *buf) |
| 7 | 3983 { |
| 3984 bhdr_T *hp; | |
| 3985 DATA_BL *dp; | |
| 3986 linenr_T lnum; | |
| 3987 char_u *new_line; | |
| 3988 char_u *old_line; | |
| 3989 colnr_T new_len; | |
| 3990 int old_len; | |
| 3991 int extra; | |
| 3992 int idx; | |
| 3993 int start; | |
| 3994 int count; | |
| 3995 int i; | |
|
2075
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
3996 static int entered = FALSE; |
| 7 | 3997 |
| 3998 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
|
3999 return; // nothing to do |
| 7 | 4000 |
| 4001 if (buf->b_ml.ml_flags & ML_LINE_DIRTY) | |
| 4002 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4003 // 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
|
4004 // when obtaining the cursor position. |
|
2075
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4005 if (entered) |
|
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4006 return; |
|
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4007 entered = TRUE; |
|
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4008 |
| 7 | 4009 lnum = buf->b_ml.ml_line_lnum; |
| 4010 new_line = buf->b_ml.ml_line_ptr; | |
| 4011 | |
| 4012 hp = ml_find_line(buf, lnum, ML_FIND); | |
| 4013 if (hp == NULL) | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
4014 siemsg(_(e_cannot_find_line_nr), lnum); |
| 7 | 4015 else |
| 4016 { | |
| 4017 dp = (DATA_BL *)(hp->bh_data); | |
| 4018 idx = lnum - buf->b_ml.ml_locked_low; | |
| 4019 start = ((dp->db_index[idx]) & DB_INDEX_MASK); | |
| 4020 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
|
4021 if (idx == 0) // line is last in block |
| 7 | 4022 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
|
4023 else // text of previous line follows |
| 7 | 4024 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
|
4025 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
|
4026 extra = new_len - old_len; // negative if lines gets smaller |
| 7 | 4027 |
| 4028 /* | |
| 4029 * if new line fits in data block, replace directly | |
| 4030 */ | |
| 4031 if ((int)dp->db_free >= extra) | |
| 4032 { | |
|
25636
885fba352580
patch 8.2.3354: build failure with +byte_offset but without +textprop
Bram Moolenaar <Bram@vim.org>
parents:
25624
diff
changeset
|
4033 #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP) |
|
25624
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4034 int old_prop_len = 0; |
|
28984
b3828315a0d9
patch 8.2.5014: byte offsets are wrong when using text properties
Bram Moolenaar <Bram@vim.org>
parents:
28877
diff
changeset
|
4035 if (buf->b_has_textprop) |
|
b3828315a0d9
patch 8.2.5014: byte offsets are wrong when using text properties
Bram Moolenaar <Bram@vim.org>
parents:
28877
diff
changeset
|
4036 old_prop_len = old_len - (int)STRLEN(old_line) - 1; |
|
25624
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4037 #endif |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4038 // if the length changes and there are following lines |
| 7 | 4039 count = buf->b_ml.ml_locked_high - buf->b_ml.ml_locked_low + 1; |
| 4040 if (extra != 0 && idx < count - 1) | |
| 4041 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4042 // move text of following lines |
| 7 | 4043 mch_memmove((char *)dp + dp->db_txt_start - extra, |
| 4044 (char *)dp + dp->db_txt_start, | |
| 4045 (size_t)(start - dp->db_txt_start)); | |
| 4046 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4047 // adjust pointers of this and following lines |
| 7 | 4048 for (i = idx + 1; i < count; ++i) |
| 4049 dp->db_index[i] -= extra; | |
| 4050 } | |
| 4051 dp->db_index[idx] -= extra; | |
| 4052 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4053 // adjust free space |
| 7 | 4054 dp->db_free -= extra; |
| 4055 dp->db_txt_start -= extra; | |
| 4056 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4057 // copy new line into the data block |
| 7 | 4058 mch_memmove(old_line - extra, new_line, (size_t)new_len); |
| 4059 buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS); | |
|
25636
885fba352580
patch 8.2.3354: build failure with +byte_offset but without +textprop
Bram Moolenaar <Bram@vim.org>
parents:
25624
diff
changeset
|
4060 #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP) |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4061 // The else case is already covered by the insert and delete |
|
25624
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4062 if (buf->b_has_textprop) |
|
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4063 { |
|
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4064 // Do not count the size of any text properties. |
|
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4065 extra += old_prop_len; |
|
25638
960ff2a7d921
patch 8.2.3355: MS-Windows: compiler warning for 64-32 bit conversion
Bram Moolenaar <Bram@vim.org>
parents:
25636
diff
changeset
|
4066 extra -= new_len - (int)STRLEN(new_line) - 1; |
|
25624
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4067 } |
|
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4068 if (extra != 0) |
|
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
4069 ml_updatechunk(buf, lnum, (long)extra, ML_CHNK_UPDLINE); |
| 7 | 4070 #endif |
| 4071 } | |
| 4072 else | |
| 4073 { | |
| 4074 /* | |
| 4075 * Cannot do it in one data block: Delete and append. | |
| 4076 * Append first, because ml_delete_int() cannot delete the | |
| 4077 * last line in a buffer, which causes trouble for a buffer | |
| 4078 * that has only one line. | |
| 4079 * Don't forget to copy the mark! | |
| 4080 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4081 // 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
|
4082 (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
|
4083 ((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
|
4084 #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
|
4085 | ML_APPEND_NOPROP |
|
4bc0bda6857d
patch 8.2.2890: text property duplicated when data block splits
Bram Moolenaar <Bram@vim.org>
parents:
24093
diff
changeset
|
4086 #endif |
|
4bc0bda6857d
patch 8.2.2890: text property duplicated when data block splits
Bram Moolenaar <Bram@vim.org>
parents:
24093
diff
changeset
|
4087 ); |
|
25050
7ef7a211f6bf
patch 8.2.3062: internal error when adding several text properties
Bram Moolenaar <Bram@vim.org>
parents:
24990
diff
changeset
|
4088 (void)ml_delete_int(buf, lnum, ML_DEL_NOPROP); |
| 7 | 4089 } |
| 4090 } | |
| 4091 vim_free(new_line); | |
|
2075
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4092 |
|
903fcd726d90
updated for version 7.2.359
Bram Moolenaar <bram@zimbu.org>
parents:
2003
diff
changeset
|
4093 entered = FALSE; |
| 7 | 4094 } |
|
29340
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
4095 else if (buf->b_ml.ml_flags & ML_ALLOCATED) |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
4096 vim_free(buf->b_ml.ml_line_ptr); |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
4097 |
|
fba9e366ced4
patch 9.0.0013: reproducing memory access errors can be difficult
Bram Moolenaar <Bram@vim.org>
parents:
28984
diff
changeset
|
4098 buf->b_ml.ml_flags &= ~(ML_LINE_DIRTY | ML_ALLOCATED); |
| 7 | 4099 buf->b_ml.ml_line_lnum = 0; |
| 4100 } | |
| 4101 | |
| 4102 /* | |
| 4103 * create a new, empty, data block | |
| 4104 */ | |
| 4105 static bhdr_T * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4106 ml_new_data(memfile_T *mfp, int negative, int page_count) |
| 7 | 4107 { |
| 4108 bhdr_T *hp; | |
| 4109 DATA_BL *dp; | |
| 4110 | |
| 4111 if ((hp = mf_new(mfp, negative, page_count)) == NULL) | |
| 4112 return NULL; | |
| 4113 | |
| 4114 dp = (DATA_BL *)(hp->bh_data); | |
| 4115 dp->db_id = DATA_ID; | |
| 4116 dp->db_txt_start = dp->db_txt_end = page_count * mfp->mf_page_size; | |
| 4117 dp->db_free = dp->db_txt_start - HEADER_SIZE; | |
| 4118 dp->db_line_count = 0; | |
| 4119 | |
| 4120 return hp; | |
| 4121 } | |
| 4122 | |
| 4123 /* | |
| 4124 * create a new, empty, pointer block | |
| 4125 */ | |
| 4126 static bhdr_T * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4127 ml_new_ptr(memfile_T *mfp) |
| 7 | 4128 { |
| 4129 bhdr_T *hp; | |
| 4130 PTR_BL *pp; | |
| 4131 | |
| 4132 if ((hp = mf_new(mfp, FALSE, 1)) == NULL) | |
| 4133 return NULL; | |
| 4134 | |
| 4135 pp = (PTR_BL *)(hp->bh_data); | |
| 4136 pp->pb_id = PTR_ID; | |
| 4137 pp->pb_count = 0; | |
|
2240
6b4879aea261
Add test for gettabvar() and settabvar().
Bram Moolenaar <bram@vim.org>
parents:
2221
diff
changeset
|
4138 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
|
4139 / sizeof(PTR_EN) + 1); |
| 7 | 4140 |
| 4141 return hp; | |
| 4142 } | |
| 4143 | |
| 4144 /* | |
|
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
|
4145 * Lookup line 'lnum' in a memline. |
| 7 | 4146 * |
| 4147 * action: if ML_DELETE or ML_INSERT the line count is updated while searching | |
| 4148 * if ML_FLUSH only flush a locked block | |
| 4149 * if ML_FIND just find the line | |
| 4150 * | |
| 4151 * If the block was found it is locked and put in ml_locked. | |
| 4152 * The stack is updated to lead to the locked block. The ip_high field in | |
| 4153 * the stack is updated to reflect the last line in the block AFTER the | |
| 4154 * insert or delete, also if the pointer block has not been updated yet. But | |
| 1167 | 4155 * if ml_locked != NULL ml_locked_lineadd must be added to ip_high. |
| 7 | 4156 * |
| 4157 * return: NULL for failure, pointer to block header otherwise | |
| 4158 */ | |
| 4159 static bhdr_T * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4160 ml_find_line(buf_T *buf, linenr_T lnum, int action) |
| 7 | 4161 { |
| 4162 DATA_BL *dp; | |
| 4163 PTR_BL *pp; | |
| 4164 infoptr_T *ip; | |
| 4165 bhdr_T *hp; | |
| 4166 memfile_T *mfp; | |
| 4167 linenr_T t; | |
| 4168 blocknr_T bnum, bnum2; | |
| 4169 int dirty; | |
| 4170 linenr_T low, high; | |
| 4171 int top; | |
| 4172 int page_count; | |
| 4173 int idx; | |
| 4174 | |
| 4175 mfp = buf->b_ml.ml_mfp; | |
| 4176 | |
| 4177 /* | |
| 4178 * If there is a locked block check if the wanted line is in it. | |
| 4179 * If not, flush and release the locked block. | |
| 4180 * Don't do this for ML_INSERT_SAME, because the stack need to be updated. | |
| 4181 * Don't do this for ML_FLUSH, because we want to flush the locked block. | |
| 1066 | 4182 * Don't do this when 'swapfile' is reset, we want to load all the blocks. |
| 7 | 4183 */ |
| 4184 if (buf->b_ml.ml_locked) | |
| 4185 { | |
| 1066 | 4186 if (ML_SIMPLE(action) |
| 4187 && buf->b_ml.ml_locked_low <= lnum | |
| 4188 && buf->b_ml.ml_locked_high >= lnum | |
| 4189 && !mf_dont_release) | |
| 7 | 4190 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4191 // remember to update pointer blocks and stack later |
| 7 | 4192 if (action == ML_INSERT) |
| 4193 { | |
| 4194 ++(buf->b_ml.ml_locked_lineadd); | |
| 4195 ++(buf->b_ml.ml_locked_high); | |
| 4196 } | |
| 4197 else if (action == ML_DELETE) | |
| 4198 { | |
| 4199 --(buf->b_ml.ml_locked_lineadd); | |
| 4200 --(buf->b_ml.ml_locked_high); | |
| 4201 } | |
| 4202 return (buf->b_ml.ml_locked); | |
| 4203 } | |
| 4204 | |
| 4205 mf_put(mfp, buf->b_ml.ml_locked, buf->b_ml.ml_flags & ML_LOCKED_DIRTY, | |
| 4206 buf->b_ml.ml_flags & ML_LOCKED_POS); | |
| 4207 buf->b_ml.ml_locked = NULL; | |
| 4208 | |
| 1167 | 4209 /* |
| 4210 * If lines have been added or deleted in the locked block, need to | |
| 4211 * update the line count in pointer blocks. | |
| 4212 */ | |
| 4213 if (buf->b_ml.ml_locked_lineadd != 0) | |
| 7 | 4214 ml_lineadd(buf, buf->b_ml.ml_locked_lineadd); |
| 4215 } | |
| 4216 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4217 if (action == ML_FLUSH) // nothing else to do |
| 7 | 4218 return NULL; |
| 4219 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4220 bnum = 1; // start at the root of the tree |
| 7 | 4221 page_count = 1; |
| 4222 low = 1; | |
| 4223 high = buf->b_ml.ml_line_count; | |
| 4224 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4225 if (action == ML_FIND) // first try stack entries |
| 7 | 4226 { |
| 4227 for (top = buf->b_ml.ml_stack_top - 1; top >= 0; --top) | |
| 4228 { | |
| 4229 ip = &(buf->b_ml.ml_stack[top]); | |
| 4230 if (ip->ip_low <= lnum && ip->ip_high >= lnum) | |
| 4231 { | |
| 4232 bnum = ip->ip_bnum; | |
| 4233 low = ip->ip_low; | |
| 4234 high = ip->ip_high; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4235 buf->b_ml.ml_stack_top = top; // truncate stack at prev entry |
| 7 | 4236 break; |
| 4237 } | |
| 4238 } | |
| 4239 if (top < 0) | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4240 buf->b_ml.ml_stack_top = 0; // not found, start at the root |
| 7 | 4241 } |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4242 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
|
4243 buf->b_ml.ml_stack_top = 0; // start at the root |
| 7 | 4244 |
| 4245 /* | |
| 4246 * search downwards in the tree until a data block is found | |
| 4247 */ | |
| 4248 for (;;) | |
| 4249 { | |
| 4250 if ((hp = mf_get(mfp, bnum, page_count)) == NULL) | |
| 4251 goto error_noblock; | |
| 4252 | |
| 4253 /* | |
| 4254 * update high for insert/delete | |
| 4255 */ | |
| 4256 if (action == ML_INSERT) | |
| 4257 ++high; | |
| 4258 else if (action == ML_DELETE) | |
| 4259 --high; | |
| 4260 | |
| 4261 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
|
4262 if (dp->db_id == DATA_ID) // data block |
| 7 | 4263 { |
| 4264 buf->b_ml.ml_locked = hp; | |
| 4265 buf->b_ml.ml_locked_low = low; | |
| 4266 buf->b_ml.ml_locked_high = high; | |
| 4267 buf->b_ml.ml_locked_lineadd = 0; | |
| 4268 buf->b_ml.ml_flags &= ~(ML_LOCKED_DIRTY | ML_LOCKED_POS); | |
| 4269 return hp; | |
| 4270 } | |
| 4271 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4272 pp = (PTR_BL *)(dp); // must be pointer block |
| 7 | 4273 if (pp->pb_id != PTR_ID) |
| 4274 { | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
4275 iemsg(_(e_pointer_block_id_wrong)); |
| 7 | 4276 goto error_block; |
| 4277 } | |
| 4278 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4279 if ((top = ml_add_stack(buf)) < 0) // add new entry to stack |
| 7 | 4280 goto error_block; |
| 4281 ip = &(buf->b_ml.ml_stack[top]); | |
| 4282 ip->ip_bnum = bnum; | |
| 4283 ip->ip_low = low; | |
| 4284 ip->ip_high = high; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4285 ip->ip_index = -1; // index not known yet |
| 7 | 4286 |
| 4287 dirty = FALSE; | |
| 4288 for (idx = 0; idx < (int)pp->pb_count; ++idx) | |
| 4289 { | |
| 4290 t = pp->pb_pointer[idx].pe_line_count; | |
| 4291 CHECK(t == 0, _("pe_line_count is zero")); | |
| 4292 if ((low += t) > lnum) | |
| 4293 { | |
| 4294 ip->ip_index = idx; | |
| 4295 bnum = pp->pb_pointer[idx].pe_bnum; | |
| 4296 page_count = pp->pb_pointer[idx].pe_page_count; | |
| 4297 high = low - 1; | |
| 4298 low -= t; | |
| 4299 | |
| 4300 /* | |
| 4301 * a negative block number may have been changed | |
| 4302 */ | |
| 4303 if (bnum < 0) | |
| 4304 { | |
| 4305 bnum2 = mf_trans_del(mfp, bnum); | |
| 4306 if (bnum != bnum2) | |
| 4307 { | |
| 4308 bnum = bnum2; | |
| 4309 pp->pb_pointer[idx].pe_bnum = bnum; | |
| 4310 dirty = TRUE; | |
| 4311 } | |
| 4312 } | |
| 4313 | |
| 4314 break; | |
| 4315 } | |
| 4316 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4317 if (idx >= (int)pp->pb_count) // past the end: something wrong! |
| 7 | 4318 { |
| 4319 if (lnum > buf->b_ml.ml_line_count) | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
4320 siemsg(_(e_line_number_out_of_range_nr_past_the_end), |
| 7 | 4321 lnum - buf->b_ml.ml_line_count); |
| 4322 | |
| 4323 else | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
4324 siemsg(_(e_line_count_wrong_in_block_nr), bnum); |
| 7 | 4325 goto error_block; |
| 4326 } | |
| 4327 if (action == ML_DELETE) | |
| 4328 { | |
| 4329 pp->pb_pointer[idx].pe_line_count--; | |
| 4330 dirty = TRUE; | |
| 4331 } | |
| 4332 else if (action == ML_INSERT) | |
| 4333 { | |
| 4334 pp->pb_pointer[idx].pe_line_count++; | |
| 4335 dirty = TRUE; | |
| 4336 } | |
| 4337 mf_put(mfp, hp, dirty, FALSE); | |
| 4338 } | |
| 4339 | |
| 4340 error_block: | |
| 4341 mf_put(mfp, hp, FALSE, FALSE); | |
| 4342 error_noblock: | |
| 2267 | 4343 /* |
| 4344 * If action is ML_DELETE or ML_INSERT we have to correct the tree for | |
| 4345 * the incremented/decremented line counts, because there won't be a line | |
| 4346 * inserted/deleted after all. | |
| 4347 */ | |
| 7 | 4348 if (action == ML_DELETE) |
| 4349 ml_lineadd(buf, 1); | |
| 4350 else if (action == ML_INSERT) | |
| 4351 ml_lineadd(buf, -1); | |
| 4352 buf->b_ml.ml_stack_top = 0; | |
| 4353 return NULL; | |
| 4354 } | |
| 4355 | |
| 4356 /* | |
| 4357 * add an entry to the info pointer stack | |
| 4358 * | |
| 4359 * return -1 for failure, number of the new entry otherwise | |
| 4360 */ | |
| 4361 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4362 ml_add_stack(buf_T *buf) |
| 7 | 4363 { |
| 4364 int top; | |
| 4365 infoptr_T *newstack; | |
| 4366 | |
| 4367 top = buf->b_ml.ml_stack_top; | |
| 4368 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4369 // may have to increase the stack size |
| 7 | 4370 if (top == buf->b_ml.ml_stack_size) |
| 4371 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4372 CHECK(top > 0, _("Stack size increases")); // more than 5 levels??? |
| 7 | 4373 |
|
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
|
4374 newstack = ALLOC_MULT(infoptr_T, buf->b_ml.ml_stack_size + STACK_INCR); |
| 7 | 4375 if (newstack == NULL) |
| 4376 return -1; | |
| 6989 | 4377 if (top > 0) |
| 4378 mch_memmove(newstack, buf->b_ml.ml_stack, | |
| 1624 | 4379 (size_t)top * sizeof(infoptr_T)); |
| 7 | 4380 vim_free(buf->b_ml.ml_stack); |
| 4381 buf->b_ml.ml_stack = newstack; | |
| 4382 buf->b_ml.ml_stack_size += STACK_INCR; | |
| 4383 } | |
| 4384 | |
| 4385 buf->b_ml.ml_stack_top++; | |
| 4386 return top; | |
| 4387 } | |
| 4388 | |
| 4389 /* | |
| 4390 * Update the pointer blocks on the stack for inserted/deleted lines. | |
| 4391 * The stack itself is also updated. | |
| 4392 * | |
| 4393 * When a insert/delete line action fails, the line is not inserted/deleted, | |
| 4394 * but the pointer blocks have already been updated. That is fixed here by | |
| 4395 * walking through the stack. | |
| 4396 * | |
| 4397 * Count is the number of lines added, negative if lines have been deleted. | |
| 4398 */ | |
| 4399 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4400 ml_lineadd(buf_T *buf, int count) |
| 7 | 4401 { |
| 4402 int idx; | |
| 4403 infoptr_T *ip; | |
| 4404 PTR_BL *pp; | |
| 4405 memfile_T *mfp = buf->b_ml.ml_mfp; | |
| 4406 bhdr_T *hp; | |
| 4407 | |
| 4408 for (idx = buf->b_ml.ml_stack_top - 1; idx >= 0; --idx) | |
| 4409 { | |
| 4410 ip = &(buf->b_ml.ml_stack[idx]); | |
| 4411 if ((hp = mf_get(mfp, ip->ip_bnum, 1)) == NULL) | |
| 4412 break; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4413 pp = (PTR_BL *)(hp->bh_data); // must be pointer block |
| 7 | 4414 if (pp->pb_id != PTR_ID) |
| 4415 { | |
| 4416 mf_put(mfp, hp, FALSE, FALSE); | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
4417 iemsg(_(e_pointer_block_id_wrong_two)); |
| 7 | 4418 break; |
| 4419 } | |
| 4420 pp->pb_pointer[ip->ip_index].pe_line_count += count; | |
| 4421 ip->ip_high += count; | |
| 4422 mf_put(mfp, hp, TRUE, FALSE); | |
| 4423 } | |
| 4424 } | |
| 4425 | |
|
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4426 #if defined(HAVE_READLINK) || defined(PROTO) |
| 594 | 4427 /* |
| 4428 * Resolve a symlink in the last component of a file name. | |
| 4429 * Note that f_resolve() does it for every part of the path, we don't do that | |
| 4430 * here. | |
| 4431 * If it worked returns OK and the resolved link in "buf[MAXPATHL]". | |
| 4432 * Otherwise returns FAIL. | |
| 4433 */ | |
|
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4434 int |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4435 resolve_symlink(char_u *fname, char_u *buf) |
| 594 | 4436 { |
| 4437 char_u tmp[MAXPATHL]; | |
| 4438 int ret; | |
| 4439 int depth = 0; | |
| 4440 | |
| 4441 if (fname == NULL) | |
| 4442 return FAIL; | |
| 4443 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4444 // Put the result so far in tmp[], starting with the original name. |
| 594 | 4445 vim_strncpy(tmp, fname, MAXPATHL - 1); |
| 4446 | |
| 4447 for (;;) | |
| 4448 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4449 // Limit symlink depth to 100, catch recursive loops. |
| 594 | 4450 if (++depth == 100) |
| 4451 { | |
|
26958
d92e0d85923f
patch 8.2.4008: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26909
diff
changeset
|
4452 semsg(_(e_symlink_loop_for_str), fname); |
| 594 | 4453 return FAIL; |
| 4454 } | |
| 4455 | |
| 4456 ret = readlink((char *)tmp, (char *)buf, MAXPATHL - 1); | |
| 4457 if (ret <= 0) | |
| 4458 { | |
| 619 | 4459 if (errno == EINVAL || errno == ENOENT) |
| 594 | 4460 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4461 // 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
|
4462 // 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
|
4463 // call to vim_FullName(). |
| 594 | 4464 if (depth == 1) |
| 4465 return FAIL; | |
| 4466 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4467 // Use the resolved name in tmp[]. |
| 594 | 4468 break; |
| 4469 } | |
| 4470 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4471 // There must be some error reading links, use original name. |
| 594 | 4472 return FAIL; |
| 4473 } | |
| 4474 buf[ret] = NUL; | |
| 4475 | |
| 4476 /* | |
| 4477 * Check whether the symlink is relative or absolute. | |
| 4478 * If it's relative, build a new path based on the directory | |
| 4479 * portion of the filename (if any) and the path the symlink | |
| 4480 * points to. | |
| 4481 */ | |
| 4482 if (mch_isFullName(buf)) | |
| 4483 STRCPY(tmp, buf); | |
| 4484 else | |
| 4485 { | |
| 4486 char_u *tail; | |
| 4487 | |
| 4488 tail = gettail(tmp); | |
| 4489 if (STRLEN(tail) + STRLEN(buf) >= MAXPATHL) | |
| 4490 return FAIL; | |
| 4491 STRCPY(tail, buf); | |
| 4492 } | |
| 4493 } | |
| 4494 | |
| 4495 /* | |
| 4496 * Try to resolve the full name of the file so that the swapfile name will | |
| 4497 * be consistent even when opening a relative symlink from different | |
| 4498 * working directories. | |
| 4499 */ | |
| 4500 return vim_FullName(tmp, buf, MAXPATHL, TRUE); | |
| 4501 } | |
| 4502 #endif | |
| 4503 | |
| 7 | 4504 /* |
| 460 | 4505 * Make swap file name out of the file name and a directory name. |
| 4506 * Returns pointer to allocated memory or NULL. | |
| 7 | 4507 */ |
| 460 | 4508 char_u * |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4509 makeswapname( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4510 char_u *fname, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4511 char_u *ffname UNUSED, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4512 buf_T *buf, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4513 char_u *dir_name) |
| 7 | 4514 { |
| 4515 char_u *r, *s; | |
|
2145
de0e7ca61893
updated for version 7.2.427
Bram Moolenaar <bram@zimbu.org>
parents:
2108
diff
changeset
|
4516 char_u *fname_res = fname; |
| 594 | 4517 #ifdef HAVE_READLINK |
| 4518 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
|
4519 |
|
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
4520 // 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
|
4521 // 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
|
4522 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
|
4523 fname_res = fname_buf; |
| 594 | 4524 #endif |
| 7 | 4525 |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
4526 #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
|
4527 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
|
4528 |
|
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
4529 s = dir_name + len; |
|
d513b653f5d0
patch 8.0.0337: invalid memory access in :recover command
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
4530 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
|
4531 { // Ends with '//', Use Full path |
| 7 | 4532 r = NULL; |
|
21337
647897e6df9e
patch 8.2.1219: symlink not followed if dirname ends in //
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
4533 if ((s = make_percent_swname(dir_name, fname_res)) != NULL) |
| 7 | 4534 { |
| 4535 r = modname(s, (char_u *)".swp", FALSE); | |
| 4536 vim_free(s); | |
| 4537 } | |
| 4538 return r; | |
| 4539 } | |
| 4540 #endif | |
| 4541 | |
| 4542 r = buf_modname( | |
| 4543 (buf->b_p_sn || buf->b_shortname), | |
| 594 | 4544 fname_res, |
| 7 | 4545 (char_u *) |
| 2823 | 4546 #if defined(VMS) |
| 7 | 4547 "_swp", |
| 4548 #else | |
| 4549 ".swp", | |
| 4550 #endif | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4551 // 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
|
4552 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
|
4553 if (r == NULL) // out of memory |
| 7 | 4554 return NULL; |
| 4555 | |
| 4556 s = get_file_in_dir(r, dir_name); | |
| 4557 vim_free(r); | |
| 4558 return s; | |
| 4559 } | |
| 4560 | |
| 4561 /* | |
| 4562 * Get file name to use for swap file or backup file. | |
| 4563 * Use the name of the edited file "fname" and an entry in the 'dir' or 'bdir' | |
| 4564 * option "dname". | |
| 4565 * - If "dname" is ".", return "fname" (swap file in dir of file). | |
| 4566 * - If "dname" starts with "./", insert "dname" in "fname" (swap file | |
| 4567 * relative to dir of file). | |
| 4568 * - Otherwise, prepend "dname" to the tail of "fname" (swap file in specific | |
| 4569 * dir). | |
| 4570 * | |
| 4571 * The return value is an allocated string and can be NULL. | |
| 4572 */ | |
| 4573 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4574 get_file_in_dir( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4575 char_u *fname, |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4576 char_u *dname) // don't use "dirname", it is a global for Alpha |
| 7 | 4577 { |
| 4578 char_u *t; | |
| 4579 char_u *tail; | |
| 4580 char_u *retval; | |
| 4581 int save_char; | |
| 4582 | |
| 4583 tail = gettail(fname); | |
| 4584 | |
| 4585 if (dname[0] == '.' && dname[1] == NUL) | |
| 4586 retval = vim_strsave(fname); | |
| 4587 else if (dname[0] == '.' && vim_ispathsep(dname[1])) | |
| 4588 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4589 if (tail == fname) // no path before file name |
| 7 | 4590 retval = concat_fnames(dname + 2, tail, TRUE); |
| 4591 else | |
| 4592 { | |
| 4593 save_char = *tail; | |
| 4594 *tail = NUL; | |
| 4595 t = concat_fnames(fname, dname + 2, TRUE); | |
| 4596 *tail = save_char; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4597 if (t == NULL) // out of memory |
| 7 | 4598 retval = NULL; |
| 4599 else | |
| 4600 { | |
| 4601 retval = concat_fnames(t, tail, TRUE); | |
| 4602 vim_free(t); | |
| 4603 } | |
| 4604 } | |
| 4605 } | |
| 4606 else | |
| 4607 retval = concat_fnames(dname, tail, TRUE); | |
| 4608 | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
4609 #ifdef MSWIN |
| 5432 | 4610 if (retval != NULL) |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10996
diff
changeset
|
4611 for (t = gettail(retval); *t != NUL; MB_PTR_ADV(t)) |
| 5432 | 4612 if (*t == ':') |
| 4613 *t = '%'; | |
| 4614 #endif | |
| 4615 | |
| 7 | 4616 return retval; |
| 4617 } | |
| 4618 | |
| 580 | 4619 /* |
| 4620 * Print the ATTENTION message: info about an existing swap file. | |
| 4621 */ | |
| 4622 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4623 attention_message( |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4624 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
|
4625 char_u *fname) // swap file name |
| 580 | 4626 { |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
4627 stat_T st; |
|
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
4628 time_t swap_mtime; |
| 580 | 4629 |
| 4630 ++no_wait_return; | |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
4631 (void)emsg(_(e_attention)); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4632 msg_puts(_("\nFound a swap file by the name \"")); |
| 580 | 4633 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
|
4634 msg_puts("\"\n"); |
|
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
4635 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
|
4636 msg_puts(_("While opening file \"")); |
| 580 | 4637 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
|
4638 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
|
4639 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
|
4640 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4641 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
|
4642 } |
|
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
|
4643 else |
| 580 | 4644 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4645 msg_puts(_(" dated: ")); |
|
16621
7ad3fc329e08
patch 8.1.1313: warnings for using localtime() and ctime()
Bram Moolenaar <Bram@vim.org>
parents:
16455
diff
changeset
|
4646 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
|
4647 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
|
4648 msg_puts(_(" NEWER than swap file!\n")); |
| 580 | 4649 } |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4650 // 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
|
4651 // other languages. |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4652 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
|
4653 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
|
4654 msg_puts(_(" If this is the case, use \":recover\" or \"vim -r ")); |
| 580 | 4655 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
|
4656 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
|
4657 msg_puts(_(" If you did this already, delete the swap file \"")); |
| 580 | 4658 msg_outtrans(fname); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4659 msg_puts(_("\"\n to avoid this message.\n")); |
| 580 | 4660 cmdline_row = msg_row; |
| 4661 --no_wait_return; | |
| 4662 } | |
| 4663 | |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4664 typedef enum { |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4665 SEA_CHOICE_NONE = 0, |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4666 SEA_CHOICE_READONLY = 1, |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4667 SEA_CHOICE_EDIT = 2, |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4668 SEA_CHOICE_RECOVER = 3, |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4669 SEA_CHOICE_DELETE = 4, |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4670 SEA_CHOICE_QUIT = 5, |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4671 SEA_CHOICE_ABORT = 6 |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4672 } sea_choice_T; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4673 |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
4674 #if defined(FEAT_EVAL) |
| 580 | 4675 /* |
| 4676 * Trigger the SwapExists autocommands. | |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4677 * Returns a value for equivalent to do_dialog(). |
| 580 | 4678 */ |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4679 static sea_choice_T |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4680 do_swapexists(buf_T *buf, char_u *fname) |
| 580 | 4681 { |
| 4682 set_vim_var_string(VV_SWAPNAME, fname, -1); | |
| 4683 set_vim_var_string(VV_SWAPCHOICE, NULL, -1); | |
| 4684 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4685 // 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
|
4686 // edited. Disallow changing directory here. |
| 1856 | 4687 ++allbuf_lock; |
| 580 | 4688 apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL); |
| 1856 | 4689 --allbuf_lock; |
| 580 | 4690 |
| 4691 set_vim_var_string(VV_SWAPNAME, NULL, -1); | |
| 4692 | |
| 4693 switch (*get_vim_var_str(VV_SWAPCHOICE)) | |
| 4694 { | |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4695 case 'o': return SEA_CHOICE_READONLY; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4696 case 'e': return SEA_CHOICE_EDIT; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4697 case 'r': return SEA_CHOICE_RECOVER; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4698 case 'd': return SEA_CHOICE_DELETE; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4699 case 'q': return SEA_CHOICE_QUIT; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4700 case 'a': return SEA_CHOICE_ABORT; |
| 580 | 4701 } |
| 4702 | |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
4703 return SEA_CHOICE_NONE; |
| 580 | 4704 } |
| 4705 #endif | |
| 4706 | |
| 7 | 4707 /* |
| 4708 * Find out what name to use for the swap file for buffer 'buf'. | |
| 4709 * | |
| 4710 * Several names are tried to find one that does not exist | |
| 460 | 4711 * Returns the name in allocated memory or NULL. |
| 3158 | 4712 * When out of memory "dirp" is set to NULL. |
| 7 | 4713 * |
| 4714 * 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
|
4715 * not being able to open the swap or undo file |
| 1856 | 4716 * Note: May trigger SwapExists autocmd, pointers may change! |
| 7 | 4717 */ |
| 4718 static char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4719 findswapname( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4720 buf_T *buf, |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4721 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
|
4722 char_u *old_fname) // don't give warning for this file name |
| 7 | 4723 { |
| 4724 char_u *fname; | |
| 4725 int n; | |
| 4726 char_u *dir_name; | |
| 4727 #ifdef AMIGA | |
| 4728 BPTR fh; | |
| 4729 #endif | |
| 4730 int r; | |
| 5432 | 4731 char_u *buf_fname = buf->b_fname; |
| 7 | 4732 |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
4733 #if !defined(UNIX) |
| 7 | 4734 # define CREATE_DUMMY_FILE |
| 4735 FILE *dummyfd = NULL; | |
| 4736 | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
4737 # ifdef MSWIN |
| 5432 | 4738 if (buf_fname != NULL && !mch_isFullName(buf_fname) |
| 4739 && vim_strchr(gettail(buf_fname), ':')) | |
| 4740 { | |
| 4741 char_u *t; | |
| 4742 | |
| 4743 buf_fname = vim_strsave(buf_fname); | |
| 4744 if (buf_fname == NULL) | |
| 4745 buf_fname = buf->b_fname; | |
| 4746 else | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10996
diff
changeset
|
4747 for (t = gettail(buf_fname); *t != NUL; MB_PTR_ADV(t)) |
| 5432 | 4748 if (*t == ':') |
| 4749 *t = '%'; | |
| 4750 } | |
| 4751 # endif | |
| 4752 | |
|
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4753 /* |
|
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4754 * 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
|
4755 * 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
|
4756 * "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
|
4757 * this problem we temporarily create "test.doc". Don't do this when the |
|
26771
fc859aea8cec
patch 8.2.3914: various spelling mistakes in comments
Bram Moolenaar <Bram@vim.org>
parents:
26286
diff
changeset
|
4758 * check below for an 8.3 file name is used. |
|
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4759 */ |
| 5432 | 4760 if (!(buf->b_p_sn || buf->b_shortname) && buf_fname != NULL |
| 4761 && mch_getperm(buf_fname) < 0) | |
| 4762 dummyfd = mch_fopen((char *)buf_fname, "w"); | |
| 7 | 4763 #endif |
| 4764 | |
|
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4765 /* |
|
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4766 * 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
|
4767 * 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
|
4768 */ |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
4769 dir_name = alloc(STRLEN(*dirp) + 1); |
| 3158 | 4770 if (dir_name == NULL) |
| 4771 *dirp = NULL; | |
| 4772 else | |
| 7 | 4773 (void)copy_option_part(dirp, dir_name, 31000, ","); |
| 4774 | |
|
2214
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4775 /* |
|
f8222d1f9a73
Included patch for persistent undo. Lots of changes and added test.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
4776 * 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
|
4777 */ |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4778 if (dir_name == NULL) // out of memory |
| 7 | 4779 fname = NULL; |
| 4780 else | |
| 5432 | 4781 fname = makeswapname(buf_fname, buf->b_ffname, buf, dir_name); |
| 7 | 4782 |
| 4783 for (;;) | |
| 4784 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4785 if (fname == NULL) // must be out of memory |
| 7 | 4786 break; |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4787 if ((n = (int)STRLEN(fname)) == 0) // safety check |
| 7 | 4788 { |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12975
diff
changeset
|
4789 VIM_CLEAR(fname); |
| 7 | 4790 break; |
| 4791 } | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7961
diff
changeset
|
4792 #if defined(UNIX) |
| 7 | 4793 /* |
| 4794 * Some systems have a MS-DOS compatible filesystem that use 8.3 character | |
| 4795 * file names. If this is the first try and the swap file name does not fit in | |
| 4796 * 8.3, detect if this is the case, set shortname and try again. | |
| 4797 */ | |
| 4798 if (fname[n - 2] == 'w' && fname[n - 1] == 'p' | |
| 4799 && !(buf->b_p_sn || buf->b_shortname)) | |
| 4800 { | |
| 4801 char_u *tail; | |
| 4802 char_u *fname2; | |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
4803 stat_T s1, s2; |
| 7 | 4804 int f1, f2; |
| 4805 int created1 = FALSE, created2 = FALSE; | |
| 4806 int same = FALSE; | |
| 4807 | |
| 4808 /* | |
| 4809 * Check if swapfile name does not fit in 8.3: | |
| 4810 * It either contains two dots, is longer than 8 chars, or starts | |
| 4811 * with a dot. | |
| 4812 */ | |
| 5432 | 4813 tail = gettail(buf_fname); |
| 7 | 4814 if ( vim_strchr(tail, '.') != NULL |
| 4815 || STRLEN(tail) > (size_t)8 | |
| 4816 || *gettail(fname) == '.') | |
| 4817 { | |
| 4818 fname2 = alloc(n + 2); | |
| 4819 if (fname2 != NULL) | |
| 4820 { | |
| 4821 STRCPY(fname2, fname); | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4822 // 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
|
4823 // 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
|
4824 // if fname == "123456789.swp", fname2 = "12345678x.swp" |
| 7 | 4825 if (vim_strchr(tail, '.') != NULL) |
| 4826 fname2[n - 1] = 'x'; | |
| 4827 else if (*gettail(fname) == '.') | |
| 4828 { | |
| 4829 fname2[n] = 'x'; | |
| 4830 fname2[n + 1] = NUL; | |
| 4831 } | |
| 4832 else | |
| 4833 fname2[n - 5] += 1; | |
| 4834 /* | |
| 4835 * may need to create the files to be able to use mch_stat() | |
| 4836 */ | |
| 4837 f1 = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0); | |
| 4838 if (f1 < 0) | |
| 4839 { | |
| 4840 f1 = mch_open_rw((char *)fname, | |
| 4841 O_RDWR|O_CREAT|O_EXCL|O_EXTRA); | |
| 4842 created1 = TRUE; | |
| 4843 } | |
| 4844 if (f1 >= 0) | |
| 4845 { | |
| 4846 f2 = mch_open((char *)fname2, O_RDONLY | O_EXTRA, 0); | |
| 4847 if (f2 < 0) | |
| 4848 { | |
| 4849 f2 = mch_open_rw((char *)fname2, | |
| 4850 O_RDWR|O_CREAT|O_EXCL|O_EXTRA); | |
| 4851 created2 = TRUE; | |
| 4852 } | |
| 4853 if (f2 >= 0) | |
| 4854 { | |
| 4855 /* | |
| 4856 * Both files exist now. If mch_stat() returns the | |
| 4857 * same device and inode they are the same file. | |
| 4858 */ | |
| 4859 if (mch_fstat(f1, &s1) != -1 | |
| 4860 && mch_fstat(f2, &s2) != -1 | |
| 4861 && s1.st_dev == s2.st_dev | |
| 4862 && s1.st_ino == s2.st_ino) | |
| 4863 same = TRUE; | |
| 4864 close(f2); | |
| 4865 if (created2) | |
| 4866 mch_remove(fname2); | |
| 4867 } | |
| 4868 close(f1); | |
| 4869 if (created1) | |
| 4870 mch_remove(fname); | |
| 4871 } | |
| 4872 vim_free(fname2); | |
| 4873 if (same) | |
| 4874 { | |
| 4875 buf->b_shortname = TRUE; | |
| 4876 vim_free(fname); | |
| 5432 | 4877 fname = makeswapname(buf_fname, buf->b_ffname, |
| 460 | 4878 buf, dir_name); |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4879 continue; // try again with b_shortname set |
| 7 | 4880 } |
| 4881 } | |
| 4882 } | |
| 4883 } | |
| 4884 #endif | |
| 4885 /* | |
| 4886 * check if the swapfile already exists | |
| 4887 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4888 if (mch_getperm(fname) < 0) // it does not exist |
| 7 | 4889 { |
| 4890 #ifdef HAVE_LSTAT | |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
4891 stat_T sb; |
| 7 | 4892 |
| 4893 /* | |
| 4894 * Extra security check: When a swap file is a symbolic link, this | |
| 4895 * is most likely a symlink attack. | |
| 4896 */ | |
| 4897 if (mch_lstat((char *)fname, &sb) < 0) | |
| 4898 #else | |
| 4899 # ifdef AMIGA | |
| 4900 fh = Open((UBYTE *)fname, (long)MODE_NEWFILE); | |
| 4901 /* | |
| 4902 * on the Amiga mch_getperm() will return -1 when the file exists | |
| 4903 * but is being used by another program. This happens if you edit | |
| 4904 * a file twice. | |
| 4905 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4906 if (fh != (BPTR)NULL) // can open file, OK |
| 7 | 4907 { |
| 4908 Close(fh); | |
| 4909 mch_remove(fname); | |
| 4910 break; | |
| 4911 } | |
| 4912 if (IoErr() != ERROR_OBJECT_IN_USE | |
| 4913 && IoErr() != ERROR_OBJECT_EXISTS) | |
| 4914 # endif | |
| 4915 #endif | |
| 4916 break; | |
| 4917 } | |
| 4918 | |
| 4919 /* | |
| 4920 * A file name equal to old_fname is OK to use. | |
| 4921 */ | |
| 4922 if (old_fname != NULL && fnamecmp(fname, old_fname) == 0) | |
| 4923 break; | |
| 4924 | |
| 4925 /* | |
| 4926 * get here when file already exists | |
| 4927 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4928 if (fname[n - 2] == 'w' && fname[n - 1] == 'p') // first try |
| 7 | 4929 { |
| 4930 /* | |
| 4931 * on MS-DOS compatible filesystems (e.g. messydos) file.doc.swp | |
| 4932 * and file.doc are the same file. To guess if this problem is | |
| 4933 * present try if file.doc.swx exists. If it does, we set | |
| 4934 * buf->b_shortname and try file_doc.swp (dots replaced by | |
| 4935 * underscores for this file), and try again. If it doesn't we | |
| 4936 * assume that "file.doc.swp" already exists. | |
| 4937 */ | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4938 if (!(buf->b_p_sn || buf->b_shortname)) // not tried yet |
| 7 | 4939 { |
| 4940 fname[n - 1] = 'x'; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4941 r = mch_getperm(fname); // try "file.swx" |
| 7 | 4942 fname[n - 1] = 'p'; |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4943 if (r >= 0) // "file.swx" seems to exist |
| 7 | 4944 { |
| 4945 buf->b_shortname = TRUE; | |
| 4946 vim_free(fname); | |
| 5432 | 4947 fname = makeswapname(buf_fname, buf->b_ffname, |
| 460 | 4948 buf, dir_name); |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4949 continue; // try again with '.' replaced with '_' |
| 7 | 4950 } |
| 4951 } | |
| 4952 /* | |
| 4953 * If we get here the ".swp" file really exists. | |
| 4954 * Give an error message, unless recovering, no file name, we are | |
| 4955 * viewing a help file or when the path of the file is different | |
| 4956 * (happens when all .swp files are in one directory). | |
| 4957 */ | |
| 5432 | 4958 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
|
4959 && !buf->b_help |
|
5278e5a2a4e3
patch 8.1.1813: ATTENTION prompt for a preview popup window
Bram Moolenaar <Bram@vim.org>
parents:
17454
diff
changeset
|
4960 && !(buf->b_flags & (BF_DUMMY | BF_NO_SEA))) |
| 7 | 4961 { |
| 4962 int fd; | |
| 4963 struct block0 b0; | |
| 4964 int differ = FALSE; | |
| 4965 | |
| 4966 /* | |
| 4967 * Try to read block 0 from the swap file to get the original | |
| 4968 * file name (and inode number). | |
| 4969 */ | |
| 4970 fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0); | |
| 4971 if (fd >= 0) | |
| 4972 { | |
| 2664 | 4973 if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0)) |
| 7 | 4974 { |
| 4975 /* | |
| 39 | 4976 * If the swapfile has the same directory as the |
| 4977 * buffer don't compare the directory names, they can | |
| 4978 * have a different mountpoint. | |
| 7 | 4979 */ |
| 39 | 4980 if (b0.b0_flags & B0_SAME_DIR) |
| 4981 { | |
| 4982 if (fnamecmp(gettail(buf->b_ffname), | |
| 4983 gettail(b0.b0_fname)) != 0 | |
| 4984 || !same_directory(fname, buf->b_ffname)) | |
| 594 | 4985 { |
| 4986 #ifdef CHECK_INODE | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4987 // 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
|
4988 // 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
|
4989 // inode too. |
| 594 | 4990 expand_env(b0.b0_fname, NameBuff, MAXPATHL); |
| 4991 if (fnamecmp_ino(buf->b_ffname, NameBuff, | |
| 4992 char_to_long(b0.b0_ino))) | |
| 4993 #endif | |
| 4994 differ = TRUE; | |
| 4995 } | |
| 39 | 4996 } |
| 4997 else | |
| 4998 { | |
| 4999 /* | |
| 5000 * The name in the swap file may be | |
| 5001 * "~user/path/file". Expand it first. | |
| 5002 */ | |
| 5003 expand_env(b0.b0_fname, NameBuff, MAXPATHL); | |
| 7 | 5004 #ifdef CHECK_INODE |
| 39 | 5005 if (fnamecmp_ino(buf->b_ffname, NameBuff, |
| 594 | 5006 char_to_long(b0.b0_ino))) |
| 39 | 5007 differ = TRUE; |
| 7 | 5008 #else |
| 39 | 5009 if (fnamecmp(NameBuff, buf->b_ffname) != 0) |
| 5010 differ = TRUE; | |
| 7 | 5011 #endif |
| 39 | 5012 } |
| 7 | 5013 } |
| 5014 close(fd); | |
| 5015 } | |
| 5016 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5017 // 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
|
5018 // for the current file, and the buffer was not recovered. |
| 7 | 5019 if (differ == FALSE && !(curbuf->b_flags & BF_RECOVERED) |
| 5020 && vim_strchr(p_shm, SHM_ATTENTION) == NULL) | |
| 5021 { | |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5022 sea_choice_T choice = SEA_CHOICE_NONE; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5023 stat_T st; |
| 7 | 5024 #ifdef CREATE_DUMMY_FILE |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5025 int did_use_dummy = FALSE; |
| 7 | 5026 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5027 // 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
|
5028 // 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
|
5029 // 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
|
5030 // here if the window is closed. |
| 7 | 5031 if (dummyfd != NULL) |
| 5032 { | |
| 5033 fclose(dummyfd); | |
| 5034 dummyfd = NULL; | |
| 5432 | 5035 mch_remove(buf_fname); |
| 7 | 5036 did_use_dummy = TRUE; |
| 5037 } | |
| 5038 #endif | |
| 5039 | |
|
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 = FALSE; |
| 5042 #endif | |
|
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5043 // 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
|
5044 // - the edited file exists |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5045 // - 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
|
5046 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
|
5047 && swapfile_unchanged(fname)) |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5048 { |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5049 choice = SEA_CHOICE_DELETE; |
|
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5050 if (p_verbose > 0) |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5051 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
|
5052 } |
|
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5053 |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
5054 #if defined(FEAT_EVAL) |
| 580 | 5055 /* |
| 5056 * If there is an SwapExists autocommand and we can handle | |
| 5057 * the response, trigger it. It may return 0 to ask the | |
| 5058 * user anyway. | |
| 5059 */ | |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5060 if (choice == SEA_CHOICE_NONE |
|
16453
4e9bea9b8025
patch 8.1.1231: asking about existing swap file unnecessarily
Bram Moolenaar <Bram@vim.org>
parents:
16451
diff
changeset
|
5061 && swap_exists_action != SEA_NONE |
| 5432 | 5062 && has_autocmd(EVENT_SWAPEXISTS, buf_fname, buf)) |
| 580 | 5063 choice = do_swapexists(buf, fname); |
| 5064 #endif | |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5065 |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5066 if (choice == SEA_CHOICE_NONE |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5067 && swap_exists_action == SEA_READONLY) |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5068 { |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5069 // always open readonly. |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5070 choice = SEA_CHOICE_READONLY; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5071 } |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5072 |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5073 if (choice == SEA_CHOICE_NONE) |
| 7 | 5074 { |
| 580 | 5075 #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
|
5076 // 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
|
5077 // 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
|
5078 // 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
|
5079 // loading a session from the .gvimrc file. |
| 580 | 5080 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
|
5081 gui_start(NULL); |
| 580 | 5082 #endif |
|
14903
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5083 // Show info about the existing swap file. |
| 580 | 5084 attention_message(buf, fname); |
| 5085 | |
|
14903
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5086 // 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
|
5087 // interrupt loading a file. |
| 580 | 5088 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
|
5089 |
|
c1ee9f32bec3
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5090 // 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
|
5091 // interfere with the prompt here. |
|
14909
c97b4b537572
patch 8.1.0466: autocmd test fails
Bram Moolenaar <Bram@vim.org>
parents:
14903
diff
changeset
|
5092 flush_buffers(FLUSH_TYPEAHEAD); |
| 7 | 5093 } |
| 5094 | |
| 5095 #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) | |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5096 if (swap_exists_action != SEA_NONE |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5097 && choice == SEA_CHOICE_NONE) |
| 7 | 5098 { |
| 5099 char_u *name; | |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5100 int dialog_result; |
| 7 | 5101 |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
5102 name = alloc(STRLEN(fname) |
| 7 | 5103 + 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
|
5104 + STRLEN(_("\" already exists!")) + 5); |
| 7 | 5105 if (name != NULL) |
| 5106 { | |
| 5107 STRCPY(name, _("Swap file \"")); | |
| 5108 home_replace(NULL, fname, name + STRLEN(name), | |
| 5109 1000, TRUE); | |
| 5110 STRCAT(name, _("\" already exists!")); | |
| 5111 } | |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5112 dialog_result = do_dialog(VIM_WARNING, |
| 7 | 5113 (char_u *)_("VIM - ATTENTION"), |
| 5114 name == NULL | |
| 5115 ? (char_u *)_("Swap file already exists!") | |
| 5116 : name, | |
|
16455
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
5117 # ifdef HAVE_PROCESS_STILL_RUNNING |
| 7 | 5118 process_still_running |
| 5119 ? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") : | |
| 5120 # endif | |
| 2684 | 5121 (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL, FALSE); |
| 580 | 5122 |
|
16455
1ae13586edf8
patch 8.1.1232: can't build on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents:
16453
diff
changeset
|
5123 # ifdef HAVE_PROCESS_STILL_RUNNING |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5124 if (process_still_running && dialog_result >= 4) |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5125 // compensate for missing "Delete it" button |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5126 dialog_result++; |
| 580 | 5127 # endif |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5128 choice = dialog_result; |
| 580 | 5129 vim_free(name); |
| 5130 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5131 // pretend screen didn't scroll, need redraw anyway |
| 580 | 5132 msg_scrolled = 0; |
| 5133 redraw_all_later(NOT_VALID); | |
| 5134 } | |
| 5135 #endif | |
| 5136 | |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5137 switch (choice) |
| 580 | 5138 { |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5139 case SEA_CHOICE_READONLY: |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5140 buf->b_p_ro = TRUE; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5141 break; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5142 case SEA_CHOICE_EDIT: |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5143 break; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5144 case SEA_CHOICE_RECOVER: |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5145 swap_exists_action = SEA_RECOVER; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5146 break; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5147 case SEA_CHOICE_DELETE: |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5148 mch_remove(fname); |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5149 break; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5150 case SEA_CHOICE_QUIT: |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5151 swap_exists_action = SEA_QUIT; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5152 break; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5153 case SEA_CHOICE_ABORT: |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5154 swap_exists_action = SEA_QUIT; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5155 got_int = TRUE; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5156 break; |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5157 case SEA_CHOICE_NONE: |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5158 msg_puts("\n"); |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5159 if (msg_silent == 0) |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5160 // call wait_return() later |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5161 need_wait_return = TRUE; |
| 7 | 5162 break; |
| 5163 } | |
|
28319
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5164 |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5165 // If the file was deleted this fname can be used. |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5166 if (choice != SEA_CHOICE_NONE && mch_getperm(fname) < 0) |
|
427600f3b1c5
patch 8.2.4685: when a swap file is found for a popup there is no dialog
Bram Moolenaar <Bram@vim.org>
parents:
28175
diff
changeset
|
5167 break; |
| 7 | 5168 |
| 5169 #ifdef CREATE_DUMMY_FILE | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5170 // Going to try another name, need the dummy file again. |
| 7 | 5171 if (did_use_dummy) |
| 5432 | 5172 dummyfd = mch_fopen((char *)buf_fname, "w"); |
| 7 | 5173 #endif |
| 5174 } | |
| 5175 } | |
| 5176 } | |
| 5177 | |
| 5178 /* | |
| 5179 * Change the ".swp" extension to find another file that can be used. | |
| 5180 * First decrement the last char: ".swo", ".swn", etc. | |
| 5181 * If that still isn't enough decrement the last but one char: ".svz" | |
| 9 | 5182 * Can happen when editing many "No Name" buffers. |
| 7 | 5183 */ |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5184 if (fname[n - 1] == 'a') // ".s?a" |
| 7 | 5185 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5186 if (fname[n - 2] == 'a') // ".saa": tried enough, give up |
| 7 | 5187 { |
|
26909
aa65d1808bd0
patch 8.2.3983: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
5188 emsg(_(e_too_many_swap_files_found)); |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12975
diff
changeset
|
5189 VIM_CLEAR(fname); |
| 7 | 5190 break; |
| 5191 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5192 --fname[n - 2]; // ".svz", ".suz", etc. |
| 7 | 5193 fname[n - 1] = 'z' + 1; |
| 5194 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5195 --fname[n - 1]; // ".swo", ".swn", etc. |
| 7 | 5196 } |
| 5197 | |
| 5198 vim_free(dir_name); | |
| 5199 #ifdef CREATE_DUMMY_FILE | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5200 if (dummyfd != NULL) // file has been created temporarily |
| 7 | 5201 { |
| 5202 fclose(dummyfd); | |
| 5432 | 5203 mch_remove(buf_fname); |
| 7 | 5204 } |
| 5205 #endif | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
5206 #ifdef MSWIN |
| 5432 | 5207 if (buf_fname != buf->b_fname) |
| 5208 vim_free(buf_fname); | |
| 5209 #endif | |
| 7 | 5210 return fname; |
| 5211 } | |
| 5212 | |
| 5213 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5214 b0_magic_wrong(ZERO_BL *b0p) |
| 7 | 5215 { |
| 5216 return (b0p->b0_magic_long != (long)B0_MAGIC_LONG | |
| 5217 || b0p->b0_magic_int != (int)B0_MAGIC_INT | |
| 5218 || b0p->b0_magic_short != (short)B0_MAGIC_SHORT | |
| 5219 || b0p->b0_magic_char != B0_MAGIC_CHAR); | |
| 5220 } | |
| 5221 | |
| 5222 #ifdef CHECK_INODE | |
| 5223 /* | |
| 5224 * Compare current file name with file name from swap file. | |
| 5225 * Try to use inode numbers when possible. | |
| 5226 * Return non-zero when files are different. | |
| 5227 * | |
| 5228 * When comparing file names a few things have to be taken into consideration: | |
| 5229 * - When working over a network the full path of a file depends on the host. | |
| 5230 * We check the inode number if possible. It is not 100% reliable though, | |
| 5231 * because the device number cannot be used over a network. | |
| 5232 * - When a file does not exist yet (editing a new file) there is no inode | |
| 5233 * number. | |
| 5234 * - The file name in a swap file may not be valid on the current host. The | |
| 5235 * "~user" form is used whenever possible to avoid this. | |
| 5236 * | |
| 5237 * This is getting complicated, let's make a table: | |
| 5238 * | |
| 5239 * ino_c ino_s fname_c fname_s differ = | |
| 5240 * | |
| 5241 * both files exist -> compare inode numbers: | |
| 5242 * != 0 != 0 X X ino_c != ino_s | |
| 5243 * | |
| 5244 * inode number(s) unknown, file names available -> compare file names | |
| 5245 * == 0 X OK OK fname_c != fname_s | |
| 5246 * X == 0 OK OK fname_c != fname_s | |
| 5247 * | |
| 5248 * current file doesn't exist, file for swap file exist, file name(s) not | |
| 5249 * available -> probably different | |
| 5250 * == 0 != 0 FAIL X TRUE | |
| 5251 * == 0 != 0 X FAIL TRUE | |
| 5252 * | |
| 5253 * current file exists, inode for swap unknown, file name(s) not | |
| 5254 * available -> probably different | |
| 5255 * != 0 == 0 FAIL X TRUE | |
| 5256 * != 0 == 0 X FAIL TRUE | |
| 5257 * | |
| 5258 * current file doesn't exist, inode for swap unknown, one file name not | |
| 5259 * available -> probably different | |
| 5260 * == 0 == 0 FAIL OK TRUE | |
| 5261 * == 0 == 0 OK FAIL TRUE | |
| 5262 * | |
| 5263 * 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
|
5264 * 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
|
5265 * == 0 == 0 FAIL FAIL fname_c != fname_s |
| 7 | 5266 * |
| 5267 * Note that when the ino_t is 64 bits, only the last 32 will be used. This | |
| 5268 * can't be changed without making the block 0 incompatible with 32 bit | |
| 5269 * versions. | |
| 5270 */ | |
| 5271 | |
| 5272 static int | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5273 fnamecmp_ino( |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5274 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
|
5275 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
|
5276 long ino_block0) |
| 7 | 5277 { |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
5278 stat_T st; |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5279 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
|
5280 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
|
5281 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
|
5282 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
|
5283 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
|
5284 int retval_s; // flag: buf_s valid |
| 7 | 5285 |
| 5286 if (mch_stat((char *)fname_c, &st) == 0) | |
| 5287 ino_c = (ino_t)st.st_ino; | |
| 5288 | |
| 5289 /* | |
| 5290 * First we try to get the inode from the file name, because the inode in | |
| 5291 * the swap file may be outdated. If that fails (e.g. this path is not | |
| 5292 * valid on this machine), use the inode from block 0. | |
| 5293 */ | |
| 5294 if (mch_stat((char *)fname_s, &st) == 0) | |
| 5295 ino_s = (ino_t)st.st_ino; | |
| 5296 else | |
| 5297 ino_s = (ino_t)ino_block0; | |
| 5298 | |
| 5299 if (ino_c && ino_s) | |
| 5300 return (ino_c != ino_s); | |
| 5301 | |
| 5302 /* | |
| 5303 * One of the inode numbers is unknown, try a forced vim_FullName() and | |
| 5304 * compare the file names. | |
| 5305 */ | |
| 5306 retval_c = vim_FullName(fname_c, buf_c, MAXPATHL, TRUE); | |
| 5307 retval_s = vim_FullName(fname_s, buf_s, MAXPATHL, TRUE); | |
| 5308 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
|
5309 return STRCMP(buf_c, buf_s) != 0; |
| 7 | 5310 |
| 5311 /* | |
| 5312 * 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
|
5313 * 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
|
5314 * in the swap file. |
| 7 | 5315 */ |
| 5316 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
|
5317 return STRCMP(fname_c, fname_s) != 0; |
| 7 | 5318 return TRUE; |
| 5319 } | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5320 #endif // CHECK_INODE |
| 7 | 5321 |
| 5322 /* | |
| 5323 * Move a long integer into a four byte character array. | |
| 5324 * Used for machine independency in block zero. | |
| 5325 */ | |
| 5326 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5327 long_to_char(long n, char_u *s) |
| 7 | 5328 { |
| 5329 s[0] = (char_u)(n & 0xff); | |
| 5330 n = (unsigned)n >> 8; | |
| 5331 s[1] = (char_u)(n & 0xff); | |
| 5332 n = (unsigned)n >> 8; | |
| 5333 s[2] = (char_u)(n & 0xff); | |
| 5334 n = (unsigned)n >> 8; | |
| 5335 s[3] = (char_u)(n & 0xff); | |
| 5336 } | |
| 5337 | |
| 5338 static long | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5339 char_to_long(char_u *s) |
| 7 | 5340 { |
| 5341 long retval; | |
| 5342 | |
| 5343 retval = s[3]; | |
| 5344 retval <<= 8; | |
| 5345 retval |= s[2]; | |
| 5346 retval <<= 8; | |
| 5347 retval |= s[1]; | |
| 5348 retval <<= 8; | |
| 5349 retval |= s[0]; | |
| 5350 | |
| 5351 return retval; | |
| 5352 } | |
| 5353 | |
| 39 | 5354 /* |
| 5355 * Set the flags in the first block of the swap file: | |
| 5356 * - file is modified or not: buf->b_changed | |
| 5357 * - 'fileformat' | |
| 5358 * - 'fileencoding' | |
| 5359 */ | |
| 7 | 5360 void |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5361 ml_setflags(buf_T *buf) |
| 7 | 5362 { |
| 5363 bhdr_T *hp; | |
| 5364 ZERO_BL *b0p; | |
| 5365 | |
| 5366 if (!buf->b_ml.ml_mfp) | |
| 5367 return; | |
| 5368 for (hp = buf->b_ml.ml_mfp->mf_used_last; hp != NULL; hp = hp->bh_prev) | |
| 5369 { | |
| 5370 if (hp->bh_bnum == 0) | |
| 5371 { | |
| 5372 b0p = (ZERO_BL *)(hp->bh_data); | |
| 39 | 5373 b0p->b0_dirty = buf->b_changed ? B0_DIRTY : 0; |
| 5374 b0p->b0_flags = (b0p->b0_flags & ~B0_FF_MASK) | |
| 5375 | (get_fileformat(buf) + 1); | |
| 5376 add_b0_fenc(b0p, buf); | |
| 7 | 5377 hp->bh_flags |= BH_DIRTY; |
| 5378 mf_sync(buf->b_ml.ml_mfp, MFS_ZERO); | |
| 5379 break; | |
| 5380 } | |
| 5381 } | |
| 5382 } | |
| 5383 | |
| 2267 | 5384 #if defined(FEAT_CRYPT) || defined(PROTO) |
| 5385 /* | |
| 5386 * If "data" points to a data block encrypt the text in it and return a copy | |
| 5387 * in allocated memory. Return NULL when out of memory. | |
| 5388 * Otherwise return "data". | |
| 5389 */ | |
| 5390 char_u * | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5391 ml_encrypt_data( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5392 memfile_T *mfp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5393 char_u *data, |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
5394 off_T offset, |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5395 unsigned size) |
| 2267 | 5396 { |
| 5397 DATA_BL *dp = (DATA_BL *)data; | |
| 5398 char_u *head_end; | |
| 5399 char_u *text_start; | |
| 5400 char_u *new_data; | |
| 5401 int text_len; | |
| 6122 | 5402 cryptstate_T *state; |
| 2267 | 5403 |
| 5404 if (dp->db_id != DATA_ID) | |
| 5405 return data; | |
| 5406 | |
| 6817 | 5407 state = ml_crypt_prepare(mfp, offset, FALSE); |
| 5408 if (state == NULL) | |
| 5409 return data; | |
| 5410 | |
|
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
|
5411 new_data = alloc(size); |
| 2267 | 5412 if (new_data == NULL) |
| 5413 return NULL; | |
| 5414 head_end = (char_u *)(&dp->db_index[dp->db_line_count]); | |
| 5415 text_start = (char_u *)dp + dp->db_txt_start; | |
| 5416 text_len = size - dp->db_txt_start; | |
| 5417 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5418 // Copy the header and the text. |
| 2267 | 5419 mch_memmove(new_data, dp, head_end - (char_u *)dp); |
| 5420 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5421 // 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
|
5422 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
|
5423 FALSE); |
| 6122 | 5424 crypt_free_state(state); |
| 2267 | 5425 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5426 // Clear the gap. |
| 2267 | 5427 if (head_end < text_start) |
| 5428 vim_memset(new_data + (head_end - data), 0, text_start - head_end); | |
| 5429 | |
| 5430 return new_data; | |
| 5431 } | |
| 5432 | |
| 5433 /* | |
| 6817 | 5434 * Decrypt the text in "data" if it points to an encrypted data block. |
| 2267 | 5435 */ |
| 5436 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5437 ml_decrypt_data( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5438 memfile_T *mfp, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5439 char_u *data, |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
5440 off_T offset, |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5441 unsigned size) |
| 2267 | 5442 { |
| 5443 DATA_BL *dp = (DATA_BL *)data; | |
| 5444 char_u *head_end; | |
| 5445 char_u *text_start; | |
| 5446 int text_len; | |
| 6122 | 5447 cryptstate_T *state; |
| 2267 | 5448 |
| 5449 if (dp->db_id == DATA_ID) | |
| 5450 { | |
| 5451 head_end = (char_u *)(&dp->db_index[dp->db_line_count]); | |
| 5452 text_start = (char_u *)dp + dp->db_txt_start; | |
| 5453 text_len = dp->db_txt_end - dp->db_txt_start; | |
| 5454 | |
| 5455 if (head_end > text_start || dp->db_txt_start > size | |
| 5456 || 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
|
5457 return; // data was messed up |
| 2267 | 5458 |
| 6122 | 5459 state = ml_crypt_prepare(mfp, offset, TRUE); |
| 6817 | 5460 if (state != NULL) |
| 5461 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5462 // 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
|
5463 crypt_decode_inplace(state, text_start, text_len, FALSE); |
| 6817 | 5464 crypt_free_state(state); |
| 5465 } | |
| 2267 | 5466 } |
| 5467 } | |
| 5468 | |
| 5469 /* | |
| 5470 * Prepare for encryption/decryption, using the key, seed and offset. | |
| 6122 | 5471 * Return an allocated cryptstate_T *. |
| 2267 | 5472 */ |
| 6122 | 5473 static cryptstate_T * |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9295
diff
changeset
|
5474 ml_crypt_prepare(memfile_T *mfp, off_T offset, int reading) |
| 2267 | 5475 { |
| 5476 buf_T *buf = mfp->mf_buffer; | |
| 5477 char_u salt[50]; | |
| 6122 | 5478 int method_nr; |
| 2267 | 5479 char_u *key; |
| 5480 char_u *seed; | |
| 5481 | |
| 5482 if (reading && mfp->mf_old_key != NULL) | |
| 5483 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5484 // Reading back blocks with the previous key/method/seed. |
| 6122 | 5485 method_nr = mfp->mf_old_cm; |
| 2267 | 5486 key = mfp->mf_old_key; |
| 5487 seed = mfp->mf_old_seed; | |
| 5488 } | |
| 5489 else | |
| 5490 { | |
| 6122 | 5491 method_nr = crypt_get_method_nr(buf); |
| 2267 | 5492 key = buf->b_p_key; |
| 5493 seed = mfp->mf_seed; | |
| 5494 } | |
| 6817 | 5495 if (*key == NUL) |
| 5496 return NULL; | |
| 2267 | 5497 |
| 6122 | 5498 if (method_nr == CRYPT_M_ZIP) |
| 2267 | 5499 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5500 // 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
|
5501 // key for every block. |
| 2267 | 5502 vim_snprintf((char *)salt, sizeof(salt), "%s%ld", key, (long)offset); |
| 6122 | 5503 return crypt_create(method_nr, salt, NULL, 0, NULL, 0); |
| 2267 | 5504 } |
| 6122 | 5505 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5506 // 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
|
5507 // of the block for the salt. |
| 6122 | 5508 vim_snprintf((char *)salt, sizeof(salt), "%ld", (long)offset); |
| 5509 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
|
5510 seed, MF_SEED_LEN); |
| 2267 | 5511 } |
| 5512 | |
| 5513 #endif | |
| 5514 | |
| 5515 | |
| 7 | 5516 #if defined(FEAT_BYTEOFF) || defined(PROTO) |
| 5517 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5518 #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
|
5519 #define MLCS_MINL 400 // should be half of MLCS_MAXL |
| 7 | 5520 |
| 5521 /* | |
|
2407
6bc102a4bff8
Fix memory access to 'cryptmethod' during recovery. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2394
diff
changeset
|
5522 * Keep information for finding byte offset of a line, updtype may be one of: |
| 7 | 5523 * ML_CHNK_ADDLINE: Add len to parent chunk, possibly splitting it |
| 5524 * Careful: ML_CHNK_ADDLINE may cause ml_find_line() to be called. | |
| 5525 * ML_CHNK_DELLINE: Subtract len from parent chunk, possibly deleting it | |
| 5526 * ML_CHNK_UPDLINE: Add len to parent chunk, as a signed entity. | |
| 5527 */ | |
| 5528 static void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5529 ml_updatechunk( |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5530 buf_T *buf, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5531 linenr_T line, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5532 long len, |
|
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5533 int updtype) |
| 7 | 5534 { |
| 5535 static buf_T *ml_upd_lastbuf = NULL; | |
| 5536 static linenr_T ml_upd_lastline; | |
| 5537 static linenr_T ml_upd_lastcurline; | |
| 5538 static int ml_upd_lastcurix; | |
| 5539 | |
| 5540 linenr_T curline = ml_upd_lastcurline; | |
| 5541 int curix = ml_upd_lastcurix; | |
| 5542 long size; | |
| 5543 chunksize_T *curchnk; | |
| 5544 int rest; | |
| 5545 bhdr_T *hp; | |
| 5546 DATA_BL *dp; | |
| 5547 | |
| 5548 if (buf->b_ml.ml_usedchunks == -1 || len == 0) | |
| 5549 return; | |
| 5550 if (buf->b_ml.ml_chunksize == NULL) | |
| 5551 { | |
|
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
|
5552 buf->b_ml.ml_chunksize = ALLOC_MULT(chunksize_T, 100); |
| 7 | 5553 if (buf->b_ml.ml_chunksize == NULL) |
| 5554 { | |
| 5555 buf->b_ml.ml_usedchunks = -1; | |
| 5556 return; | |
| 5557 } | |
| 5558 buf->b_ml.ml_numchunks = 100; | |
| 5559 buf->b_ml.ml_usedchunks = 1; | |
| 5560 buf->b_ml.ml_chunksize[0].mlcs_numlines = 1; | |
| 5561 buf->b_ml.ml_chunksize[0].mlcs_totalsize = 1; | |
| 5562 } | |
| 5563 | |
| 5564 if (updtype == ML_CHNK_UPDLINE && buf->b_ml.ml_line_count == 1) | |
| 5565 { | |
| 5566 /* | |
| 5567 * First line in empty buffer from ml_flush_line() -- reset | |
| 5568 */ | |
| 5569 buf->b_ml.ml_usedchunks = 1; | |
| 5570 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
|
5571 buf->b_ml.ml_chunksize[0].mlcs_totalsize = (long)buf->b_ml.ml_line_len; |
| 7 | 5572 return; |
| 5573 } | |
| 5574 | |
| 5575 /* | |
| 5576 * Find chunk that our line belongs to, curline will be at start of the | |
| 5577 * chunk. | |
| 5578 */ | |
| 5579 if (buf != ml_upd_lastbuf || line != ml_upd_lastline + 1 | |
| 5580 || updtype != ML_CHNK_ADDLINE) | |
| 5581 { | |
| 5582 for (curline = 1, curix = 0; | |
| 5583 curix < buf->b_ml.ml_usedchunks - 1 | |
| 5584 && line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines; | |
| 5585 curix++) | |
| 5586 curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines; | |
| 5587 } | |
|
14980
c98810dfebaf
patch 8.1.0501: cppcheck warns for using array index before bounds check
Bram Moolenaar <Bram@vim.org>
parents:
14923
diff
changeset
|
5588 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
|
5589 && line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines) |
| 7 | 5590 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5591 // Adjust cached curix & curline |
| 7 | 5592 curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines; |
| 5593 curix++; | |
| 5594 } | |
| 5595 curchnk = buf->b_ml.ml_chunksize + curix; | |
| 5596 | |
| 5597 if (updtype == ML_CHNK_DELLINE) | |
| 1030 | 5598 len = -len; |
| 7 | 5599 curchnk->mlcs_totalsize += len; |
| 5600 if (updtype == ML_CHNK_ADDLINE) | |
| 5601 { | |
| 5602 curchnk->mlcs_numlines++; | |
| 5603 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5604 // May resize here so we don't have to do it in both cases below |
| 7 | 5605 if (buf->b_ml.ml_usedchunks + 1 >= buf->b_ml.ml_numchunks) |
| 5606 { | |
| 6596 | 5607 chunksize_T *t_chunksize = buf->b_ml.ml_chunksize; |
| 5608 | |
| 7 | 5609 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
|
5610 buf->b_ml.ml_chunksize = vim_realloc(buf->b_ml.ml_chunksize, |
| 7 | 5611 sizeof(chunksize_T) * buf->b_ml.ml_numchunks); |
| 5612 if (buf->b_ml.ml_chunksize == NULL) | |
| 5613 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5614 // Hmmmm, Give up on offset for this buffer |
| 6596 | 5615 vim_free(t_chunksize); |
| 7 | 5616 buf->b_ml.ml_usedchunks = -1; |
| 5617 return; | |
| 5618 } | |
| 5619 } | |
| 5620 | |
| 5621 if (buf->b_ml.ml_chunksize[curix].mlcs_numlines >= MLCS_MAXL) | |
| 5622 { | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5623 int count; // number of entries in block |
| 7 | 5624 int idx; |
|
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5625 int end_idx; |
| 7 | 5626 int text_end; |
| 5627 int linecnt; | |
| 5628 | |
| 5629 mch_memmove(buf->b_ml.ml_chunksize + curix + 1, | |
| 5630 buf->b_ml.ml_chunksize + curix, | |
| 5631 (buf->b_ml.ml_usedchunks - curix) * | |
| 5632 sizeof(chunksize_T)); | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5633 // Compute length of first half of lines in the split chunk |
| 7 | 5634 size = 0; |
| 5635 linecnt = 0; | |
| 5636 while (curline < buf->b_ml.ml_line_count | |
| 5637 && linecnt < MLCS_MINL) | |
| 5638 { | |
| 5639 if ((hp = ml_find_line(buf, curline, ML_FIND)) == NULL) | |
| 5640 { | |
| 5641 buf->b_ml.ml_usedchunks = -1; | |
| 5642 return; | |
| 5643 } | |
| 5644 dp = (DATA_BL *)(hp->bh_data); | |
| 5645 count = (long)(buf->b_ml.ml_locked_high) - | |
| 5646 (long)(buf->b_ml.ml_locked_low) + 1; | |
| 5647 idx = curline - buf->b_ml.ml_locked_low; | |
| 5648 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
|
5649 |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5650 // compute index of last line to use in this MEMLINE |
| 7 | 5651 rest = count - idx; |
| 5652 if (linecnt + rest > MLCS_MINL) | |
| 5653 { | |
|
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5654 end_idx = idx + MLCS_MINL - linecnt - 1; |
| 7 | 5655 linecnt = MLCS_MINL; |
| 5656 } | |
| 5657 else | |
| 5658 { | |
|
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5659 end_idx = count - 1; |
| 7 | 5660 linecnt += rest; |
| 5661 } | |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5662 #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
|
5663 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
|
5664 { |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5665 int i; |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5666 |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5667 // 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
|
5668 // 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
|
5669 // lines. |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5670 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
|
5671 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
|
5672 } |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5673 else |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5674 #endif |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5675 { |
|
25624
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
5676 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
|
5677 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
|
5678 else |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5679 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
|
5680 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
|
5681 } |
| 7 | 5682 } |
| 5683 buf->b_ml.ml_chunksize[curix].mlcs_numlines = linecnt; | |
| 5684 buf->b_ml.ml_chunksize[curix + 1].mlcs_numlines -= linecnt; | |
| 5685 buf->b_ml.ml_chunksize[curix].mlcs_totalsize = size; | |
| 5686 buf->b_ml.ml_chunksize[curix + 1].mlcs_totalsize -= size; | |
| 5687 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
|
5688 ml_upd_lastbuf = NULL; // Force recalc of curix & curline |
| 7 | 5689 return; |
| 5690 } | |
| 5691 else if (buf->b_ml.ml_chunksize[curix].mlcs_numlines >= MLCS_MINL | |
| 5692 && curix == buf->b_ml.ml_usedchunks - 1 | |
| 5693 && buf->b_ml.ml_line_count - line <= 1) | |
| 5694 { | |
| 5695 /* | |
|
23229
b545334ae654
patch 8.2.2160: various typos
Bram Moolenaar <Bram@vim.org>
parents:
22959
diff
changeset
|
5696 * We are in the last chunk and it is cheap to create a new one |
| 7 | 5697 * after this. Do it now to avoid the loop above later on |
| 5698 */ | |
| 5699 curchnk = buf->b_ml.ml_chunksize + curix + 1; | |
| 5700 buf->b_ml.ml_usedchunks++; | |
| 5701 if (line == buf->b_ml.ml_line_count) | |
| 5702 { | |
| 5703 curchnk->mlcs_numlines = 0; | |
| 5704 curchnk->mlcs_totalsize = 0; | |
| 5705 } | |
| 5706 else | |
| 5707 { | |
| 5708 /* | |
| 5709 * Line is just prior to last, move count for last | |
| 5710 * This is the common case when loading a new file | |
| 5711 */ | |
| 5712 hp = ml_find_line(buf, buf->b_ml.ml_line_count, ML_FIND); | |
| 5713 if (hp == NULL) | |
| 5714 { | |
| 5715 buf->b_ml.ml_usedchunks = -1; | |
| 5716 return; | |
| 5717 } | |
| 5718 dp = (DATA_BL *)(hp->bh_data); | |
| 5719 if (dp->db_line_count == 1) | |
| 5720 rest = dp->db_txt_end - dp->db_txt_start; | |
| 5721 else | |
| 5722 rest = | |
| 5723 ((dp->db_index[dp->db_line_count - 2]) & DB_INDEX_MASK) | |
| 5724 - dp->db_txt_start; | |
| 5725 curchnk->mlcs_totalsize = rest; | |
| 5726 curchnk->mlcs_numlines = 1; | |
| 5727 curchnk[-1].mlcs_totalsize -= rest; | |
| 5728 curchnk[-1].mlcs_numlines -= 1; | |
| 5729 } | |
| 5730 } | |
| 5731 } | |
| 5732 else if (updtype == ML_CHNK_DELLINE) | |
| 5733 { | |
| 5734 curchnk->mlcs_numlines--; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5735 ml_upd_lastbuf = NULL; // Force recalc of curix & curline |
| 7 | 5736 if (curix < (buf->b_ml.ml_usedchunks - 1) |
| 5737 && (curchnk->mlcs_numlines + curchnk[1].mlcs_numlines) | |
| 5738 <= MLCS_MINL) | |
| 5739 { | |
| 5740 curix++; | |
| 5741 curchnk = buf->b_ml.ml_chunksize + curix; | |
| 5742 } | |
| 5743 else if (curix == 0 && curchnk->mlcs_numlines <= 0) | |
| 5744 { | |
| 5745 buf->b_ml.ml_usedchunks--; | |
| 5746 mch_memmove(buf->b_ml.ml_chunksize, buf->b_ml.ml_chunksize + 1, | |
| 5747 buf->b_ml.ml_usedchunks * sizeof(chunksize_T)); | |
| 5748 return; | |
| 5749 } | |
| 5750 else if (curix == 0 || (curchnk->mlcs_numlines > 10 | |
| 5751 && (curchnk->mlcs_numlines + curchnk[-1].mlcs_numlines) | |
| 5752 > MLCS_MINL)) | |
| 5753 { | |
| 5754 return; | |
| 5755 } | |
| 5756 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5757 // Collapse chunks |
| 7 | 5758 curchnk[-1].mlcs_numlines += curchnk->mlcs_numlines; |
| 5759 curchnk[-1].mlcs_totalsize += curchnk->mlcs_totalsize; | |
| 5760 buf->b_ml.ml_usedchunks--; | |
| 5761 if (curix < buf->b_ml.ml_usedchunks) | |
| 5762 { | |
| 5763 mch_memmove(buf->b_ml.ml_chunksize + curix, | |
| 5764 buf->b_ml.ml_chunksize + curix + 1, | |
| 5765 (buf->b_ml.ml_usedchunks - curix) * | |
| 5766 sizeof(chunksize_T)); | |
| 5767 } | |
| 5768 return; | |
| 5769 } | |
| 5770 ml_upd_lastbuf = buf; | |
| 5771 ml_upd_lastline = line; | |
| 5772 ml_upd_lastcurline = curline; | |
| 5773 ml_upd_lastcurix = curix; | |
| 5774 } | |
| 5775 | |
| 5776 /* | |
| 5777 * Find offset for line or line with offset. | |
| 169 | 5778 * Find line with offset if "lnum" is 0; return remaining offset in offp |
| 5779 * Find offset of line if "lnum" > 0 | |
| 7 | 5780 * return -1 if information is not available |
| 5781 */ | |
| 5782 long | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5783 ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp) |
| 7 | 5784 { |
| 5785 linenr_T curline; | |
| 5786 int curix; | |
| 5787 long size; | |
| 5788 bhdr_T *hp; | |
| 5789 DATA_BL *dp; | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5790 int count; // number of entries in block |
| 7 | 5791 int idx; |
| 5792 int start_idx; | |
| 5793 int text_end; | |
| 5794 long offset; | |
| 5795 int len; | |
| 5796 int ffdos = (get_fileformat(buf) == EOL_DOS); | |
| 5797 int extra = 0; | |
| 5798 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5799 // take care of cached line first |
| 169 | 5800 ml_flush_line(curbuf); |
| 5801 | |
| 7 | 5802 if (buf->b_ml.ml_usedchunks == -1 |
| 5803 || buf->b_ml.ml_chunksize == NULL | |
| 169 | 5804 || lnum < 0) |
| 7 | 5805 return -1; |
| 5806 | |
| 5807 if (offp == NULL) | |
| 5808 offset = 0; | |
| 5809 else | |
| 5810 offset = *offp; | |
| 169 | 5811 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
|
5812 return 1; // Not a "find offset" and offset 0 _must_ be in line 1 |
| 7 | 5813 /* |
| 5814 * Find the last chunk before the one containing our line. Last chunk is | |
|
25624
0ef8ef1af478
patch 8.2.3348: line2byte() returns wrong value after adding textprop
Bram Moolenaar <Bram@vim.org>
parents:
25417
diff
changeset
|
5815 * special because it will never qualify. |
| 7 | 5816 */ |
| 5817 curline = 1; | |
| 5818 curix = size = 0; | |
| 5819 while (curix < buf->b_ml.ml_usedchunks - 1 | |
| 169 | 5820 && ((lnum != 0 |
| 5821 && lnum >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines) | |
| 7 | 5822 || (offset != 0 |
| 5823 && offset > size + buf->b_ml.ml_chunksize[curix].mlcs_totalsize | |
|
27453
c7f614c9ceb3
patch 8.2.4255: theoretical computation overflow
Bram Moolenaar <Bram@vim.org>
parents:
27426
diff
changeset
|
5824 + (long)ffdos * buf->b_ml.ml_chunksize[curix].mlcs_numlines))) |
| 7 | 5825 { |
| 5826 curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines; | |
| 5827 size += buf->b_ml.ml_chunksize[curix].mlcs_totalsize; | |
| 5828 if (offset && ffdos) | |
| 5829 size += buf->b_ml.ml_chunksize[curix].mlcs_numlines; | |
| 5830 curix++; | |
| 5831 } | |
| 5832 | |
| 169 | 5833 while ((lnum != 0 && curline < lnum) || (offset != 0 && size < offset)) |
| 7 | 5834 { |
|
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5835 #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
|
5836 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
|
5837 #endif |
|
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5838 |
| 7 | 5839 if (curline > buf->b_ml.ml_line_count |
| 5840 || (hp = ml_find_line(buf, curline, ML_FIND)) == NULL) | |
| 5841 return -1; | |
| 5842 dp = (DATA_BL *)(hp->bh_data); | |
| 5843 count = (long)(buf->b_ml.ml_locked_high) - | |
| 5844 (long)(buf->b_ml.ml_locked_low) + 1; | |
| 5845 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
|
5846 if (idx == 0) // first line in block, text at the end |
| 7 | 5847 text_end = dp->db_txt_end; |
| 5848 else | |
| 5849 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
|
5850 // Compute index of last line to use in this MEMLINE |
| 169 | 5851 if (lnum != 0) |
| 7 | 5852 { |
| 169 | 5853 if (curline + (count - idx) >= lnum) |
| 5854 idx += lnum - curline - 1; | |
| 7 | 5855 else |
| 5856 idx = count - 1; | |
| 5857 } | |
| 5858 else | |
| 5859 { | |
| 5860 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
|
5861 for (;;) |
| 7 | 5862 { |
|
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5863 #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
|
5864 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
|
5865 |
|
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5866 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
|
5867 { |
|
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5868 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
|
5869 |
|
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5870 // 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
|
5871 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
|
5872 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
|
5873 : ((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
|
5874 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
|
5875 } |
|
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5876 #endif |
|
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5877 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
|
5878 + 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
|
5879 #ifdef FEAT_PROP_POPUP |
|
19133
dc6a0b05b082
patch 8.2.0126: textprop test fails
Bram Moolenaar <Bram@vim.org>
parents:
19129
diff
changeset
|
5880 - (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
|
5881 #endif |
|
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5882 + ffdos)) |
|
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5883 break; |
|
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5884 |
| 7 | 5885 if (ffdos) |
| 5886 size++; | |
|
19110
e40814841406
patch 8.2.0115: byte2line() does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
18800
diff
changeset
|
5887 #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
|
5888 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
|
5889 #endif |
| 7 | 5890 if (idx == count - 1) |
| 5891 { | |
| 5892 extra = 1; | |
| 5893 break; | |
| 5894 } | |
| 5895 idx++; | |
| 5896 } | |
| 5897 } | |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5898 #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
|
5899 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
|
5900 { |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5901 int i; |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5902 |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5903 // 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
|
5904 // lengths. |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5905 len = 0; |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5906 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
|
5907 { |
|
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5908 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
|
5909 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
|
5910 } |
|
15255
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5911 } |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5912 else |
|
19e79a1ed6b6
patch 8.1.0636: line2byte() gives wrong values with text properties
Bram Moolenaar <Bram@vim.org>
parents:
15182
diff
changeset
|
5913 #endif |
|
23776
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5914 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
|
5915 #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
|
5916 - (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
|
5917 #endif |
|
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5918 ; |
| 7 | 5919 size += len; |
| 5920 if (offset != 0 && size >= offset) | |
| 5921 { | |
| 5922 if (size + ffdos == offset) | |
| 5923 *offp = 0; | |
| 5924 else if (idx == start_idx) | |
| 5925 *offp = offset - size + len; | |
| 5926 else | |
| 5927 *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
|
5928 - (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
|
5929 #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
|
5930 + (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
|
5931 #endif |
|
9f692a75d481
patch 8.2.2429: :goto does not work correctly with text properties
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
5932 ; |
| 7 | 5933 curline += idx - start_idx + extra; |
| 5934 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
|
5935 return -1; // exactly one byte beyond the end |
| 7 | 5936 return curline; |
| 5937 } | |
| 5938 curline = buf->b_ml.ml_locked_high + 1; | |
| 5939 } | |
| 5940 | |
| 169 | 5941 if (lnum != 0) |
| 20 | 5942 { |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5943 // Count extra CR characters. |
| 20 | 5944 if (ffdos) |
| 169 | 5945 size += lnum - 1; |
| 20 | 5946 |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5947 // 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
|
5948 // 'nofixeol'). |
| 6933 | 5949 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
|
5950 && lnum > buf->b_ml.ml_line_count) |
| 20 | 5951 size -= ffdos + 1; |
| 5952 } | |
| 5953 | |
| 7 | 5954 return size; |
| 5955 } | |
| 5956 | |
| 5957 /* | |
| 5958 * Goto byte in buffer with offset 'cnt'. | |
| 5959 */ | |
| 5960 void | |
|
7827
41789f16d6b2
commit https://github.com/vim/vim/commit/52ea13da0fe86df1abf34de52841e367035170c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5961 goto_byte(long cnt) |
| 7 | 5962 { |
| 5963 long boff = cnt; | |
| 5964 linenr_T lnum; | |
| 5965 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5966 ml_flush_line(curbuf); // cached line may be dirty |
| 7 | 5967 setpcmark(); |
| 5968 if (boff) | |
| 5969 --boff; | |
| 5970 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
|
5971 if (lnum < 1) // past the end |
| 7 | 5972 { |
| 5973 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
| 5974 curwin->w_curswant = MAXCOL; | |
| 5975 coladvance((colnr_T)MAXCOL); | |
| 5976 } | |
| 5977 else | |
| 5978 { | |
| 5979 curwin->w_cursor.lnum = lnum; | |
| 5980 curwin->w_cursor.col = (colnr_T)boff; | |
| 572 | 5981 curwin->w_cursor.coladd = 0; |
| 7 | 5982 curwin->w_set_curswant = TRUE; |
| 5983 } | |
| 5984 check_cursor(); | |
| 5985 | |
|
18800
f41b55f9357c
patch 8.1.2388: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5986 // Make sure the cursor is on the first byte of a multi-byte char. |
| 7 | 5987 if (has_mbyte) |
| 5988 mb_adjust_cursor(); | |
| 5989 } | |
| 5990 #endif |