hwdb.d/60-evdev.hwdb

@@ -683,12 +683,7 @@ evdev:input:b0003v172Fp0031*
  EVDEV_ABS_00=0:10000:400
  EVDEV_ABS_01=0:6250:400
 
-# WALTOP International Corp. Graphics Tablet
+#WALTOP International Corp. Graphics Tablet
 evdev:input:b0003v172Fp0047*
  EVDEV_ABS_00=0:20000:80
  EVDEV_ABS_01=0:12500:80
-
-# WALTOP International Corp. Batteryless Tablet
-evdev:input:b0003v172Fp0505*
- EVDEV_ABS_00=::160
- EVDEV_ABS_01=::160

man/loginctl.xml

@@ -334,14 +334,13 @@
         <term><option>-s</option></term>
         <term><option>--signal=</option></term>
 
-        <listitem><para>When used with <command>kill-session</command> or <command>kill-user</command>,
-        choose which signal to send to selected processes. Must be one of the well known signal specifiers,
-        such as <constant>SIGTERM</constant>, <constant>SIGINT</constant> or <constant>SIGSTOP</constant>.
-        If omitted, defaults to <constant>SIGTERM</constant>.</para>
-
-        <para>The special value <literal>help</literal> will list the known values and the program will exit
-        immediately, and the special value <literal>list</literal> will list known values along with the
-        numerical signal numbers and the program will exit immediately.</para></listitem>
+        <listitem><para>When used with <command>kill-session</command>
+        or <command>kill-user</command>, choose which signal to send
+        to selected processes. Must be one of the well known signal
+        specifiers, such as <constant>SIGTERM</constant>,
+        <constant>SIGINT</constant> or <constant>SIGSTOP</constant>.
+        If omitted, defaults to
+        <constant>SIGTERM</constant>.</para></listitem>
       </varlistentry>
 
       <varlistentry>

man/machinectl.xml

@@ -699,7 +699,17 @@
         <option>all</option>.</para></listitem>
       </varlistentry>
 
-      <xi:include href="standard-options.xml" xpointer="signal" />
+      <varlistentry>
+        <term><option>-s</option></term>
+        <term><option>--signal=</option></term>
+
+        <listitem><para>When used with <command>kill</command>, choose
+        which signal to send to selected processes. Must be one of the
+        well-known signal specifiers, such as
+        <constant>SIGTERM</constant>, <constant>SIGINT</constant> or
+        <constant>SIGSTOP</constant>. If omitted, defaults to
+        <constant>SIGTERM</constant>.</para></listitem>
+      </varlistentry>
 
       <varlistentry>
          <term><option>--uid=</option></term>

man/standard-options.xml

@@ -61,20 +61,4 @@
     (for a pretty version of the same, with indentation and line breaks) or <literal>off</literal> (to turn
     off JSON output, the default).</para></listitem>
   </varlistentry>
-
-  <varlistentry id='signal'>
-    <term><option>-s</option></term>
-    <term><option>--signal=</option></term>
-
-    <listitem>
-      <para>When used with <command>kill</command>, choose which signal to send to selected processes. Must
-      be one of the well-known signal specifiers such as <constant>SIGTERM</constant>,
-      <constant>SIGINT</constant> or <constant>SIGSTOP</constant>. If omitted, defaults to
-      <option>SIGTERM</option>.</para>
-
-      <para>The special value <literal>help</literal> will list the known values and the program will exit
-      immediately, and the special value <literal>list</literal> will list known values along with the
-      numerical signal numbers and the program will exit immediately.</para>
-    </listitem>
-  </varlistentry>
 </variablelist>

man/systemctl.xml

@@ -2067,9 +2067,21 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
           is defined. If omitted, defaults to
           <option>all</option>.</para>
         </listitem>
+
       </varlistentry>
 
-      <xi:include href="standard-options.xml" xpointer="signal" />
+      <varlistentry>
+        <term><option>-s</option></term>
+        <term><option>--signal=</option></term>
+
+        <listitem>
+          <para>When used with <command>kill</command>, choose which
+          signal to send to selected processes. Must be one of the
+          well-known signal specifiers such as <constant>SIGTERM</constant>, <constant>SIGINT</constant> or
+          <constant>SIGSTOP</constant>. If omitted, defaults to
+          <option>SIGTERM</option>.</para>
+        </listitem>
+      </varlistentry>
 
       <varlistentry>
         <term><option>--what=</option></term>

