Skip to content

Commit

Permalink
basic/proc-cmdline: allow parsing of cmdline from a string
Browse files Browse the repository at this point in the history 
Comes with tests.

Also add direct test for $SYSTEMD_PROC_CMDLINE.

In test-proc-cmdline, "true" was masquerading as PROC_CMDLINE_STRIP_RD_PREFIX,
fix that. Also, reorder functions to match call order.
  • Loading branch information
@keszybz
keszybz committed Oct 8, 2018
1 parent 1af294f commit 9a135c0
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 20 deletions.
20 changes: 14 additions & 6 deletions src/basic/proc-cmdline.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,12 @@ int proc_cmdline(char **ret) {
return read_one_line_file("/proc/cmdline", ret);
}

int proc_cmdline_parse(proc_cmdline_parse_t parse_item, void *data, unsigned flags) {
_cleanup_free_ char *line = NULL;
int proc_cmdline_parse_given(const char *line, proc_cmdline_parse_t parse_item, void *data, unsigned flags) {
const char *p;
int r;

assert(parse_item);

r = proc_cmdline(&line);
if (r < 0)
return r;

p = line;
for (;;) {
_cleanup_free_ char *word = NULL;
Expand Down Expand Up @@ -85,6 +80,19 @@ int proc_cmdline_parse(proc_cmdline_parse_t parse_item, void *data, unsigned fla
return 0;
}

int proc_cmdline_parse(proc_cmdline_parse_t parse_item, void *data, unsigned flags) {
_cleanup_free_ char *line = NULL;
int r;

assert(parse_item);

r = proc_cmdline(&line);
if (r < 0)
return r;

return proc_cmdline_parse_given(line, parse_item, data, flags);
}

static bool relaxed_equal_char(char a, char b) {
return a == b ||
(a == '_' && b == '-') ||
Expand Down
1 change: 1 addition & 0 deletions src/basic/proc-cmdline.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ typedef int (*proc_cmdline_parse_t)(const char *key, const char *value, void *da

int proc_cmdline(char **ret);

int proc_cmdline_parse_given(const char *line, proc_cmdline_parse_t parse_item, void *data, unsigned flags);
int proc_cmdline_parse(const proc_cmdline_parse_t parse, void *userdata, unsigned flags);

int proc_cmdline_get_key(const char *parameter, unsigned flags, char **value);
Expand Down
94 changes: 80 additions & 14 deletions src/test/test-proc-cmdline.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */

#include "alloc-util.h"
#include "env-util.h"
#include "log.h"
#include "macro.h"
#include "proc-cmdline.h"
Expand All @@ -19,28 +20,68 @@ static int parse_item(const char *key, const char *value, void *data) {
}

static void test_proc_cmdline_parse(void) {
assert_se(proc_cmdline_parse(parse_item, &obj, true) >= 0);
log_info("/* %s */", __func__);

assert_se(proc_cmdline_parse(parse_item, &obj, PROC_CMDLINE_STRIP_RD_PREFIX) >= 0);
}

static void test_runlevel_to_target(void) {
in_initrd_force(false);
assert_se(streq_ptr(runlevel_to_target(NULL), NULL));
assert_se(streq_ptr(runlevel_to_target("unknown-runlevel"), NULL));
assert_se(streq_ptr(runlevel_to_target("rd.unknown-runlevel"), NULL));
assert_se(streq_ptr(runlevel_to_target("3"), SPECIAL_MULTI_USER_TARGET));
assert_se(streq_ptr(runlevel_to_target("rd.rescue"), NULL));
static void test_proc_cmdline_override(void) {
log_info("/* %s */", __func__);

in_initrd_force(true);
assert_se(streq_ptr(runlevel_to_target(NULL), NULL));
assert_se(streq_ptr(runlevel_to_target("unknown-runlevel"), NULL));
assert_se(streq_ptr(runlevel_to_target("rd.unknown-runlevel"), NULL));
assert_se(streq_ptr(runlevel_to_target("3"), NULL));
assert_se(streq_ptr(runlevel_to_target("rd.rescue"), SPECIAL_RESCUE_TARGET));
assert_se(putenv((char*) "SYSTEMD_PROC_CMDLINE=foo_bar=quux wuff-piep=tuet zumm") == 0);

/* Test if the override works */
_cleanup_free_ char *line = NULL, *value = NULL;
assert_se(proc_cmdline(&line) >= 0);

/* Test if parsing makes uses of the override */
assert_se(streq(line, "foo_bar=quux wuff-piep=tuet zumm"));
assert_se(proc_cmdline_get_key("foo_bar", 0, &value) > 0 && streq_ptr(value, "quux"));
}

static int parse_item_given(const char *key, const char *value, void *data) {
assert_se(key);
assert_se(data);

bool *strip = data;

log_info("%s: option <%s> = <%s>", __func__, key, strna(value));
if (streq(key, "foo_bar"))
assert_se(streq(value, "quux"));
else if (streq(key, "wuff-piep"))
assert_se(streq(value, "tuet "));
else if (in_initrd() && *strip && streq(key, "zumm"))
assert_se(!value);
else if (in_initrd() && !*strip && streq(key, "rd.zumm"))
assert_se(!value);
else
assert_not_reached("Bad key!");

return 0;
}

static void test_proc_cmdline_given(bool flip_initrd) {
log_info("/* %s (flip: %s) */", __func__, yes_no(flip_initrd));

if (flip_initrd)
in_initrd_force(!in_initrd());

bool t = true, f = false;
assert_se(proc_cmdline_parse_given("foo_bar=quux wuff-piep=\"tuet \" rd.zumm",
parse_item_given, &t, PROC_CMDLINE_STRIP_RD_PREFIX) >= 0);

assert_se(proc_cmdline_parse_given("foo_bar=quux wuff-piep=\"tuet \" rd.zumm",
parse_item_given, &f, 0) >= 0);


if (flip_initrd)
in_initrd_force(!in_initrd());
}

static void test_proc_cmdline_get_key(void) {
_cleanup_free_ char *value = NULL;

log_info("/* %s */", __func__);
putenv((char*) "SYSTEMD_PROC_CMDLINE=foo_bar=quux wuff-piep=tuet zumm");

assert_se(proc_cmdline_get_key("", 0, &value) == -EINVAL);
Expand Down Expand Up @@ -78,6 +119,7 @@ static void test_proc_cmdline_get_key(void) {
static void test_proc_cmdline_get_bool(void) {
bool value = false;

log_info("/* %s */", __func__);
putenv((char*) "SYSTEMD_PROC_CMDLINE=foo_bar bar-waldo=1 x_y-z=0 quux=miep");

assert_se(proc_cmdline_get_bool("", &value) == -EINVAL);
Expand All @@ -94,6 +136,7 @@ static void test_proc_cmdline_get_bool(void) {
}

static void test_proc_cmdline_key_streq(void) {
log_info("/* %s */", __func__);

assert_se(proc_cmdline_key_streq("", ""));
assert_se(proc_cmdline_key_streq("a", "a"));
Expand All @@ -110,6 +153,7 @@ static void test_proc_cmdline_key_streq(void) {
}

static void test_proc_cmdline_key_startswith(void) {
log_info("/* %s */", __func__);

assert_se(proc_cmdline_key_startswith("", ""));
assert_se(proc_cmdline_key_startswith("x", ""));
Expand All @@ -124,11 +168,33 @@ static void test_proc_cmdline_key_startswith(void) {
assert_se(!proc_cmdline_key_startswith("foo-bar", "foo_xx"));
}

static void test_runlevel_to_target(void) {
log_info("/* %s */", __func__);

in_initrd_force(false);
assert_se(streq_ptr(runlevel_to_target(NULL), NULL));
assert_se(streq_ptr(runlevel_to_target("unknown-runlevel"), NULL));
assert_se(streq_ptr(runlevel_to_target("rd.unknown-runlevel"), NULL));
assert_se(streq_ptr(runlevel_to_target("3"), SPECIAL_MULTI_USER_TARGET));
assert_se(streq_ptr(runlevel_to_target("rd.rescue"), NULL));

in_initrd_force(true);
assert_se(streq_ptr(runlevel_to_target(NULL), NULL));
assert_se(streq_ptr(runlevel_to_target("unknown-runlevel"), NULL));
assert_se(streq_ptr(runlevel_to_target("rd.unknown-runlevel"), NULL));
assert_se(streq_ptr(runlevel_to_target("3"), NULL));
assert_se(streq_ptr(runlevel_to_target("rd.rescue"), SPECIAL_RESCUE_TARGET));
}

int main(void) {
log_parse_environment();
log_open();

test_proc_cmdline_parse();
test_proc_cmdline_override();
test_proc_cmdline_given(false);
/* Repeat the same thing, but now flip our ininitrdness */
test_proc_cmdline_given(true);
test_proc_cmdline_key_streq();
test_proc_cmdline_key_startswith();
test_proc_cmdline_get_key();
Expand Down

0 comments on commit 9a135c0

Please sign in to comment.