X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=943c23addfe555ed8223886a9861df385f29facd;hb=94d0385a57dc46f71234e97edb9ff49e687cbae6;hp=5b68548fde14a72cfffd0bf35115a823c775553b;hpb=a76ab340dd4d8929117e38c076582c1c8a60bd81;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index 5b68548..943c23a 100644 --- a/src/tar.c +++ b/src/tar.c @@ -406,7 +406,7 @@ static struct argp_option options[] = { #define GRID 30 {NULL, 0, NULL, 0, - N_("Overwrite control:"), GRID+1 }, + N_("Overwrite control:"), GRID }, {"verify", 'W', 0, 0, N_("attempt to verify the archive after writing it"), GRID+1 }, @@ -488,7 +488,7 @@ static struct argp_option options[] = { #define GRID 60 {NULL, 0, NULL, 0, - N_("Device selection and switching:\n"), GRID+1 }, + N_("Device selection and switching:"), GRID }, {"file", 'f', N_("ARCHIVE"), 0, N_("use archive file or device ARCHIVE"), GRID+1 }, @@ -527,7 +527,7 @@ static struct argp_option options[] = { #define GRID 70 {NULL, 0, NULL, 0, - N_("Device blocking:"), GRID+1 }, + N_("Device blocking:"), GRID }, {"blocking-factor", 'b', N_("BLOCKS"), 0, N_("BLOCKS x 512 bytes per record"), GRID+1 }, @@ -2327,13 +2327,14 @@ main (int argc, char **argv) free (archive_name_array); name_term (); - if (stdlis == stdout) - close_stdout (); - if (exit_status == TAREXIT_FAILURE) error (0, 0, _("Error exit delayed from previous errors")); - if (ferror (stderr) || fclose (stderr) != 0) + + if (stdlis == stdout) + close_stdout (); + else if (ferror (stderr) || fclose (stderr) != 0) exit_status = TAREXIT_FAILURE; + return exit_status; }