d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't abort immediately on directory change errors.

Browse Source 
Instead, display a warning, clean up, and let main() return the error.
In particular, this means that chdir() problems won't leave broken
archives, though they will prompt an error exit value.
This commit is contained in:
Tim Kientzle 2004-06-27 01:08:54 +00:00
parent 5706472c3a
commit 4049589b28
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.bin/tar/write.c
View File

@ -349,9 +349,13 @@ write_archive(struct archive *a, struct bsdtar *bsdtar)
pending_dir = NULL;
if (bsdtar->start_dir != NULL && chdir(bsdtar->start_dir))
bsdtar_errc(bsdtar, 1, errno,
if (bsdtar->start_dir != NULL && chdir(bsdtar->start_dir)) {
bsdtar_warnc(bsdtar, errno,
"chdir(%s) failed", bsdtar->start_dir);
bsdtar->return_value = 1;
return;
}
if (bsdtar->names_from_file != NULL)
archive_names_from_file(bsdtar, a);
@ -363,9 +367,12 @@ write_archive(struct archive *a, struct bsdtar *bsdtar)
if (*arg == '\0') {
bsdtar->argv++;
arg = *bsdtar->argv;
if (arg == NULL)
bsdtar_errc(bsdtar, 1, 0,
if (arg == NULL) {
bsdtar_warnc(bsdtar, 1, 0,
"Missing argument for -C");
bsdtar->return_value = 1;
return;
}
}
/*-
@ -417,10 +424,13 @@ write_archive(struct archive *a, struct bsdtar *bsdtar)
if (pending_dir &&
(*arg != '/' || (*arg == '@' && arg[1] != '/'))) {
/* Handle a deferred -C */
if (chdir(pending_dir))
bsdtar_errc(bsdtar, 1, 0,
if (chdir(pending_dir)) {
bsdtar_warnc(bsdtar, 0,
"could not chdir to '%s'\n",
pending_dir);
bsdtar->return_value = 1;
return;
}
free(pending_dir);
pending_dir = NULL;
}