diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-23 16:51:53 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-26 14:08:46 +0100 |
| commit | da9fc98ded5b0931782c0422752f2daf7fe4557c (patch) | |
| tree | 7fdc96e0591025b286d67818d22b8fcf90103460 | |
| parent | d898ed65ab89e374848eb8a3de916124dd2df1fe (diff) | |
| download | systemd-da9fc98ded5b0931782c0422752f2daf7fe4557c.tar.gz | |
tree-wide: port more code over to PATH_STARTSWITH_SET()
| -rw-r--r-- | src/basic/time-util.c | 4 | ||||
| -rw-r--r-- | src/core/umount.c | 1 | ||||
| -rw-r--r-- | src/journal/journald-native.c | 7 | ||||
| -rw-r--r-- | src/nspawn/nspawn.c | 15 |
4 files changed, 8 insertions, 19 deletions
diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 30ad83d0a7..f1f52f1beb 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -1384,9 +1384,7 @@ int get_timezone(char **tz) { if (r < 0) return r; /* returns EINVAL if not a symlink */ - e = path_startswith(t, "/usr/share/zoneinfo/"); - if (!e) - e = path_startswith(t, "../usr/share/zoneinfo/"); + e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/"); if (!e) return -EINVAL; diff --git a/src/core/umount.c b/src/core/umount.c index 9e6c404ab9..bd4e4e7257 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -29,6 +29,7 @@ #include "process-util.h" #include "signal-util.h" #include "string-util.h" +#include "strv.h" #include "umount.h" #include "util.h" #include "virt.h" diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index 7dd9ca62d5..5ea4601ba3 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -25,6 +25,7 @@ #include "selinux-util.h" #include "socket-util.h" #include "string-util.h" +#include "strv.h" #include "unaligned.h" static bool allow_object_pid(const struct ucred *ucred) { @@ -337,11 +338,7 @@ void server_process_native_file( return; } - e = path_startswith(k, "/dev/shm/"); - if (!e) - e = path_startswith(k, "/tmp/"); - if (!e) - e = path_startswith(k, "/var/tmp/"); + e = PATH_STARTSWITH_SET(k, "/dev/shm/", "/tmp/", "/var/tmp/"); if (!e) { log_error("Received file outside of allowed directories. Refusing."); return; diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 47fe7d4865..c581514b29 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1427,17 +1427,10 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u } static const char *timezone_from_path(const char *path) { - const char *z; - - z = path_startswith(path, "../usr/share/zoneinfo/"); - if (z) - return z; - - z = path_startswith(path, "/usr/share/zoneinfo/"); - if (z) - return z; - - return NULL; + return PATH_STARTSWITH_SET( + path, + "../usr/share/zoneinfo/", + "/usr/share/zoneinfo/"); } static int setup_timezone(const char *dest) { |