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