From bb98d5fe3144e7a357bf58ae189a2f9209d06f63 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 19 Jan 2005 13:54:54 +0000 Subject: [PATCH] New module 'sh-quote'. --- ChangeLog | 5 +++ MODULES.html.sh | 4 +- lib/ChangeLog | 5 +++ lib/sh-quote.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++ lib/sh-quote.h | 37 ++++++++++++++++ modules/sh-quote | 25 +++++++++++ 6 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 lib/sh-quote.c create mode 100644 lib/sh-quote.h create mode 100644 modules/sh-quote diff --git a/ChangeLog b/ChangeLog index 34f38018fe..111446bad9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-19 Bruno Haible + + * modules/sh-quote: New file. + * MODULES.html.sh (Executing programs): Add sh-quote. + 2005-01-18 Paul Eggert * modules/ullong_max: New file. diff --git a/MODULES.html.sh b/MODULES.html.sh index 47f2d53068..c0a54b6206 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2002-2004 Free Software Foundation, Inc. +# Copyright (C) 2002-2005 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 @@ -1922,7 +1922,7 @@ func_all_modules () func_module wait-process func_module execute func_module pipe - #func_module sh-quote + func_module sh-quote func_end_table element="Java" diff --git a/lib/ChangeLog b/lib/ChangeLog index 43b23ea3d3..f2b6288b42 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2005-01-19 Bruno Haible + + * sh-quote.h: New file, from GNU gettext. + * sh-quote.c: New file, from GNU gettext. + 2005-01-18 Paul Eggert Merge changes from coreutils, as described below in several diff --git a/lib/sh-quote.c b/lib/sh-quote.c new file mode 100644 index 0000000000..a549c46ef6 --- /dev/null +++ b/lib/sh-quote.c @@ -0,0 +1,110 @@ +/* Shell quoting. + Copyright (C) 2001-2004 Free Software Foundation, Inc. + Written by Bruno Haible , 2001. + + 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. + + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +/* Specification. */ +#include "sh-quote.h" + +#include + +#include "quotearg.h" +#include "xalloc.h" + +/* Describes quoting for sh compatible shells. */ +static struct quoting_options *sh_quoting_options; + +/* Initializes the sh_quoting_options variable. */ +static void +init_sh_quoting_options () +{ + sh_quoting_options = clone_quoting_options (NULL); + set_quoting_style (sh_quoting_options, shell_quoting_style); +} + +/* Returns the number of bytes needed for the quoted string. */ +size_t +shell_quote_length (const char *string) +{ + if (sh_quoting_options == NULL) + init_sh_quoting_options (); + return quotearg_buffer (NULL, 0, string, strlen (string), + sh_quoting_options); +} + +/* Copies the quoted string to p and returns the incremented p. + There must be room for shell_quote_length (string) + 1 bytes at p. */ +char * +shell_quote_copy (char *p, const char *string) +{ + if (sh_quoting_options == NULL) + init_sh_quoting_options (); + return p + quotearg_buffer (p, (size_t)(-1), string, strlen (string), + sh_quoting_options); +} + +/* Returns the freshly allocated quoted string. */ +char * +shell_quote (const char *string) +{ + if (sh_quoting_options == NULL) + init_sh_quoting_options (); + return quotearg_alloc (string, strlen (string), sh_quoting_options); +} + +/* Returns a freshly allocated string containing all argument strings, quoted, + separated through spaces. */ +char * +shell_quote_argv (char **argv) +{ + if (*argv != NULL) + { + char **argp; + size_t length; + char *command; + char *p; + + length = 0; + for (argp = argv; ; ) + { + length += shell_quote_length (*argp) + 1; + argp++; + if (*argp == NULL) + break; + } + + command = (char *) xmalloc (length); + + p = command; + for (argp = argv; ; ) + { + p = shell_quote_copy (p, *argp); + argp++; + if (*argp == NULL) + break; + *p++ = ' '; + } + *p = '\0'; + + return command; + } + else + return xstrdup (""); +} diff --git a/lib/sh-quote.h b/lib/sh-quote.h new file mode 100644 index 0000000000..06895e619b --- /dev/null +++ b/lib/sh-quote.h @@ -0,0 +1,37 @@ +/* Shell quoting. + Copyright (C) 2001-2002, 2004 Free Software Foundation, Inc. + Written by Bruno Haible , 2001. + + 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. + + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* When passing a command to a shell, we must quote the program name and + arguments, since Unix shells interpret characters like " ", "'", "<", ">", + "$" etc. in a special way. */ + +#include + +/* Returns the number of bytes needed for the quoted string. */ +extern size_t shell_quote_length (const char *string); + +/* Copies the quoted string to p and returns the incremented p. + There must be room for shell_quote_length (string) + 1 bytes at p. */ +extern char * shell_quote_copy (char *p, const char *string); + +/* Returns the freshly allocated quoted string. */ +extern char * shell_quote (const char *string); + +/* Returns a freshly allocated string containing all argument strings, quoted, + separated through spaces. */ +extern char * shell_quote_argv (char **argv); diff --git a/modules/sh-quote b/modules/sh-quote new file mode 100644 index 0000000000..b9328165c6 --- /dev/null +++ b/modules/sh-quote @@ -0,0 +1,25 @@ +Description: +Shell quoting. + +Files: +lib/sh-quote.h +lib/sh-quote.c + +Depends-on: +quotearg +xalloc + +configure.ac: + +Makefile.am: +lib_SOURCES += sh-quote.h sh-quote.c + +Include: +"sh-quote.h" + +License: +GPL + +Maintainer: +Bruno Haible + -- 2.30.2