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