X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flong-options.c;h=fa7d1cd74cd3893e71147b34dc93013c3447027f;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=33f1d4627d559065571833bf3ee8bb60d0eee884;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git

diff --git a/lib/long-options.c b/lib/long-options.c
index 33f1d4627..fa7d1cd74 100644
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -1,12 +1,12 @@
 /* Utility to accept --help and --version options as unobtrusively as possible.
 
-   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2002, 2003, 2004, 2005 Free
-   Software Foundation, Inc.
+   Copyright (C) 1993-1994, 1998-2000, 2002-2006, 2009-2014 Free Software
+   Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 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
@@ -14,14 +14,11 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "long-options.h"
@@ -41,16 +38,16 @@ static struct option const long_options[] =
 };
 
 /* Process long options --help and --version, but only if argc == 2.
-   Be careful not to gobble up `--'.  */
+   Be careful not to gobble up "--".  */
 
 void
 parse_long_options (int argc,
-		    char **argv,
-		    const char *command_name,
-		    const char *package,
-		    const char *version,
-		    void (*usage_func) (int),
-		    /* const char *author1, ...*/ ...)
+                    char **argv,
+                    const char *command_name,
+                    const char *package,
+                    const char *version,
+                    void (*usage_func) (int),
+                    /* const char *author1, ...*/ ...)
 {
   int c;
   int saved_opterr;
@@ -64,22 +61,22 @@ parse_long_options (int argc,
       && (c = getopt_long (argc, argv, "+", long_options, NULL)) != -1)
     {
       switch (c)
-	{
-	case 'h':
-	  (*usage_func) (EXIT_SUCCESS);
-
-	case 'v':
-	  {
-	    va_list authors;
-	    va_start (authors, usage_func);
-	    version_etc_va (stdout, command_name, package, version, authors);
-	    exit (0);
-	  }
-
-	default:
-	  /* Don't process any other long-named options.  */
-	  break;
-	}
+        {
+        case 'h':
+          (*usage_func) (EXIT_SUCCESS);
+
+        case 'v':
+          {
+            va_list authors;
+            va_start (authors, usage_func);
+            version_etc_va (stdout, command_name, package, version, authors);
+            exit (0);
+          }
+
+        default:
+          /* Don't process any other long-named options.  */
+          break;
+        }
     }
 
   /* Restore previous value.  */