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