JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* path.cc (normalize_posix_path): Convert path to POSIX if it seems to be a

Browse Source 
Windows path.
This commit is contained in:
Christopher Faylor 2000-06-15 19:44:50 +00:00
parent 48b1381da1
commit 54ee424711
2 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,14 @@
Thu Jun 15 15:43:50 2000 Christopher Faylor <cgf@cygnus.com>
* path.cc (normalize_posix_path): Convert path to POSIX if it seems to
be a Windows path.
2000-06-15 Kazuhiro Fujieda <fujieda@jaist.ac.jp>
* path.cc (mount_info::add_item): Eliminate a trailing backslash
included in a native path starting with '//[A-Za-z]/...'.
* path.cc (mount_info::del_item): Accept a native path as its target.
Wed Jun 14 23:47:19 2000 Christopher Faylor <cgf@cygnus.com> Wed Jun 14 23:47:19 2000 Christopher Faylor <cgf@cygnus.com>
* environ.cc (conv_envvars): Detect and convert all environment * environ.cc (conv_envvars): Detect and convert all environment

54
winsup/cygwin/path.cc
View File

@ -556,6 +556,11 @@ normalize_posix_path (const char *cwd, const char *src, char *dst)
char *dst_start = dst; char *dst_start = dst;
syscall_printf ("cwd %s, src %s", cwd, src); syscall_printf ("cwd %s, src %s", cwd, src);
if (isdrive (src) || strpbrk (src, "\\:/"))
{
cygwin_conv_to_full_posix_path (src, dst);
return 0;
}
if (!isslash (src[0])) if (!isslash (src[0]))
{ {
if (strlen (cwd) + 1 + strlen (src) >= MAX_PATH) if (strlen (cwd) + 1 + strlen (src) >= MAX_PATH)
@ -1614,10 +1619,8 @@ mount_info::add_item (const char *native, const char *posix, unsigned mountflags
if (slash_drive_prefix_p (native)) if (slash_drive_prefix_p (native))
slash_drive_to_win32_path (native, nativetmp, 0); slash_drive_to_win32_path (native, nativetmp, 0);
else else
{ backslashify (native, nativetmp, 0);
backslashify (native, nativetmp, 0); nofinalslash (nativetmp, nativetmp);
nofinalslash (nativetmp, nativetmp);
}
slashify (posix, posixtmp, 0); slashify (posix, posixtmp, 0);
nofinalslash (posixtmp, posixtmp); nofinalslash (posixtmp, posixtmp);
@ -1677,36 +1680,49 @@ int
mount_info::del_item (const char *path, unsigned flags, int reg_p) mount_info::del_item (const char *path, unsigned flags, int reg_p)
{ {
char pathtmp[MAX_PATH]; char pathtmp[MAX_PATH];
int posix_path_p = FALSE;
/* Something's wrong if path is NULL or empty. */ /* Something's wrong if path is NULL or empty. */
if (path == NULL || *path == 0) if (path == NULL || *path == 0 || !isabspath (path))
{ {
set_errno (EINVAL); set_errno (EINVAL);
return -1; return -1;
} }
slashify (path, pathtmp, 0); if (slash_drive_prefix_p (path))
slash_drive_to_win32_path (path, pathtmp, 0);
else if (slash_unc_prefix_p (path) || strpbrk (path, ":\\"))
backslashify (path, pathtmp, 0);
else
{
slashify (path, pathtmp, 0);
posix_path_p = TRUE;
}
nofinalslash (pathtmp, pathtmp); nofinalslash (pathtmp, pathtmp);
debug_printf ("%s[%s]", path, pathtmp); if (reg_p && posix_path_p &&
del_reg_mount (pathtmp, flags) &&
if (reg_p && del_reg_mount (pathtmp, flags) del_reg_mount (path, flags)) /* for old irregular entries */
&& del_reg_mount (path, flags)) /* for old irregular entries */
return -1; return -1;
for (int i = 0; i < nmounts; i++) for (int i = 0; i < nmounts; i++)
{ {
/* Delete if paths and mount locations match. */ int ent = native_sorted[i]; /* in the same order as getmntent() */
if ((strcasematch (mount[i].posix_path, pathtmp) if (((posix_path_p)
|| strcasematch (mount[i].native_path, pathtmp)) && ? strcasematch (mount[ent].posix_path, pathtmp)
(mount[i].flags & MOUNT_SYSTEM) == (flags & MOUNT_SYSTEM)) : strcasematch (mount[ent].native_path, pathtmp)) &&
(mount[ent].flags & MOUNT_SYSTEM) == (flags & MOUNT_SYSTEM))
{ {
nmounts--; /* One less mount table entry */ if (!posix_path_p &&
reg_p && del_reg_mount (mount[ent].posix_path, flags))
return -1;
nmounts--; /* One less mount table entry */
/* Fill in the hole if not at the end of the table */ /* Fill in the hole if not at the end of the table */
if (i < nmounts) if (ent < nmounts)
memmove (mount + i, mount + i + 1, memmove (mount + ent, mount + ent + 1,
sizeof (mount[i]) * (nmounts - i)); sizeof (mount[ent]) * (nmounts - ent));
sort (); /* Resort the table */ sort (); /* Resort the table */
return 0; return 0;
} }
} }