libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* cygpath.cc (doit): Detect and warn about an empty path. Detect and warn 

about errors converting a path.
(main): Set prog_name correctly -- don't leave an extra slash or backslash at
the beginning of it.
This commit is contained in:
Christopher Faylor 2001-12-26 17:46:12 +00:00
parent 028ee5466b
commit c02e32c9bd
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/utils/ChangeLog
View File

@ -1,3 +1,10 @@
2001-12-26 Jonathan Kamens <jik@curl.com>
* cygpath.cc (doit): Detect and warn about an empty path. Detect and
warn about errors converting a path.
(main): Set prog_name correctly -- don't leave an extra slash or
backslash at the beginning of it.
Fri Dec 14 14:04:37 2001 Jason Tishler <jason@tishler.net> Fri Dec 14 14:04:37 2001 Jason Tishler <jason@tishler.net>
* mkpasswd.c (enum_users): Change to unconditionally use * mkpasswd.c (enum_users): Change to unconditionally use

26
winsup/utils/cygpath.cc
View File

@ -141,6 +141,8 @@ doit (char *filename)
{ {
char *buf; char *buf;
size_t len; size_t len;
int retval;
int (*conv_func)(const char *, char *);
if (path_flag) if (path_flag)
{ {
@ -155,7 +157,14 @@ doit (char *filename)
} }
if (! path_flag) if (! path_flag)
{
len = strlen (filename) + 100; len = strlen (filename) + 100;
if (len == 100)
{
fprintf(stderr, "%s: can't convert empty path\n", prog_name);
exit (1);
}
}
else else
{ {
if (unix_flag) if (unix_flag)
@ -188,13 +197,20 @@ doit (char *filename)
else else
{ {
if (unix_flag) if (unix_flag)
(absolute_flag ? cygwin_conv_to_full_posix_path : cygwin_conv_to_posix_path) (filename, buf); conv_func = (absolute_flag ? cygwin_conv_to_full_posix_path :
cygwin_conv_to_posix_path);
else else
conv_func = (absolute_flag ? cygwin_conv_to_full_win32_path :
cygwin_conv_to_win32_path);
retval = conv_func (filename, buf);
if (retval < 0)
{ {
(absolute_flag ? cygwin_conv_to_full_win32_path : cygwin_conv_to_win32_path) (filename, buf); fprintf (stderr, "%s: error converting \"%s\"\n",
if (shortname_flag) prog_name, filename);
buf = get_short_name (buf); exit (1);
} }
if (!unix_flag && shortname_flag)
buf = get_short_name (buf);
} }
puts (buf); puts (buf);
@ -214,6 +230,8 @@ main (int argc, char **argv)
prog_name = strrchr (argv[0], '\\'); prog_name = strrchr (argv[0], '\\');
if (prog_name == NULL) if (prog_name == NULL)
prog_name = argv[0]; prog_name = argv[0];
else
prog_name++;
path_flag = 0; path_flag = 0;
unix_flag = 0; unix_flag = 0;