midfavila
/
sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

tar: Check inode AND dev before ignoring a file. Thanks, Lars Lindqvist!

This commit is contained in:
David Galos 2013-07-28 12:12:03 -04:00
parent 50d9305752
commit b5b7db4009
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tar.c
View File

@ -48,6 +48,7 @@ static void xt(int (*)(char*, int, char[Blksiz]));
static FILE *tarfile;
static ino_t tarinode;
static dev_t tardev;
static void
usage(void)
@ -126,6 +127,7 @@ main(int argc, char *argv[])
if (lstat(file, &st) < 0)
eprintf("tar: stat '%s':", file);
tarinode = st.st_ino;
tardev = st.st_dev;
} else {
tarfile = (mode == 'c') ? stdout : stdin;
}
@ -161,7 +163,7 @@ archive(const char* path, const struct stat* sta, int type)
mode_t mode;
lstat(path, &st);
if (st.st_ino == tarinode) {
if (st.st_ino == tarinode && st.st_dev == tardev) {
fprintf(stderr, "ignoring '%s'\n", path);
return 0;
}