1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
To: vim_dev@googlegroups.com
Subject: Patch 7.3.559
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.559
Problem: home_replace() does not work with 8.3 filename.
Solution: Make ":p" expand 8.3 name to full path. (Yasuhiro Matsumoto)
Files: src/eval.c, src/misc1.c
*** ../vim-7.3.558/src/eval.c 2012-06-13 14:28:16.000000000 +0200
--- src/eval.c 2012-06-20 13:52:47.000000000 +0200
***************
*** 23554,23559 ****
--- 23554,23580 ----
return -1;
}
+ #ifdef WIN3264
+ # if _WIN32_WINNT >= 0x0500
+ if (vim_strchr(*fnamep, '~') != NULL)
+ {
+ /* Expand 8.3 filename to full path. Needed to make sure the same
+ * file does not have two different names.
+ * Note: problem does not occur if _WIN32_WINNT < 0x0500. */
+ p = alloc(_MAX_PATH + 1);
+ if (p != NULL)
+ {
+ if (GetLongPathName(*fnamep, p, MAXPATHL))
+ {
+ vim_free(*bufp);
+ *bufp = *fnamep = p;
+ }
+ else
+ vim_free(p);
+ }
+ }
+ # endif
+ #endif
/* Append a path separator to a directory. */
if (mch_isdir(*fnamep))
{
*** ../vim-7.3.558/src/misc1.c 2012-06-20 12:40:01.000000000 +0200
--- src/misc1.c 2012-06-20 13:57:22.000000000 +0200
***************
*** 4499,4505 ****
{
size_t dirlen = 0, envlen = 0;
size_t len;
! char_u *homedir_env;
char_u *p;
if (src == NULL)
--- 4499,4505 ----
{
size_t dirlen = 0, envlen = 0;
size_t len;
! char_u *homedir_env, *homedir_env_orig;
char_u *p;
if (src == NULL)
***************
*** 4525,4533 ****
dirlen = STRLEN(homedir);
#ifdef VMS
! homedir_env = mch_getenv((char_u *)"SYS$LOGIN");
#else
! homedir_env = mch_getenv((char_u *)"HOME");
#endif
if (homedir_env != NULL && *homedir_env == NUL)
--- 4525,4548 ----
dirlen = STRLEN(homedir);
#ifdef VMS
! homedir_env_orig = homedir_env = mch_getenv((char_u *)"SYS$LOGIN");
#else
! homedir_env_orig = homedir_env = mch_getenv((char_u *)"HOME");
! #endif
! #if defined(FEAT_MODIFY_FNAME) || defined(WIN3264)
! if (vim_strchr(homedir_env, '~') != NULL)
! {
! int usedlen = 0;
! int flen;
! char_u *fbuf = NULL;
!
! flen = (int)STRLEN(homedir_env);
! (void)modify_fname(":p", &usedlen, &homedir_env, &fbuf, &flen);
! flen = (int)STRLEN(homedir_env);
! if (flen > 0 && vim_ispathsep(homedir_env[flen - 1]))
! /* Remove the trailing / that is added to a directory. */
! homedir_env[flen - 1] = NUL;
! }
#endif
if (homedir_env != NULL && *homedir_env == NUL)
***************
*** 4585,4590 ****
--- 4600,4608 ----
/* if (dstlen == 0) out of space, what to do??? */
*dst = NUL;
+
+ if (homedir_env != homedir_env_orig)
+ vim_free(homedir_env);
}
/*
*** ../vim-7.3.558/src/version.c 2012-06-20 12:40:01.000000000 +0200
--- src/version.c 2012-06-20 14:02:11.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 559,
/**/
--
The future isn't what it used to be.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
