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