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