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