Merge pull request #31808 from keszybz/sundry-cleanups

Sundry cleanups

src/journal/cat.c

@@ -95,10 +95,7 @@ static int parse_argv(int argc, char *argv[]) {
                         return version();
 
                 case 't':
-                        if (isempty(optarg))
-                                arg_identifier = NULL;
-                        else
-                                arg_identifier = optarg;
+                        arg_identifier = empty_to_null(optarg);
                         break;
 
                 case 'p':
@@ -122,10 +119,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_NAMESPACE:
-                        if (isempty(optarg))
-                                arg_namespace = NULL;
-                        else
-                                arg_namespace = optarg;
+                        arg_namespace = empty_to_null(optarg);
                         break;
 
                 case '?':

src/portable/portablectl.c

@@ -1251,7 +1251,8 @@ static int help(int argc, char *argv[], void *userdata) {
                "  -M --machine=CONTAINER      Operate on local container\n"
                "  -q --quiet                  Suppress informational messages\n"
                "  -p --profile=PROFILE        Pick security profile for portable service\n"
-               "     --copy=copy|auto|symlink Prefer copying or symlinks if possible\n"
+               "     --copy=copy|auto|symlink|mixed\n"
+               "                              Pick copying or symlinking of resources\n"
                "     --runtime                Attach portable service until next reboot only\n"
                "     --no-reload              Don't reload the system and service manager\n"
                "     --cat                    When inspecting include unit and os-release file\n"

test/units/testsuite-46.sh

@@ -181,13 +181,13 @@ checkblob() {
 }
 
 mkdir /tmp/blob1 /tmp/blob2
-echo data1 blob1 > /tmp/blob1/test1
-echo data1 blob2 > /tmp/blob2/test1
-echo data2 blob1 > /tmp/blob1/test2
-echo data2 blob2 > /tmp/blob2/test2
-echo invalid filename > /tmp/blob1/файл
-echo data3 > /tmp/external-test3
-echo avatardata > /tmp/external-avatar
+echo data1 blob1 >/tmp/blob1/test1
+echo data1 blob2 >/tmp/blob2/test1
+echo data2 blob1 >/tmp/blob1/test2
+echo data2 blob2 >/tmp/blob2/test2
+echo invalid filename >/tmp/blob1/файл
+echo data3 >/tmp/external-test3
+echo avatardata >/tmp/external-avatar
 ln -s /tmp/external-avatar /tmp/external-avatar-lnk
 dd if=/dev/urandom of=/tmp/external-barely-fits bs=1M count=64
 dd if=/dev/urandom of=/tmp/external-toobig bs=1M count=65