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