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