* path.cc (cwdstuff::get_initial): Keep caching alive.
(mount_info::conv_to_win32_path): Fill out relative path in failing case.
This commit is contained in:
parent
f7925ed552
commit
b8a0fafe80
@ -1,3 +1,9 @@
|
|||||||
|
Wed Sep 6 02:40:12 2000 Christopher Faylor <cgf@cygnus.com>
|
||||||
|
|
||||||
|
* path.cc (cwdstuff::get_initial): Keep caching alive.
|
||||||
|
(mount_info::conv_to_win32_path): Fill out relative path in failing
|
||||||
|
case.
|
||||||
|
|
||||||
Tue Sep 5 21:36:15 2000 Christopher Faylor <cgf@cygnus.com>
|
Tue Sep 5 21:36:15 2000 Christopher Faylor <cgf@cygnus.com>
|
||||||
|
|
||||||
* path.cc (normalize_posix_path): Deal with error return from cygcwd.get.
|
* path.cc (normalize_posix_path): Deal with error return from cygcwd.get.
|
||||||
|
@ -1048,7 +1048,9 @@ fillin:
|
|||||||
if (!cygcwd.get (cwd_win32, 0))
|
if (!cygcwd.get (cwd_win32, 0))
|
||||||
return get_errno ();
|
return get_errno ();
|
||||||
unsigned cwdlen = strlen (cwd_win32);
|
unsigned cwdlen = strlen (cwd_win32);
|
||||||
if (path_prefix_p (cwd_win32, dst, cwdlen))
|
if (!path_prefix_p (cwd_win32, dst, cwdlen))
|
||||||
|
strcpy (win32_path, dst);
|
||||||
|
else
|
||||||
{
|
{
|
||||||
size_t n = strlen (dst);
|
size_t n = strlen (dst);
|
||||||
if (n < cwdlen)
|
if (n < cwdlen)
|
||||||
@ -2885,10 +2887,12 @@ cwdstuff::fixup_after_exec (char *win32_cwd, char *posix_cwd, DWORD hash_cwd)
|
|||||||
bool
|
bool
|
||||||
cwdstuff::get_initial ()
|
cwdstuff::get_initial ()
|
||||||
{
|
{
|
||||||
lock->acquire ();
|
if (win32)
|
||||||
DWORD len, dlen;
|
return 1;
|
||||||
|
|
||||||
|
lock->acquire ();
|
||||||
int i;
|
int i;
|
||||||
|
DWORD len, dlen;
|
||||||
for (i = 0, dlen = MAX_PATH, len = 0; i < 3; dlen *= 2, i++)
|
for (i = 0, dlen = MAX_PATH, len = 0; i < 3; dlen *= 2, i++)
|
||||||
{
|
{
|
||||||
win32 = (char *) crealloc (win32, dlen + 2);
|
win32 = (char *) crealloc (win32, dlen + 2);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user