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