mirror of
https://github.com/systemd/systemd.git
synced 2024-10-30 23:21:22 +03:00
util: allow strappenda to take any number of args
This makes strappenda3 redundant, so we remove its usage and definition. Add a few tests along the way for sanity.
This commit is contained in:
parent
d06441da04
commit
8085f163c5
@ -169,7 +169,7 @@ static int add_dbus(const char *path, const char *fname, const char *type) {
|
||||
assert(path);
|
||||
assert(fname);
|
||||
|
||||
p = strappenda3(path, "/", fname);
|
||||
p = strappenda(path, "/", fname);
|
||||
r = config_parse(NULL, p, NULL,
|
||||
"D-BUS Service\0",
|
||||
config_item_table_lookup, table,
|
||||
|
@ -432,7 +432,7 @@ static int add_root_mount(void) {
|
||||
else if (arg_root_rw >= 0 ||
|
||||
(!mount_test_option(arg_root_options, "ro") &&
|
||||
!mount_test_option(arg_root_options, "rw")))
|
||||
opts = strappenda3(arg_root_options, ",", arg_root_rw > 0 ? "rw" : "ro");
|
||||
opts = strappenda(arg_root_options, ",", arg_root_rw > 0 ? "rw" : "ro");
|
||||
else
|
||||
opts = arg_root_options;
|
||||
|
||||
|
@ -42,7 +42,7 @@ static int add_symlink(const char *fservice, const char *tservice) {
|
||||
assert(tservice);
|
||||
|
||||
from = strappenda(SYSTEM_DATA_UNIT_PATH "/", fservice);
|
||||
to = strappenda3(arg_dest, "/getty.target.wants/", tservice);
|
||||
to = strappenda(arg_dest, "/getty.target.wants/", tservice);
|
||||
|
||||
mkdir_parents_label(to, 0755);
|
||||
|
||||
|
@ -1061,7 +1061,7 @@ static int unit_file_load(
|
||||
assert(path);
|
||||
|
||||
if (!isempty(root_dir))
|
||||
path = strappenda3(root_dir, "/", path);
|
||||
path = strappenda(root_dir, "/", path);
|
||||
|
||||
fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY|(allow_symlink ? 0 : O_NOFOLLOW));
|
||||
if (fd < 0)
|
||||
|
@ -845,28 +845,18 @@ int unlink_noerrno(const char *path);
|
||||
(void *) memset(_new_, 0, _len_); \
|
||||
})
|
||||
|
||||
#define strappenda(a, b) \
|
||||
#define strappenda(a, ...) \
|
||||
({ \
|
||||
const char *_a_ = (a), *_b_ = (b); \
|
||||
char *_c_; \
|
||||
size_t _x_, _y_; \
|
||||
_x_ = strlen(_a_); \
|
||||
_y_ = strlen(_b_); \
|
||||
_c_ = alloca(_x_ + _y_ + 1); \
|
||||
strcpy(stpcpy(_c_, _a_), _b_); \
|
||||
_c_; \
|
||||
})
|
||||
|
||||
#define strappenda3(a, b, c) \
|
||||
({ \
|
||||
const char *_a_ = (a), *_b_ = (b), *_c_ = (c); \
|
||||
char *_d_; \
|
||||
size_t _x_, _y_, _z_; \
|
||||
_x_ = strlen(_a_); \
|
||||
_y_ = strlen(_b_); \
|
||||
_z_ = strlen(_c_); \
|
||||
_d_ = alloca(_x_ + _y_ + _z_ + 1); \
|
||||
strcpy(stpcpy(stpcpy(_d_, _a_), _b_), _c_); \
|
||||
int _len = strlen(a); \
|
||||
unsigned _i; \
|
||||
char *_d_, *_p_; \
|
||||
const char *_appendees_[] = { __VA_ARGS__ }; \
|
||||
for (_i = 0; _i < ELEMENTSOF(_appendees_); _i++) \
|
||||
_len += strlen(_appendees_[_i]); \
|
||||
_d_ = alloca(_len + 1); \
|
||||
_p_ = stpcpy(_d_, a); \
|
||||
for (_i = 0; _i < ELEMENTSOF(_appendees_); _i++) \
|
||||
_p_ = stpcpy(_p_, _appendees_[_i]); \
|
||||
_d_; \
|
||||
})
|
||||
|
||||
|
@ -4827,7 +4827,7 @@ static int switch_root(sd_bus *bus, char **args) {
|
||||
const char *root_systemd_path = NULL, *root_init_path = NULL;
|
||||
|
||||
root_systemd_path = strappenda(root, "/" SYSTEMD_BINARY_PATH);
|
||||
root_init_path = strappenda3(root, "/", init);
|
||||
root_init_path = strappenda(root, "/", init);
|
||||
|
||||
/* If the passed init is actually the same as the
|
||||
* systemd binary, then let's suppress it. */
|
||||
|
@ -907,6 +907,19 @@ static void test_strshorten(void) {
|
||||
assert_se(strlen(strshorten(s, 0)) == 0);
|
||||
}
|
||||
|
||||
static void test_strappenda(void) {
|
||||
char *actual;
|
||||
|
||||
actual = strappenda("", "foo", "bar");
|
||||
assert_se(streq(actual, "foobar"));
|
||||
|
||||
actual = strappenda("foo", "bar", "baz");
|
||||
assert_se(streq(actual, "foobarbaz"));
|
||||
|
||||
actual = strappenda("foo", "", "bar", "baz");
|
||||
assert_se(streq(actual, "foobarbaz"));
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
@ -965,6 +978,7 @@ int main(int argc, char *argv[]) {
|
||||
test_read_one_char();
|
||||
test_ignore_signals();
|
||||
test_strshorten();
|
||||
test_strappenda();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user