Import upstream version 1.29

[debian/tar] / gnu / argp-help.c

diff --git a/gnu/argp-help.c b/gnu/argp-help.c
index e52986992c422f469ad010debaa5b502c47e35d4..ebb53fc61effd8a81e6e6e4642b5a1a629e07a83 100644 (file)
--- a/gnu/argp-help.c
+++ b/gnu/argp-help.c
@@ -1,7 +1,5 @@
-/* -*- buffer-read-only: t -*- vi: set ro: */
-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Hierarchical argument parsing help output
-   Copyright (C) 1995-2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995-2005, 2007, 2009-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -1508,11 +1506,15 @@ argp_doc (const struct argp *argp, const struct argp_state *state,
       if (vt)
         {
           if (post)
-            inp_text = vt + 1;
+            {
+              inp_text = vt + 1;
+              if (! *inp_text)
+                inp_text = 0;
+            }
           else
             {
               inp_text_len = vt - argp->doc;
-              inp_text = __strndup (argp->doc, inp_text_len);
+              inp_text = inp_text_len ? __strndup (argp->doc, inp_text_len) : 0;
             }
         }
       else