X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsh-quote.c;h=e349f403e592437c57fd3d64b400e62e344f7bc4;hb=4cd8485e904c1a98470eb548fe6ac0f04e343c4e;hp=2e35f22e63b83b6d96dbde43c990eea8fa7f83d6;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git

diff --git a/lib/sh-quote.c b/lib/sh-quote.c
index 2e35f22e6..e349f403e 100644
--- a/lib/sh-quote.c
+++ b/lib/sh-quote.c
@@ -1,11 +1,11 @@
 /* Shell quoting.
-   Copyright (C) 2001-2004 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
-   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
@@ -13,12 +13,9 @@
    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/>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "sh-quote.h"
@@ -90,7 +87,7 @@ shell_quote_argv (char **argv)
 	    break;
 	}
 
-      command = (char *) xmalloc (length);
+      command = XNMALLOC (length, char);
 
       p = command;
       for (argp = argv; ; )