src/basic/path-util.c

@@ -752,6 +752,38 @@ int fsck_exists(const char *fstype) {
         return executable_is_good(checker);
 }
 
+int parse_path_argument_and_warn(const char *path, bool suppress_root, char **arg) {
+        char *p;
+        int r;
+
+        /*
+         * This function is intended to be used in command line
+         * parsers, to handle paths that are passed in. It makes the
+         * path absolute, and reduces it to NULL if omitted or
+         * root (the latter optionally).
+         *
+         * NOTE THAT THIS WILL FREE THE PREVIOUS ARGUMENT POINTER ON
+         * SUCCESS! Hence, do not pass in uninitialized pointers.
+         */
+
+        if (isempty(path)) {
+                *arg = mfree(*arg);
+                return 0;
+        }
+
+        r = path_make_absolute_cwd(path, &p);
+        if (r < 0)
+                return log_error_errno(r, "Failed to parse path \"%s\" and make it absolute: %m", path);
+
+        path_simplify(p, false);
+        if (suppress_root && empty_or_root(p))
+                p = mfree(p);
+
+        free_and_replace(*arg, p);
+
+        return 0;
+}
+
 char* dirname_malloc(const char *path) {
         char *d, *dir, *dir2;
 

src/basic/path-util.h

@@ -144,6 +144,8 @@ int fsck_exists(const char *fstype);
                 _ret;                                                   \
         })
 
+int parse_path_argument_and_warn(const char *path, bool suppress_root, char **arg);
+
 char* dirname_malloc(const char *path);
 const char *last_path_component(const char *path);
 int path_extract_filename(const char *p, char **ret);

src/basic/rlimit-util.c

@@ -43,8 +43,6 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) {
             fixed.rlim_max == highest.rlim_max)
                 return 0;
 
-        log_debug("Failed at setting rlimit " RLIM_FMT " for resource RLIMIT_%s. Will attempt setting value " RLIM_FMT " instead.", rlim->rlim_max, rlimit_to_string(resource), fixed.rlim_max);
-
         if (setrlimit(resource, &fixed) < 0)
                 return -errno;
 

src/basic/signal-util.c

