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

* path.cc (slash_drive_prefix_p): Remove.

Browse Source 
(mount_info::slash_drive_to_win32_path): Ditto.
(mount_info::conv_to_win32_path): Remove slash drive prefix check.
(mount_info::add_item): Ditto.
(mount_info::del_item): Ditto.
* shared_info.h (mount_info): Remove slash_drive_to_win32_path declaration.
This commit is contained in:
Christopher Faylor 2001-05-25 03:13:14 +00:00
parent 3ed3570b68
commit 86f41a0954
3 changed files with 20 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,13 @@
Thu May 24 15:46:50 2001 Christopher Faylor <cgf@cygnus.com>
* path.cc (slash_drive_prefix_p): Remove.
(mount_info::slash_drive_to_win32_path): Ditto.
(mount_info::conv_to_win32_path): Remove slash drive prefix check.
(mount_info::add_item): Ditto.
(mount_info::del_item): Ditto.
* shared_info.h (mount_info): Remove slash_drive_to_win32_path
declaration.
Thu May 24 01:17:33 2001 Christopher Faylor <cgf@cygnus.com>
* exceptions.cc (handle_exceptions): Bump repeat count for debugging

36
winsup/cygwin/path.cc
View File

@ -1038,18 +1038,6 @@ nofinalslash (const char *src, char *dst)
dst[len] = '\0';
}
/* slash_drive_prefix_p: Return non-zero if PATH begins with
//<letter>. */
static int
slash_drive_prefix_p (const char *path)
{
return (isdirsep(path[0])
&& isdirsep(path[1])
&& isalpha (path[2])
&& (path[3] == 0 || path[3] == '/'));
}
/* slash_unc_prefix_p: Return non-zero if PATH begins with //UNC/SHARE */
int __stdcall
@ -1254,9 +1242,6 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst,
if (i >= nmounts)
{
if (slash_drive_prefix_p (pathbuf))
slash_drive_to_win32_path (pathbuf, dst, 0);
else
backslashify (pathbuf, dst, 0); /* just convert */
*flags = 0;
}
@ -1280,20 +1265,6 @@ out:
return 0;
}
/* Convert PATH (for which slash_drive_prefix_p returns 1) to WIN32 form. */
void
mount_info::slash_drive_to_win32_path (const char *path, char *buf,
int trailing_slash_p)
{
buf[0] = path[2];
buf[1] = ':';
if (path[3] == '0')
strcpy (buf + 2, "\\");
else
backslashify (path + 3, buf + 2, trailing_slash_p);
}
/* cygdrive_posix_path: Build POSIX path used as the
mount point for cygdrives created when there is no other way to
obtain a POSIX path from a Win32 one. */
@ -1920,9 +1891,6 @@ mount_info::add_item (const char *native, const char *posix, unsigned mountflags
char nativetmp[MAX_PATH];
char posixtmp[MAX_PATH];
if (slash_drive_prefix_p (native))
slash_drive_to_win32_path (native, nativetmp, 0);
else
backslashify (native, nativetmp, 0);
nofinalslash (nativetmp, nativetmp);
@ -1990,9 +1958,7 @@ mount_info::del_item (const char *path, unsigned flags, int reg_p)
return -1;
}
if (slash_drive_prefix_p (path))
slash_drive_to_win32_path (path, pathtmp, 0);
else if (slash_unc_prefix_p (path) || strpbrk (path, ":\\"))
if (slash_unc_prefix_p (path) || strpbrk (path, ":\\"))
backslashify (path, pathtmp, 0);
else
{

1
winsup/cygwin/shared_info.h
View File

@ -99,7 +99,6 @@ private:
int cygdrive_win32_path (const char *src, char *dst, int trailing_slash_p);
void cygdrive_posix_path (const char *src, char *dst, int trailing_slash_p);
void slash_drive_to_win32_path (const char *path, char *buf, int trailing_slash_p);
void read_cygdrive_info_from_registry ();
};