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