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

* cygpath.cc (main): Support -w for Windows (System) directories and return

Browse Source 
physical correct orthography for the Windows System dir.
This commit is contained in:
Christopher Faylor
2001-08-15 03:24:18 +00:00
parent 3ca6bcc4d0
commit da3ea61edd
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@@ -1,3 +1,8 @@
2001-08-14 Joerg Schaible <joerg.schaible@gmx.de>
* cygpath.cc (main): Support -w for Windows (System) directories and
return physical correct orthography for the Windows System dir.
2001-07-14 Chris Genly <chgenly@alum.mit.edu> 2001-07-14 Chris Genly <chgenly@alum.mit.edu>
* regtool.cc (find_key): Handle keys with only one subkey. * regtool.cc (find_key): Handle keys with only one subkey.

9
winsup/utils/cygpath.cc
View File

@@ -208,6 +208,7 @@ main (int argc, char **argv)
int options_from_file_flag; int options_from_file_flag;
char *filename; char *filename;
char buf[MAX_PATH], buf2[MAX_PATH]; char buf[MAX_PATH], buf2[MAX_PATH];
WIN32_FIND_DATA w32_fd;
prog_name = strrchr (argv[0], '/'); prog_name = strrchr (argv[0], '/');
if (prog_name == NULL) if (prog_name == NULL)
@@ -266,13 +267,21 @@ main (int argc, char **argv)
case 'W': case 'W':
GetWindowsDirectory(buf, MAX_PATH); GetWindowsDirectory(buf, MAX_PATH);
if (!windows_flag)
cygwin_conv_to_posix_path(buf, buf2); cygwin_conv_to_posix_path(buf, buf2);
else
strcpy(buf2, buf);
printf("%s\n", buf2); printf("%s\n", buf2);
exit(0); exit(0);
case 'S': case 'S':
GetSystemDirectory(buf, MAX_PATH); GetSystemDirectory(buf, MAX_PATH);
FindFirstFile(buf, &w32_fd);
strcpy(strrchr(buf, '\\')+1, w32_fd.cFileName);
if (!windows_flag)
cygwin_conv_to_posix_path(buf, buf2); cygwin_conv_to_posix_path(buf, buf2);
else
strcpy(buf2, buf);
printf("%s\n", buf2); printf("%s\n", buf2);
exit(0); exit(0);