Mercurial > emacs
diff src/fileio.c @ 90185:5b029ff3b08d
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-55
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 320-323)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 26 May 2005 05:42:19 +0000 |
| parents | f042e7c0fe20 12b3cd6b8467 |
| children | 01137c1fdbe9 |
line wrap: on
line diff
--- a/src/fileio.c Sun May 22 08:23:26 2005 +0000 +++ b/src/fileio.c Thu May 26 05:42:19 2005 +0000 @@ -1655,8 +1655,16 @@ p += 2; } else if (IS_DIRECTORY_SEP (p[0]) && p[1] == '.' && p[2] == '.' - /* `/../' is the "superroot" on certain file systems. */ + /* `/../' is the "superroot" on certain file systems. + Turned off on DOS_NT systems because they have no + "superroot" and because this causes us to produce + file names like "d:/../foo" which fail file-related + functions of the underlying OS. (To reproduce, try a + long series of "../../" in default_directory, longer + than the number of levels from the root.) */ +#ifndef DOS_NT && o != target +#endif && (IS_DIRECTORY_SEP (p[3]) || p[3] == 0)) { while (o != target && (--o) && !IS_DIRECTORY_SEP (*o))