X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargp-help.c;h=a9843c0aa3b158c2477da8a1498863c432fd0e79;hb=2acbd879db6eed728272f219f374da1b22bd5df8;hp=1a4131fd99b48bf4b1e888f85cb38f481a071125;hpb=8c390823e6ade7718fbde851fdebb6ef69d53ad5;p=gnulib.git

diff --git a/lib/argp-help.c b/lib/argp-help.c
index 1a4131fd9..a9843c0aa 100644
--- a/lib/argp-help.c
+++ b/lib/argp-help.c
@@ -3,19 +3,18 @@
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
-   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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE	1
@@ -89,11 +88,11 @@ struct uparams
   int dup_args_note;
 
   /* Various output columns.  */
-  int short_opt_col;      /* column in which short options start */   
-  int long_opt_col;       /* column in which long options start */ 
+  int short_opt_col;      /* column in which short options start */
+  int long_opt_col;       /* column in which long options start */
   int doc_opt_col;        /* column in which doc options start */
   int opt_doc_col;        /* column in which option text starts */
-  int header_col;         /* column in which group headers are printed */ 
+  int header_col;         /* column in which group headers are printed */
   int usage_indent;       /* indentation of wrapped usage lines */
   int rmargin;            /* right margin used for wrapping */
 
@@ -161,7 +160,7 @@ fill_in_uparams (const struct argp_state *state)
 {
   const char *var = getenv ("ARGP_HELP_FMT");
   struct uparams new_params = uparams;
-  
+
 #define SKIPWS(p) do { while (isspace ((unsigned char) *p)) p++; } while (0);
 
   if (var)
@@ -170,7 +169,7 @@ fill_in_uparams (const struct argp_state *state)
       while (*var)
 	{
 	  SKIPWS (var);
-	  
+
 	  if (isalpha ((unsigned char) *var))
 	    {
 	      size_t var_len;
@@ -181,9 +180,9 @@ fill_in_uparams (const struct argp_state *state)
 	      while (isalnum ((unsigned char) *arg) || *arg == '-' || *arg == '_')
 		arg++;
 	      var_len = arg - var;
-	      
+
 	      SKIPWS (arg);
-	      
+
 	      if (*arg == '\0' || *arg == ',')
 		unspec = 1;
 	      else if (*arg == '=')
@@ -191,7 +190,7 @@ fill_in_uparams (const struct argp_state *state)
 		  arg++;
 		  SKIPWS (arg);
 		}
-	      
+
 	      if (unspec)
 		{
 		  if (var[0] == 'n' && var[1] == 'o' && var[2] == '-')
@@ -210,7 +209,7 @@ fill_in_uparams (const struct argp_state *state)
 		    arg++;
 		  SKIPWS (arg);
 		}
-	      
+
 	      for (un = uparam_names; un->name; un++)
 		if (strlen (un->name) == var_len
 		    && strncmp (var, un->name, var_len) == 0)
@@ -677,7 +676,7 @@ hol_cluster_cmp (const struct hol_cluster *cl1, const struct hol_cluster *cl2)
 {
   /* If one cluster is deeper than the other, use its ancestor at the same
      level, so that finding the common ancestor is straightforward.
-     
+
      clN->depth > 0 means that clN->parent != NULL (see hol_add_cluster) */
   while (cl1->depth > cl2->depth)
     cl1 = cl1->parent;
@@ -807,7 +806,7 @@ hol_entry_cmp (const struct hol_entry *entry1,
 #endif
 	  /* Compare ignoring case, except when the options are both the
 	     same letter, in which case lower-case always comes first.  */
-	  return lower_cmp ? lower_cmp : 
+	  return lower_cmp ? lower_cmp :
                     (rc = first2 - first1) ?
 	             rc : HOL_ENTRY_PTRCMP(entry1, entry2);
 	}