X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgshell.c;h=a1c7e791f2a2e4e160c5251bb60b3ea849a2e056;hb=40650e33239994237917322d4cfecc34e4cc4394;hp=c68364fa2cd25d593774ed05ef6dcc8e96abc44b;hpb=6310f898b89637ac729a3f2c35c93bdf801c9d94;p=platform%2Fupstream%2Fglib.git diff --git a/glib/gshell.c b/glib/gshell.c index c68364f..a1c7e79 100644 --- a/glib/gshell.c +++ b/glib/gshell.c @@ -24,20 +24,46 @@ #include -#include "glib.h" - -#ifdef _ -#warning "FIXME remove gettext hack" -#endif +#include "gshell.h" +#include "gslist.h" +#include "gstrfuncs.h" +#include "gstring.h" +#include "gtestutils.h" #include "glibintl.h" -#include "galias.h" +#include "gthread.h" -GQuark -g_shell_error_quark (void) -{ - return g_quark_from_static_string ("g-shell-error-quark"); -} +/** + * SECTION:shell + * @title: Shell-related Utilities + * @short_description: shell-like commandline handling + * + * GLib provides the functions g_shell_quote() and g_shell_unquote() + * to handle shell-like quoting in strings. The function g_shell_parse_argv() + * parses a string similar to the way a POSIX shell (/bin/sh) would. + * + * Note that string handling in shells has many obscure and historical + * corner-cases which these functions do not necessarily reproduce. They + * are good enough in practice, though. + */ + +/** + * G_SHELL_ERROR: + * + * Error domain for shell functions. Errors in this domain will be from + * the #GShellError enumeration. See #GError for information on error + * domains. + **/ + +/** + * GShellError: + * @G_SHELL_ERROR_BAD_QUOTING: Mismatched or otherwise mangled quoting. + * @G_SHELL_ERROR_EMPTY_STRING: String to be parsed was empty. + * @G_SHELL_ERROR_FAILED: Some other error. + * + * Error codes returned by shell functions. + **/ +G_DEFINE_QUARK (g-shell-error-quark, g_shell_error) /* Single quotes preserve the literal string exactly. escape * sequences are not allowed; not even \' - if you want a ' @@ -64,10 +90,10 @@ unquote_string_inplace (gchar* str, gchar** end, GError** err) if (!(*s == '"' || *s == '\'')) { - if (err) - *err = g_error_new_literal (G_SHELL_ERROR, - G_SHELL_ERROR_BAD_QUOTING, - _("Quoted text doesn't begin with a quotation mark")); + g_set_error_literal (err, + G_SHELL_ERROR, + G_SHELL_ERROR_BAD_QUOTING, + _("Quoted text doesn't begin with a quotation mark")); *end = str; return FALSE; } @@ -154,10 +180,10 @@ unquote_string_inplace (gchar* str, gchar** end, GError** err) *dest = '\0'; - if (err) - *err = g_error_new_literal (G_SHELL_ERROR, - G_SHELL_ERROR_BAD_QUOTING, - _("Unmatched quotation mark in command line or other shell-quoted text")); + g_set_error_literal (err, + G_SHELL_ERROR, + G_SHELL_ERROR_BAD_QUOTING, + _("Unmatched quotation mark in command line or other shell-quoted text")); *end = s; return FALSE; } @@ -173,7 +199,7 @@ unquote_string_inplace (gchar* str, gchar** end, GError** err) * quoting style used is undefined (single or double quotes may be * used). * - * Return value: quoted string + * Returns: quoted string **/ gchar* g_shell_quote (const gchar *unquoted_string) @@ -239,7 +265,7 @@ g_shell_quote (const gchar *unquoted_string) * be escaped with backslash. Otherwise double quotes preserve things * literally. * - * Return value: an unquoted string + * Returns: an unquoted string **/ gchar* g_shell_unquote (const gchar *quoted_string, @@ -411,7 +437,7 @@ tokenize_command_line (const gchar *command_line, const gchar *p; GString *current_token = NULL; GSList *retval = NULL; - gboolean quoted;; + gboolean quoted; current_quote = '\0'; quoted = FALSE; @@ -500,12 +526,30 @@ tokenize_command_line (const gchar *command_line, g_string_append_c (current_token, *p); /* FALL THRU */ - - case '#': case '\\': current_quote = *p; break; + case '#': + if (p == command_line) + { /* '#' was the first char */ + current_quote = *p; + break; + } + switch(*(p-1)) + { + case ' ': + case '\n': + case '\0': + current_quote = *p; + break; + default: + ensure_token (¤t_token); + g_string_append_c (current_token, *p); + break; + } + break; + default: /* Combines rules 4) and 6) - if we have a token, append to it, * otherwise create a new token. @@ -566,12 +610,8 @@ tokenize_command_line (const gchar *command_line, error: g_assert (error == NULL || *error != NULL); - - if (retval) - { - g_slist_foreach (retval, (GFunc)g_free, NULL); - g_slist_free (retval); - } + + g_slist_free_full (retval, g_free); return NULL; } @@ -579,9 +619,10 @@ tokenize_command_line (const gchar *command_line, /** * g_shell_parse_argv: * @command_line: command line to parse - * @argcp: return location for number of args - * @argvp: return location for array of args - * @error: return location for error + * @argcp: (out) (optional): return location for number of args, or %NULL + * @argvp: (out) (optional) (array length=argcp zero-terminated=1): return + * location for array of args, or %NULL + * @error: (optional): return location for error, or %NULL * * Parses a command line into an argument vector, in much the same way * the shell would, but without many of the expansions the shell would @@ -593,7 +634,7 @@ tokenize_command_line (const gchar *command_line, * literally. Possible errors are those from the #G_SHELL_ERROR * domain. Free the returned vector with g_strfreev(). * - * Return value: %TRUE on success, %FALSE if error set + * Returns: %TRUE on success, %FALSE if error set **/ gboolean g_shell_parse_argv (const gchar *command_line, @@ -646,8 +687,7 @@ g_shell_parse_argv (const gchar *command_line, ++i; } - g_slist_foreach (tokens, (GFunc)g_free, NULL); - g_slist_free (tokens); + g_slist_free_full (tokens, g_free); if (argcp) *argcp = argc; @@ -663,11 +703,7 @@ g_shell_parse_argv (const gchar *command_line, g_assert (error == NULL || *error != NULL); g_strfreev (argv); - g_slist_foreach (tokens, (GFunc) g_free, NULL); - g_slist_free (tokens); + g_slist_free_full (tokens, g_free); return FALSE; } - -#define __G_SHELL_C__ -#include "galiasdef.c"