* path.cc (normalize_posix_path): Fix more slashdot madness.

This commit is contained in:
Christopher Faylor 2000-09-12 18:41:36 +00:00
parent 5c8663ed32
commit 67826e2264
2 changed files with 10 additions and 6 deletions

View File

@ -1,3 +1,7 @@
Tue Sep 12 14:37:32 2000 Christopher Faylor <cgf@cygnus.com>
* path.cc (normalize_posix_path): Fix more slashdot madness.
Tue Sep 12 12:29:29 2000 Christopher Faylor <cgf@cygnus.com> Tue Sep 12 12:29:29 2000 Christopher Faylor <cgf@cygnus.com>
* Makefile.in: Make clean target remove *.d. * Makefile.in: Make clean target remove *.d.

View File

@ -551,11 +551,7 @@ normalize_posix_path (const char *src, char *dst)
strcpy (dst, cwd); strcpy (dst, cwd);
dst = strchr (dst, '\0'); dst = strchr (dst, '\0');
if (*src == '.') if (*src == '.')
{ goto sawdot;
if (dst == dst_start + 1)
dst--;
goto sawdot;
}
if (dst > dst_start && !isslash (dst[-1])) if (dst > dst_start && !isslash (dst[-1]))
*dst++ = '/'; *dst++ = '/';
} }
@ -603,7 +599,11 @@ normalize_posix_path (const char *src, char *dst)
if (src[1] != '.') if (src[1] != '.')
{ {
if (!src[1]) if (!src[1])
goto done; {
if (dst == dst_start)
*dst++ = '/';
goto done;
}
if (!isslash (src[1])) if (!isslash (src[1]))
break; break;
} }