Mercurial > hg > octave-nkf > gnulib-hg
view lib/sh-quote.c @ 14853:bdc85db78f47
strerror: drop strerror_r dependency
Since the errno module is responsible for introducing replacement
errno values, it should also be responsible for translating those
new values into strings. And by moving the replacements into a
file managed by the errno, we can then break the dependency between
strerror and strerror_r, so that strerror no longer drags in
multi-threading modules required by strerror_r.
Tested on glibc with:
gl_cv_header_errno_h_complete=no gl_cv_func_working_strerror=no \
gl_cv_func_strerror_r_works=no ./gnulib-tool --with-tests \
--test strerror strerror_r-posix
* lib/strerror_r.c (strerror_r): Move gnulib replacement strings...
* lib/strerror-override.c (strerror_override): ...to new file.
* lib/strerror-override.h: Add prototype.
* lib/strerror-impl.h: Delete.
* lib/strerror.c (strerror): New implementation.
* modules/errno (Files): Add new files.
(configure.ac): Compile new file as appropriate.
* modules/strerror (Files): Drop unused file.
(Depends-on): Drop strerror_r-posix.
* MODULES.html.sh: Document strerror_r-posix.
Requested by Sam Steingold.
Signed-off-by: Eric Blake <eblake@redhat.com>
author | Eric Blake <eblake@redhat.com> |
---|---|
date | Tue, 24 May 2011 15:33:49 -0600 |
parents | 97fc9a21a8fb |
children | 8250f2777afc |
line wrap: on
line source
/* Shell quoting. Copyright (C) 2001-2004, 2006, 2009-2011 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 it under the terms of the GNU General Public License as published by 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, see <http://www.gnu.org/licenses/>. */ #include <config.h> /* Specification. */ #include "sh-quote.h" #include <string.h> #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 = XNMALLOC (length, char); p = command; for (argp = argv; ; ) { p = shell_quote_copy (p, *argp); argp++; if (*argp == NULL) break; *p++ = ' '; } *p = '\0'; return command; } else return xstrdup (""); }