X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=amar-src%2Famarchiver.c;fp=amar-src%2Famarchiver.c;h=481f911ec02eeeaf8e6ab8fa746e213e7f287be6;hb=d28952249e392eb31bc8eecc53f6c477f30c617b;hp=71821e7f2d2b1160c0e6be6af93eb4a664f7a6a2;hpb=949b8910a5e23c4285d0b1aedacfc82a14dc97a5;p=debian%2Famanda diff --git a/amar-src/amarchiver.c b/amar-src/amarchiver.c index 71821e7..481f911 100644 --- a/amar-src/amarchiver.c +++ b/amar-src/amarchiver.c @@ -1,9 +1,10 @@ /* * Copyright (c) 2008-2012 Zmanda, Inc. All Rights Reserved. * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY @@ -37,6 +38,7 @@ usage(void) { printf("Usage: amarchiver [--version|--create|--list|--extract] [--verbose]* [--file file]\n"); printf(" [filename]*\n"); + exit(1); } static void @@ -340,12 +342,6 @@ int main( g_fprintf(stderr,"Only one of --create, --list or --extract must be provided\n"); usage(); } - if (opt_list > 1) { - if (argc) { - g_fprintf(stderr, "--list does not take any additional filenames\n"); - usage(); - } - } if (opt_create > 0) do_create(opt_file, opt_verbose, argc, argv);