X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=61b7bcae2dc00ebf71870a2b7d0c31984b2a2857;hb=c270f6f1b2454650c984b3b002f9fdd6a9f32f1a;hp=02737a147885df38f2e020037ed06c12e3617e8f;hpb=33a2b1fc06b574ac763b43e047f145604d075696;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index 02737a1..61b7bca 100644 --- a/src/tar.c +++ b/src/tar.c @@ -1,5 +1,5 @@ /* A tar (tape archiver) program. - Copyright (C) 1988, 92,93,94,95,96,97, 1999 Free Software Foundation, Inc. + Copyright 1988, 92,93,94,95,96,97, 1999 Free Software Foundation, Inc. Written by John Gilmore, starting 1985-08-25. This program is free software; you can redistribute it and/or modify it @@ -625,6 +625,7 @@ decode_options (int argc, char *const *argv) case 'g': listed_incremental_option = optarg; + after_date_option = 1; /* Fall through. */ case 'G': @@ -657,7 +658,7 @@ decode_options (int argc, char *const *argv) case 'K': starting_file_option = 1; - addname (optarg); + addname (optarg, NULL); break; case 'l': @@ -1012,7 +1013,7 @@ decode_options (int argc, char *const *argv) printf ("tar (GNU %s) %s\n", PACKAGE, VERSION); fputs (_("\ \n\ -Copyright (C) 1988, 92,93,94,95,96,97,98, 1999 Free Software Foundation, Inc.\n"), +Copyright 1988, 92,93,94,95,96,97,98, 1999 Free Software Foundation, Inc.\n"), stdout); fputs (_("\ This is free software; see the source for copying conditions. There is NO\n\ @@ -1065,6 +1066,11 @@ Written by John Gilmore and Jay Fenlason.\n"), USAGE_ERROR ((0, 0, _("Multiple archive files requires `-M' option"))); + if (listed_incremental_option + && newer_mtime_option != TYPE_MINIMUM (time_t)) + USAGE_ERROR ((0, 0, + _("Cannot combine --listed-incremental with --newer"))); + /* If ready to unlink hierarchies, so we are for simpler files. */ if (recursive_unlink_option) unlink_first_option = 1;