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