1 To: [email protected] |
|
2 Subject: Patch 7.2.178 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=UTF-8 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.178 |
|
11 Problem: Using negative value for device number might not work. |
|
12 Solution: Use a separate flag for whether ffv_dev was set. |
|
13 Files: src/misc2.c |
|
14 |
|
15 |
|
16 *** ../vim-7.2.177/src/misc2.c 2009-04-29 11:00:09.000000000 +0200 |
|
17 --- src/misc2.c 2009-05-16 21:05:10.000000000 +0200 |
|
18 *************** |
|
19 *** 2841,2847 **** |
|
20 get_key_name(i) |
|
21 int i; |
|
22 { |
|
23 ! if (i >= KEY_NAMES_TABLE_LEN) |
|
24 return NULL; |
|
25 return key_names_table[i].name; |
|
26 } |
|
27 --- 2841,2847 ---- |
|
28 get_key_name(i) |
|
29 int i; |
|
30 { |
|
31 ! if (i >= (int)KEY_NAMES_TABLE_LEN) |
|
32 return NULL; |
|
33 return key_names_table[i].name; |
|
34 } |
|
35 *************** |
|
36 *** 3869,3875 **** |
|
37 * use filename. |
|
38 */ |
|
39 #ifdef UNIX |
|
40 ! int ffv_dev; /* device number (-1 if not set) */ |
|
41 ino_t ffv_ino; /* inode number */ |
|
42 #endif |
|
43 /* The memory for this struct is allocated according to the length of |
|
44 --- 3869,3876 ---- |
|
45 * use filename. |
|
46 */ |
|
47 #ifdef UNIX |
|
48 ! int ffv_dev_valid; /* ffv_dev and ffv_ino were set */ |
|
49 ! dev_t ffv_dev; /* device number */ |
|
50 ino_t ffv_ino; /* inode number */ |
|
51 #endif |
|
52 /* The memory for this struct is allocated according to the length of |
|
53 *************** |
|
54 *** 4059,4071 **** |
|
55 * This function silently ignores a few errors, vim_findfile() will have |
|
56 * limited functionality then. |
|
57 */ |
|
58 - /*ARGSUSED*/ |
|
59 void * |
|
60 vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what, |
|
61 search_ctx_arg, tagfile, rel_fname) |
|
62 char_u *path; |
|
63 char_u *filename; |
|
64 ! char_u *stopdirs; |
|
65 int level; |
|
66 int free_visited; |
|
67 int find_what; |
|
68 --- 4060,4071 ---- |
|
69 * This function silently ignores a few errors, vim_findfile() will have |
|
70 * limited functionality then. |
|
71 */ |
|
72 void * |
|
73 vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what, |
|
74 search_ctx_arg, tagfile, rel_fname) |
|
75 char_u *path; |
|
76 char_u *filename; |
|
77 ! char_u *stopdirs UNUSED; |
|
78 int level; |
|
79 int free_visited; |
|
80 int find_what; |
|
81 *************** |
|
82 *** 5063,5072 **** |
|
83 { |
|
84 if ( |
|
85 #ifdef UNIX |
|
86 ! !url |
|
87 ! ? (vp->ffv_dev == st.st_dev |
|
88 ! && vp->ffv_ino == st.st_ino) |
|
89 ! : |
|
90 #endif |
|
91 fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0 |
|
92 ) |
|
93 --- 5063,5071 ---- |
|
94 { |
|
95 if ( |
|
96 #ifdef UNIX |
|
97 ! !url ? (vp->ffv_dev_valid && vp->ffv_dev == st.st_dev |
|
98 ! && vp->ffv_ino == st.st_ino) |
|
99 ! : |
|
100 #endif |
|
101 fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0 |
|
102 ) |
|
103 *************** |
|
104 *** 5091,5104 **** |
|
105 #ifdef UNIX |
|
106 if (!url) |
|
107 { |
|
108 vp->ffv_ino = st.st_ino; |
|
109 vp->ffv_dev = st.st_dev; |
|
110 vp->ffv_fname[0] = NUL; |
|
111 } |
|
112 else |
|
113 { |
|
114 ! vp->ffv_ino = 0; |
|
115 ! vp->ffv_dev = -1; |
|
116 #endif |
|
117 STRCPY(vp->ffv_fname, ff_expand_buffer); |
|
118 #ifdef UNIX |
|
119 --- 5090,5103 ---- |
|
120 #ifdef UNIX |
|
121 if (!url) |
|
122 { |
|
123 + vp->ffv_dev_valid = TRUE; |
|
124 vp->ffv_ino = st.st_ino; |
|
125 vp->ffv_dev = st.st_dev; |
|
126 vp->ffv_fname[0] = NUL; |
|
127 } |
|
128 else |
|
129 { |
|
130 ! vp->ffv_dev_valid = FALSE; |
|
131 #endif |
|
132 STRCPY(vp->ffv_fname, ff_expand_buffer); |
|
133 #ifdef UNIX |
|
134 *** ../vim-7.2.177/src/version.c 2009-05-16 17:29:37.000000000 +0200 |
|
135 --- src/version.c 2009-05-16 21:00:15.000000000 +0200 |
|
136 *************** |
|
137 *** 678,679 **** |
|
138 --- 678,681 ---- |
|
139 { /* Add new patch number below this line */ |
|
140 + /**/ |
|
141 + 178, |
|
142 /**/ |
|
143 |
|
144 -- |
|
145 FATAL ERROR! SYSTEM HALTED! - Press any key to continue doing nothing. |
|
146 |
|
147 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
148 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
149 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
150 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
|