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