shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-23 02:05:01 +03:00
Code Issues Projects Releases Wiki Activity

cmdline: (cleanup) Add internal helper to parse key=value options

Browse Source 
This will be used by a later "ostree admin set-origin" as well.
This commit is contained in:
Colin Walters 2015-01-16 13:03:10 -05:00
parent 0eac91a253
commit 1d216a8c60
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ostree/ot-builtin-remote.c
View File

@ -25,6 +25,7 @@
#include "ot-main.h"
#include "ot-builtins.h"
#include "ostree.h"
#include "ot-tool-util.h"
#include "otutil.h"
static void
@ -35,24 +36,6 @@ usage_error (GOptionContext *context, const char *message, GError **error)
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
}
static gboolean
parse_keyvalue (const char *keyvalue,
char **out_key,
char **out_value,
GError **error)
{
const char *eq = strchr (keyvalue, '=');
if (!eq)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Missing '=' in KEY=VALUE for --set");
return FALSE;
}
*out_key = g_strndup (keyvalue, eq - keyvalue);
*out_value = g_strdup (eq + 1);
return TRUE;
}
static char **opt_set;
static gboolean opt_no_gpg_verify;
static gboolean opt_if_not_exists;
@ -114,7 +97,7 @@ ostree_remote_builtin_add (int argc, char **argv, GCancellable *cancellable, GEr
gs_free char *subkey = NULL;
gs_free char *subvalue = NULL;
if (!parse_keyvalue (keyvalue, &subkey, &subvalue, error))
if (!ot_parse_keyvalue (keyvalue, &subkey, &subvalue, error))
goto out;
g_variant_builder_add (optbuilder, "{s@v}",

18
src/ostree/ot-tool-util.c
View File

@ -51,3 +51,21 @@ ot_parse_boolean (const char *option_name,
return TRUE;
}
gboolean
ot_parse_keyvalue (const char *keyvalue,
char **out_key,
char **out_value,
GError **error)
{
const char *eq = strchr (keyvalue, '=');
if (!eq)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Missing '=' in KEY=VALUE for --set");
return FALSE;
}
*out_key = g_strndup (keyvalue, eq - keyvalue);
*out_value = g_strdup (eq + 1);
return TRUE;
}

5
src/ostree/ot-tool-util.h
View File

@ -30,6 +30,11 @@ ot_parse_boolean (const char *option_name,
const char *value,
gboolean *out_parsed,
GError **error);
gboolean
ot_parse_keyvalue (const char *keyvalue,
char **out_key,
char **out_value,
GError **error);
G_END_DECLS