@@ -198,7 +198,7 @@ static const char *const __signal_table[] = {
 DEFINE_PRIVATE_STRING_TABLE_LOOKUP(__signal, int);
 
 const char *signal_to_string(int signo) {
-        static thread_local char buf[STRLEN("RTMIN+") + DECIMAL_STR_MAX(int)];
+        static thread_local char buf[STRLEN("RTMIN+") + DECIMAL_STR_MAX(int) + 1];
         const char *name;
 
         name = __signal_to_string(signo);

src/basic/string-table.h

@@ -103,8 +103,9 @@ ssize_t string_table_lookup(const char * const *table, size_t len, const char *k
 
 #define DUMP_STRING_TABLE(name,type,max)                                \
         do {                                                            \
+                type _k;                                                \
                 flockfile(stdout);                                      \
-                for (type _k = 0; _k < (max); _k++) {                   \
+                for (_k = 0; _k < (max); _k++) {                        \
                         const char *_t;                                 \
                         _t = name##_to_string(_k);                      \
                         if (!_t)                                        \

src/busctl/busctl.c

@@ -21,7 +21,6 @@
 #include "log.h"
 #include "main-func.h"
 #include "pager.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
@@ -2524,7 +2523,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_JSON:
-                        r = parse_json_argument(optarg, &arg_json_format_flags);
+                        r = json_parse_cmdline_parameter_and_warn(optarg, &arg_json_format_flags);
                         if (r <= 0)
                                 return r;
 

src/core/main.c

@@ -58,7 +58,6 @@
 #include "mount-setup.h"
 #include "os-util.h"
 #include "pager.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
@@ -359,7 +358,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
                         return 0;
 
                 if (path_is_absolute(value))
-                        (void) parse_path_argument(value, false, &arg_early_core_pattern);
+                        (void) parse_path_argument_and_warn(value, false, &arg_early_core_pattern);
                 else
                         log_warning("Specified core pattern '%s' is not an absolute path, ignoring.", value);
 
@@ -499,7 +498,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
                 if (proc_cmdline_value_missing(key, value))
                         return 0;
 
-                (void) parse_path_argument(value, false, &arg_watchdog_device);
+                (void) parse_path_argument_and_warn(value, false, &arg_watchdog_device);
 
         } else if (proc_cmdline_key_streq(key, "systemd.clock_usec")) {
 

src/coredump/coredumpctl.c

@@ -25,7 +25,6 @@
 #include "macro.h"
 #include "main-func.h"
 #include "pager.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
@@ -321,7 +320,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_JSON:
-                        r = parse_json_argument(optarg, &arg_json_format_flags);
+                        r = json_parse_cmdline_parameter_and_warn(optarg, &arg_json_format_flags);
                         if (r <= 0)
                                 return r;
 

src/cryptenroll/cryptenroll.c

@@ -16,7 +16,6 @@
 #include "libfido2-util.h"
 #include "main-func.h"
 #include "memory-util.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pkcs11-util.h"
@@ -324,7 +323,7 @@ static int parse_argv(int argc, char *argv[]) {
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                        "Too many arguments, refusing.");
 
-        r = parse_path_argument(argv[optind], false, &arg_node);
+        r = parse_path_argument_and_warn(argv[optind], false, &arg_node);
         if (r < 0)
                 return r;
 

src/dissect/dissect.c

@@ -22,7 +22,6 @@
 #include "mkdir.h"
 #include "mount-util.h"
 #include "namespace-util.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
@@ -246,7 +245,7 @@ static int parse_argv(int argc, char *argv[]) {
                 }
 
                 case ARG_VERITY_DATA:
-                        r = parse_path_argument(optarg, false, &arg_verity_settings.data_path);
+                        r = parse_path_argument_and_warn(optarg, false, &arg_verity_settings.data_path);
                         if (r < 0)
                                 return r;
                         break;
@@ -260,7 +259,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_JSON:
-                        r = parse_json_argument(optarg, &arg_json_format_flags);
+                        r = json_parse_cmdline_parameter_and_warn(optarg, &arg_json_format_flags);
                         if (r <= 0)
                                 return r;
 

src/firstboot/firstboot.c

@@ -24,7 +24,6 @@
 #include "mkdir.h"
 #include "mount-util.h"
 #include "os-util.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
@@ -1047,13 +1046,13 @@ static int parse_argv(int argc, char *argv[]) {
                         return version();
 
                 case ARG_ROOT:
-                        r = parse_path_argument(optarg, true, &arg_root);
+                        r = parse_path_argument_and_warn(optarg, true, &arg_root);
                         if (r < 0)
                                 return r;
                         break;
 
                 case ARG_IMAGE:
-                        r = parse_path_argument(optarg, false, &arg_image);
+                        r = parse_path_argument_and_warn(optarg, false, &arg_image);
                         if (r < 0)
                                 return r;
                         break;

src/fsck/fsck.c

@@ -208,7 +208,7 @@ static int process_progress(int fd, FILE* console) {
                 p = percent(pass, cur, max);
                 r = fprintf(console, "\r%s: fsck %3.1f%% complete...\r", device, p);
                 if (r < 0)
-                        return -EIO; /* No point in continuing if something happened to our output stream */
+                        return -EIO; /* No point in continuing if something happend to our output stream */
 
                 fflush(console);
                 clear = MAX(clear, r);

src/home/homectl.c

@@ -23,7 +23,6 @@
 #include "main-func.h"
 #include "memory-util.h"
 #include "pager.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pkcs11-util.h"
@@ -2261,7 +2260,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 break;
                         }
 
-                        r = parse_path_argument(optarg, false, &hd);
+                        r = parse_path_argument_and_warn(optarg, false, &hd);
                         if (r < 0)
                                 return r;
 
@@ -2482,7 +2481,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 break;
                         }
 
-                        r = parse_path_argument(optarg, false, &v);
+                        r = parse_path_argument_and_warn(optarg, false, &v);
                         if (r < 0)
                                 return r;
 
@@ -3234,7 +3233,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_JSON:
-                        r = parse_json_argument(optarg, &arg_json_format_flags);
+                        r = json_parse_cmdline_parameter_and_warn(optarg, &arg_json_format_flags);
                         if (r <= 0)
                                 return r;
 

src/journal/journalctl.c

@@ -55,7 +55,6 @@
 #include "mountpoint-util.h"
 #include "nulstr-util.h"
 #include "pager.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pcre2-dlopen.h"
@@ -720,13 +719,13 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_ROOT:
-                        r = parse_path_argument(optarg, /* suppress_root= */ true, &arg_root);
+                        r = parse_path_argument_and_warn(optarg, /* suppress_root= */ true, &arg_root);
                         if (r < 0)
                                 return r;
                         break;
 
                 case ARG_IMAGE:
-                        r = parse_path_argument(optarg, /* suppress_root= */ false, &arg_image);
+                        r = parse_path_argument_and_warn(optarg, /* suppress_root= */ false, &arg_image);
                         if (r < 0)
                                 return r;
                         break;

src/login/loginctl.c

@@ -22,7 +22,6 @@
 #include "main-func.h"
 #include "memory-util.h"
 #include "pager.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "pretty-print.h"
 #include "process-util.h"
@@ -1396,9 +1395,14 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 's':
-                        r = parse_signal_argument(optarg, &arg_signal);
-                        if (r <= 0)
-                                return r;
+                        if (streq(optarg, "help")) {
+                                DUMP_STRING_TABLE(signal, int, _NSIG);
+                                return 0;
+                        }
+
+                        arg_signal = signal_from_string(optarg);
+                        if (arg_signal < 0)
+                                return log_error_errno(arg_signal, "Failed to parse signal string %s.", optarg);
                         break;
 
                 case 'H':

src/machine-id-setup/machine-id-setup-main.c

@@ -10,7 +10,6 @@
 #include "log.h"
 #include "machine-id-setup.h"
 #include "main-func.h"
-#include "parse-argument.h"
 #include "path-util.h"
 #include "pretty-print.h"
 #include "util.h"
@@ -77,7 +76,7 @@ static int parse_argv(int argc, char *argv[]) {
                         return version();
 
                 case ARG_ROOT:
-                        r = parse_path_argument(optarg, true, &arg_root);
+                        r = parse_path_argument_and_warn(optarg, true, &arg_root);
                         if (r < 0)
                                 return r;
                         break;

src/machine/machinectl.c

@@ -39,7 +39,6 @@
 #include "mkdir.h"
 #include "nulstr-util.h"
 #include "pager.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
@@ -2716,9 +2715,15 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 's':
-                        r = parse_signal_argument(optarg, &arg_signal);
-                        if (r <= 0)
-                                return r;
+                        if (streq(optarg, "help")) {
+                                DUMP_STRING_TABLE(signal, int, _NSIG);
+                                return 0;
+                        }
+
+                        r = signal_from_string(optarg);
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to parse signal string %s.", optarg);
+                        arg_signal = r;
                         break;
 
                 case ARG_NO_ASK_PASSWORD:

src/network/networkd-route.c

@@ -839,15 +839,15 @@ static int manager_drop_routes_internal(Manager *manager, bool foreign, const Li
 
         routes = foreign ? manager->routes_foreign : manager->routes;
         SET_FOREACH(route, routes) {
-                /* Do not touch routes managed by the kernel. */
+                /* Do not touch routes managed by the kernel */
                 if (route->protocol == RTPROT_KERNEL)
                         continue;
 
-                /* The route will be configured later, or already configured by a link. */
+                /* The route will be configured later, or already configured by a link */
                 if (links_have_route(manager, route, except))
                         continue;
 
-                /* The existing links do not have the route. Let's drop this now. It may be
+                /* The existing links do not have the route. Let's drop this now. It may by
                  * re-configured later. */
                 k = route_remove(route, manager, NULL, NULL);
                 if (k < 0 && r >= 0)

src/nspawn/nspawn.c

@@ -78,7 +78,6 @@
 #include "nulstr-util.h"
 #include "os-util.h"
 #include "pager.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
@@ -792,7 +791,7 @@ static int parse_argv(int argc, char *argv[]) {
                         return version();
 
                 case 'D':
-                        r = parse_path_argument(optarg, false, &arg_directory);
+                        r = parse_path_argument_and_warn(optarg, false, &arg_directory);
                         if (r < 0)
                                 return r;
 
@@ -800,7 +799,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_TEMPLATE:
-                        r = parse_path_argument(optarg, false, &arg_template);
+                        r = parse_path_argument_and_warn(optarg, false, &arg_template);
                         if (r < 0)
                                 return r;
 
@@ -808,7 +807,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 'i':
-                        r = parse_path_argument(optarg, false, &arg_image);
+                        r = parse_path_argument_and_warn(optarg, false, &arg_image);
                         if (r < 0)
                                 return r;
 
@@ -816,7 +815,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_OCI_BUNDLE:
-                        r = parse_path_argument(optarg, false, &arg_oci_bundle);
+                        r = parse_path_argument_and_warn(optarg, false, &arg_oci_bundle);
                         if (r < 0)
                                 return r;
 
@@ -935,7 +934,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_NETWORK_NAMESPACE_PATH:
-                        r = parse_path_argument(optarg, false, &arg_network_namespace_path);
+                        r = parse_path_argument_and_warn(optarg, false, &arg_network_namespace_path);
                         if (r < 0)
                                 return r;
 
@@ -1387,7 +1386,7 @@ static int parse_argv(int argc, char *argv[]) {
                 }
 
                 case ARG_VERITY_DATA:
-                        r = parse_path_argument(optarg, false, &arg_verity_settings.data_path);
+                        r = parse_path_argument_and_warn(optarg, false, &arg_verity_settings.data_path);
                         if (r < 0)
                                 return r;
                         break;

src/partition/repart.c

@@ -45,7 +45,6 @@
 #include "mkfs-util.h"
 #include "mount-util.h"
 #include "parse-util.h"
-#include "parse-argument.h"
 #include "path-util.h"
 #include "pretty-print.h"
 #include "proc-cmdline.h"
@@ -3624,7 +3623,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_ROOT:
-                        r = parse_path_argument(optarg, false, &arg_root);
+                        r = parse_path_argument_and_warn(optarg, false, &arg_root);
                         if (r < 0)
                                 return r;
                         break;
@@ -3654,7 +3653,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_DEFINITIONS:
-                        r = parse_path_argument(optarg, false, &arg_definitions);
+                        r = parse_path_argument_and_warn(optarg, false, &arg_definitions);
                         if (r < 0)
                                 return r;
                         break;
@@ -3688,7 +3687,7 @@ static int parse_argv(int argc, char *argv[]) {
                 }
 
                 case ARG_JSON:
-                        r = parse_json_argument(optarg, &arg_json_format_flags);
+                        r = json_parse_cmdline_parameter_and_warn(optarg, &arg_json_format_flags);
                         if (r <= 0)
                                 return r;
 

src/resolve/resolved-dns-packet.c

@@ -2459,7 +2459,7 @@ static int patch_rr(DnsPacket *p, usec_t age) {
 
         INIT_REWINDER(rewinder, p);
 
-        /* Patches the RR at the current rindex, subtracts the specified time from the TTL */
+        /* Patches the RR at the current rindex, substracts the specified time from the TTL */
 
         r = dns_packet_read_name(p, NULL, true, NULL);
         if (r < 0)

src/run/run.c

@@ -21,7 +21,6 @@
 #include "fd-util.h"
 #include "format-util.h"
 #include "main-func.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
@@ -471,7 +470,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_WORKING_DIRECTORY:
-                        r = parse_path_argument(optarg, true, &arg_working_directory);
+                        r = parse_path_argument_and_warn(optarg, true, &arg_working_directory);
                         if (r < 0)
                                 return r;
 

src/shared/json.c

@@ -4459,6 +4459,27 @@ int json_variant_unhex(JsonVariant *v, void **ret, size_t *ret_size) {
         return unhexmem(json_variant_string(v), (size_t) -1, ret, ret_size);
 }
 
+int json_parse_cmdline_parameter_and_warn(const char *s, JsonFormatFlags *ret) {
+        assert(s);
+        assert(ret);
+
+        if (streq(s, "pretty"))
+                *ret = JSON_FORMAT_PRETTY|JSON_FORMAT_COLOR_AUTO;
+        else if (streq(s, "short"))
+                *ret = JSON_FORMAT_NEWLINE;
+        else if (streq(s, "off"))
+                *ret = JSON_FORMAT_OFF;
+        else if (streq(s, "help")) {
+                puts("pretty\n"
+                     "short\n"
+                     "off");
+                return 0; /* 0 means → we showed a brief help, exit now */
+        } else
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown argument to --json= switch: %s", s);
+
+        return 1; /* 1 means → properly parsed */
+}
+
 static const char* const json_variant_type_table[_JSON_VARIANT_TYPE_MAX] = {
         [JSON_VARIANT_STRING] = "string",
         [JSON_VARIANT_INTEGER] = "integer",

src/shared/json.h

@@ -357,5 +357,7 @@ int json_log_internal(JsonVariant *variant, int level, int error, const char *fi
 int json_variant_unbase64(JsonVariant *v, void **ret, size_t *ret_size);
 int json_variant_unhex(JsonVariant *v, void **ret, size_t *ret_size);
 
+int json_parse_cmdline_parameter_and_warn(const char *s, JsonFormatFlags *ret);
+
 const char *json_variant_type_to_string(JsonVariantType t);
 JsonVariantType json_variant_type_from_string(const char *s);

src/shared/meson.build

@@ -202,8 +202,6 @@ shared_sources = files('''
         output-mode.h
         pager.c
         pager.h
-        parse-argument.c
-        parse-argument.h
         pe-header.h
         pkcs11-util.c
         pkcs11-util.h

src/shared/parse-argument.c

@@ -1,102 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-
-#include "format-table.h"
-#include "parse-argument.h"
-#include "path-util.h"
-#include "signal-util.h"
-#include "stdio-util.h"
-#include "string-table.h"
-#include "string-util.h"
-
-/* All functions in this file emit warnigs. */
-
-int parse_json_argument(const char *s, JsonFormatFlags *ret) {
-        assert(s);
-        assert(ret);
-
-        if (streq(s, "pretty"))
-                *ret = JSON_FORMAT_PRETTY|JSON_FORMAT_COLOR_AUTO;
-        else if (streq(s, "short"))
-                *ret = JSON_FORMAT_NEWLINE;
-        else if (streq(s, "off"))
-                *ret = JSON_FORMAT_OFF;
-        else if (streq(s, "help")) {
-                puts("pretty\n"
-                     "short\n"
-                     "off");
-                return 0; /* 0 means → we showed a brief help, exit now */
-        } else
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown argument to --json= switch: %s", s);
-
-        return 1; /* 1 means → properly parsed */
-}
-
-int parse_path_argument(const char *path, bool suppress_root, char **arg) {
-        char *p;
-        int r;
-
-        /*
-         * This function is intended to be used in command line parsers, to handle paths that are passed
-         * in. It makes the path absolute, and reduces it to NULL if omitted or root (the latter optionally).
-         *
-         * NOTE THAT THIS WILL FREE THE PREVIOUS ARGUMENT POINTER ON SUCCESS!
-         * Hence, do not pass in uninitialized pointers.
-         */
-
-        if (isempty(path)) {
-                *arg = mfree(*arg);
-                return 0;
-        }
-
-        r = path_make_absolute_cwd(path, &p);
-        if (r < 0)
-                return log_error_errno(r, "Failed to parse path \"%s\" and make it absolute: %m", path);
-
-        path_simplify(p, false);
-        if (suppress_root && empty_or_root(p))
-                p = mfree(p);
-
-        return free_and_replace(*arg, p);
-}
-
-int parse_signal_argument(const char *s, int *ret) {
-        int r;
-
-        assert(s);
-        assert(ret);
-
-        if (streq(s, "help")) {
-                DUMP_STRING_TABLE(signal, int, _NSIG);
-                return 0;
-        }
-
-        if (streq(s, "list")) {
-                _cleanup_(table_unrefp) Table *table = NULL;
-
-                table = table_new("signal", "name");
-                if (!table)
-                        return log_oom();
-
-                for (int i = 1; i < _NSIG; i++) {
-                        r = table_add_many(
-                                        table,
-                                        TABLE_INT, i,
-                                        TABLE_SIGNAL, i);
-                        if (r < 0)
-                                return table_log_add_error(r);
-                }
-
-                r = table_print(table, NULL);
-                if (r < 0)
-                        return table_log_print_error(r);
-
-                return 0;
-        }
-
-        r = signal_from_string(s);
-        if (r < 0)
-                return log_error_errno(r, "Failed to parse signal string \"%s\".", s);
-
-        *ret = r;
-        return 1; /* work to do */
-}

src/shared/parse-argument.h

@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#include "json.h"
-
-int parse_json_argument(const char *s, JsonFormatFlags *ret);
-int parse_path_argument(const char *path, bool suppress_root, char **arg);
-int parse_signal_argument(const char *s, int *ret);

src/sysext/sysext.c

@@ -22,7 +22,6 @@
 #include "mountpoint-util.h"
 #include "os-util.h"
 #include "pager.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "pretty-print.h"
 #include "process-util.h"
@@ -944,13 +943,13 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_ROOT:
-                        r = parse_path_argument(optarg, false, &arg_root);
+                        r = parse_path_argument_and_warn(optarg, false, &arg_root);
                         if (r < 0)
                                 return r;
                         break;
 
                 case ARG_JSON:
-                        r = parse_json_argument(optarg, &arg_json_format_flags);
+                        r = json_parse_cmdline_parameter_and_warn(optarg, &arg_json_format_flags);
                         if (r <= 0)
                                 return r;
 

src/systemctl/systemctl.c

@@ -11,7 +11,6 @@
 #include "main-func.h"
 #include "output-mode.h"
 #include "pager.h"
-#include "parse-argument.h"
 #include "path-util.h"
 #include "pretty-print.h"
 #include "rlimit-util.h"
@@ -493,12 +492,14 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                 case ARG_VERSION:
                         return version();
 
-                case 't':
+                case 't': {
+                        const char *p;
+
                         if (isempty(optarg))
                                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                                        "--type= requires arguments.");
 
-                        for (const char *p = optarg;;) {
+                        for (p = optarg;;) {
                                 _cleanup_free_ char *type = NULL;
 
                                 r = extract_first_word(&p, &type, ",", 0);
@@ -532,6 +533,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         }
 
                         break;
+                }
 
                 case 'P':
                         arg_value = true;
@@ -544,8 +546,10 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                                 arg_properties = new0(char*, 1);
                                 if (!arg_properties)
                                         return log_oom();
-                        } else
-                                for (const char *p = optarg;;) {
+                        } else {
+                                const char *p;
+
+                                for (p = optarg;;) {
                                         _cleanup_free_ char *prop = NULL;
 
                                         r = extract_first_word(&p, &prop, ",", 0);
@@ -557,6 +561,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                                         if (strv_consume(&arg_properties, TAKE_PTR(prop)) < 0)
                                                 return log_oom();
                                 }
+                        }
 
                         /* If the user asked for a particular property, show it, even if it is empty. */
                         arg_all = true;
@@ -638,7 +643,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_ROOT:
-                        r = parse_path_argument(optarg, false, &arg_root);
+                        r = parse_path_argument_and_warn(optarg, false, &arg_root);
                         if (r < 0)
                                 return r;
                         break;
@@ -674,9 +679,16 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 's':
-                        r = parse_signal_argument(optarg, &arg_signal);
-                        if (r <= 0)
-                                return r;
+                        if (streq(optarg, "help")) {
+                                DUMP_STRING_TABLE(signal, int, _NSIG);
+                                return 0;
+                        }
+
+                        arg_signal = signal_from_string(optarg);
+                        if (arg_signal < 0)
+                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                                       "Failed to parse signal string %s.",
+                                                       optarg);
                         break;
 
                 case ARG_NO_ASK_PASSWORD:
@@ -766,12 +778,14 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         arg_boot_loader_entry = empty_to_null(optarg);
                         break;
 
-                case ARG_STATE:
+                case ARG_STATE: {
+                        const char *p;
+
                         if (isempty(optarg))
                                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                                        "--state= requires arguments.");
 
-                        for (const char *p = optarg;;) {
+                        for (p = optarg;;) {
                                 _cleanup_free_ char *s = NULL;
 
                                 r = extract_first_word(&p, &s, ",", 0);
@@ -789,6 +803,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                                         return log_oom();
                         }
                         break;
+                }
 
                 case 'r':
                         if (geteuid() != 0)
@@ -828,11 +843,13 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         arg_with_dependencies = true;
                         break;
 
-                case ARG_WHAT:
+                case ARG_WHAT: {
+                        const char *p;
+
                         if (isempty(optarg))
                                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "--what= requires arguments.");
 
-                        for (const char *p = optarg;;) {
+                        for (p = optarg;;) {
                                 _cleanup_free_ char *k = NULL;
 
                                 r = extract_first_word(&p, &k, ",", 0);
@@ -856,6 +873,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         }
 
                         break;
+                }
 
                 case ARG_REBOOT_ARG:
                         arg_reboot_argument = optarg;

src/sysusers/sysusers.c

@@ -17,7 +17,6 @@
 #include "mount-util.h"
 #include "nscd-flush.h"
 #include "pager.h"
-#include "parse-argument.h"
 #include "path-util.h"
 #include "pretty-print.h"
 #include "selinux-util.h"
@@ -1814,7 +1813,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_ROOT:
-                        r = parse_path_argument(optarg, /* suppress_root= */ false, &arg_root);
+                        r = parse_path_argument_and_warn(optarg, /* suppress_root= */ false, &arg_root);
                         if (r < 0)
                                 return r;
                         break;
@@ -1824,7 +1823,7 @@ static int parse_argv(int argc, char *argv[]) {
                         return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
                                                "This systemd-sysusers version is compiled without support for --image=.");
 #else
-                        r = parse_path_argument(optarg, /* suppress_root= */ false, &arg_image);
+                        r = parse_path_argument_and_warn(optarg, /* suppress_root= */ false, &arg_image);
                         if (r < 0)
                                 return r;
                         break;

src/test/meson.build

@@ -222,8 +222,6 @@ tests += [
 
         [['src/test/test-extract-word.c']],
 
-        [['src/test/test-parse-argument.c']],
-
         [['src/test/test-parse-util.c'],
          [],
          [libseccomp]],

src/test/test-parse-argument.c

@@ -1,63 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-
-#include "parse-argument.h"
-#include "stdio-util.h"
-#include "tests.h"
-
-static void test_parse_json_argument(void) {
-        log_info("/* %s */", __func__);
-
-        JsonFormatFlags flags = JSON_FORMAT_PRETTY;
-
-        assert_se(parse_json_argument("help", &flags) == 0);
-        assert_se(flags == JSON_FORMAT_PRETTY);
-
-        assert_se(parse_json_argument("off", &flags) == 1);
-        assert_se(flags == JSON_FORMAT_OFF);
-}
-
-static void test_parse_path_argument(void) {
-        log_info("/* %s */", __func__);
-
-        _cleanup_free_ char *path = NULL;
-
-        assert_se(parse_path_argument("help", false, &path) == 0);
-        assert_se(streq(basename(path), "help"));
-
-        assert_se(parse_path_argument("/", false, &path) == 0);
-        assert_se(streq(path, "/"));
-
-        assert_se(parse_path_argument("/", true, &path) == 0);
-        assert_se(path == NULL);
-}
-
-static void test_parse_signal_argument(void) {
-        log_info("/* %s */", __func__);
-
-        int  signal = -1;
-
-        assert_se(parse_signal_argument("help", &signal) == 0);
-        assert_se(signal == -1);
-
-        assert_se(parse_signal_argument("list", &signal) == 0);
-        assert_se(signal == -1);
-
-        assert_se(parse_signal_argument("SIGABRT", &signal) == 1);
-        assert_se(signal == SIGABRT);
-
-        assert_se(parse_signal_argument("ABRT", &signal) == 1);
-        assert_se(signal == SIGABRT);
-
-        char buf[DECIMAL_STR_MAX(int)];
-        xsprintf(buf, "%d", SIGABRT);
-        assert_se(parse_signal_argument(buf, &signal) == 1);
-        assert_se(signal == SIGABRT);
-}
-
-int main(int argc, char *argv[]) {
-        test_setup_logging(LOG_INFO);
-
-        test_parse_json_argument();
-        test_parse_path_argument();
-        test_parse_signal_argument();
-}

src/tmpfiles/tmpfiles.c

@@ -46,7 +46,6 @@
 #include "mountpoint-util.h"
 #include "offline-passwd.h"
 #include "pager.h"
-#include "parse-argument.h"
 #include "parse-util.h"
 #include "path-lookup.h"
 #include "path-util.h"
@@ -3115,7 +3114,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_ROOT:
-                        r = parse_path_argument(optarg, /* suppress_root= */ false, &arg_root);
+                        r = parse_path_argument_and_warn(optarg, /* suppress_root= */ false, &arg_root);
                         if (r < 0)
                                 return r;
                         break;
@@ -3125,7 +3124,7 @@ static int parse_argv(int argc, char *argv[]) {
                         return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
                                                "This systemd-tmpfiles version is compiled without support for --image=.");
 #else
-                        r = parse_path_argument(optarg, /* suppress_root= */ false, &arg_image);
+                        r = parse_path_argument_and_warn(optarg, /* suppress_root= */ false, &arg_image);
                         if (r < 0)
                                 return r;
 #endif

test/test-functions

@@ -750,7 +750,7 @@ install_compiled_systemd() {
 install_debian_systemd() {
     ddebug "Install debian systemd"
 
-    local _systemd_pkgs=$(grep -E '^Package:' ${SOURCE_DIR}/debian/control | cut -d ':' -f 2)
+    local _systemd_pkgs=$(apt-cache showsrc systemd | grep -m 1 -E '^Binary:' | cut -d ':' -f 2 | tr -d ,)
     local _files=""
     for deb in $_systemd_pkgs; do
         _files=$(dpkg-query -L $deb 2>/dev/null) || continue