Skip to content

Commit

Permalink
kargs: support argument that contains quotes and space
Browse files Browse the repository at this point in the history
  • Loading branch information
HuijingHei committed Mar 4, 2024
1 parent f1e663b commit 15b1128
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 4 deletions.
45 changes: 42 additions & 3 deletions src/libostree/ostree-kernel-args.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,44 @@ strcmp0_equal (gconstpointer v1, gconstpointer v2)
return g_strcmp0 (v1, v2) == 0;
}

/* Split string with whitespace, but keep quotes.
For example, "test=\"1 2\"" will be saved in hash table as: test="1 2".
*/
static char **
split_whitespace (const char *str)
{
gboolean quoted = FALSE;
g_return_val_if_fail (str != NULL, NULL);

GPtrArray *strv = g_ptr_array_new ();

guint len = strlen (str);
guint start;
// Skip first whitespaces
for (start = 0; start < len && str[start] == ' '; start++)
{
}
for (guint i = start; str[i] != '\0'; i++)
{
if (str[i] == ' ' && !quoted)
{
g_ptr_array_add (strv, g_strndup (str + start, i - start));
start = i + 1;
}
if (str[i] == '"')
{
quoted = !quoted;
}
if (i == (len - 1))
{
if (!quoted)
g_ptr_array_add (strv, g_strndup (str + start, len - start));
}
}
g_ptr_array_add (strv, NULL);
return (char **) g_ptr_array_free (strv, FALSE);
}

/**
* ostree_kernel_args_new: (skip)
*
Expand Down Expand Up @@ -395,8 +433,9 @@ ostree_kernel_args_delete (OstreeKernelArgs *kargs, const char *arg, GError **er
{
/* but if a specific val was passed, check that it's the same */
OstreeKernelArgsEntry *e = entries->pdata[0];
if (val && !strcmp0_equal (val, _ostree_kernel_args_entry_get_value (e)))
return glnx_throw (error, "No karg '%s=%s' found", key, val);
g_autofree char *existing_value = _ostree_kernel_args_entry_get_value (e);
if (val && !strcmp0_equal (val, existing_value))
return glnx_throw (error, "No karg '%s=%s' found, acutal value is '%s'", key, val, existing_value);
return ostree_kernel_args_delete_key_entry (kargs, key, error);
}

Expand Down Expand Up @@ -644,7 +683,7 @@ ostree_kernel_args_parse_append (OstreeKernelArgs *kargs, const char *options)
if (!options)
return;

args = g_strsplit (options, " ", -1);
args = split_whitespace (options);
for (iter = args; *iter; iter++)
{
char *arg = *iter;
Expand Down
9 changes: 8 additions & 1 deletion tests/test-admin-deploy-karg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ set -euo pipefail
# Exports OSTREE_SYSROOT so --sysroot not needed.
setup_os_repository "archive" "syslinux"

echo "1..4"
echo "1..5"

${CMD_PREFIX} ostree --repo=sysroot/ostree/repo pull-local --remote=testos testos-repo testos/buildmain/x86_64-runtime
rev=$(${CMD_PREFIX} ostree --repo=sysroot/ostree/repo rev-parse testos/buildmain/x86_64-runtime)
Expand Down Expand Up @@ -77,3 +77,10 @@ assert_not_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'op
assert_not_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*APPENDARG=VALAPPEND'

echo "ok deploy --karg-delete"

${CMD_PREFIX} ostree admin deploy --os=testos --karg-append="test=\"1 2\"" testos:testos/buildmain/x86_64-runtime
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*test="1 2"'
${CMD_PREFIX} ostree admin deploy --os=testos --karg-delete="test=\"1 2\"" testos:testos/buildmain/x86_64-runtime
assert_not_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*test="1 2"'

echo "ok deploy --karg-delete with quotes"

0 comments on commit 15b1128

Please sign in to comment.