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