mirrors/tar
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/tar.git synced 2026-07-28 00:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

tar: go back to absolutifying filenames in normalize_filename for now

Browse Source 
* src/misc.c (normalize_filename): For now, go back to making
filenames absolute, even though this causes 'tar' to fail when
getcwd fails.  However, do not attempt to resolve ".." as this
does not work with symlinks.  Also, do the right thing with
leading file system prefixes and on hosts where // != /.
This commit is contained in:
Paul R. Eggert
2010-07-17 15:47:46 -07:00
committed by Paul Eggert
parent c1b30c268f
commit 427b3b8c79
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/misc.c
+26 -1
View File
@@ -278,7 +278,32 @@ normalize_filename_x (char *file_name)
char *
normalize_filename (const char *name)
{
char *copy = xstrdup (name);
char *copy = NULL;
if (IS_RELATIVE_FILE_NAME (name))
{
/* Set COPY to the absolute file name if possible.
FIXME: There should be no need to get the absolute file name.
getcwd is slow, it might fail, and it does not necessarily
return a canonical name even when it succeeds. Perhaps we
can use dev+ino pairs instead of names? */
copy = xgetcwd ();
if (copy)
{
size_t copylen = strlen (copy);
bool need_separator = ! (DOUBLE_SLASH_IS_DISTINCT_ROOT
&& copylen == 2 && ISSLASH (copy[1]));
copy = xrealloc (copy, copylen + need_separator + strlen (name) + 1);
copy[copylen] = DIRECTORY_SEPARATOR;
strcpy (copy + copylen + need_separator, name);
}
else
WARN ((0, errno, _("Cannot get working directory")));
}
if (! copy)
copy = xstrdup (name);
normalize_filename_x (copy);
return copy;
}