Revamp initial name collection functions to ensure proper argument ordering.

[chaz/tar] / lib / prepargs.c

diff --git a/lib/prepargs.c b/lib/prepargs.c
index d8ca5d0bf36fd46790bf1b4a1cf720448ce39b8f..9b30d2493bffad74ef5718e50985b916b4e05b92 100644 (file)
--- a/lib/prepargs.c
+++ b/lib/prepargs.c
@@ -1,9 +1,9 @@
 /* Parse arguments from a string and prepend them to an argv.
 /* Parse arguments from a string and prepend them to an argv.

-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999-2001, 2007, 2013 Free Software Foundation, Inc.

 
    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
 
    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)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -12,9 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* Written by Paul Eggert <eggert@twinsun.com>.  */
 
 
 /* Written by Paul Eggert <eggert@twinsun.com>.  */
 


@@ -25,6 +23,10 @@
 #include <sys/types.h>
 #include <xalloc.h>
 
 #include <sys/types.h>
 #include <xalloc.h>
 

+#if HAVE_STRING_H
+# include <string.h>
+#endif
+

 #include <ctype.h>
 
 /* IN_CTYPE_DOMAIN (C) is nonzero if the unsigned char C can safely be given
 #include <ctype.h>
 
 /* IN_CTYPE_DOMAIN (C) is nonzero if the unsigned char C can safely be given