X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudevadm-test-builtin.c;h=f4aa21ee72fcc95fcd8d185ca0d68a63bd22fec6;hp=3a49f7ce9c40fa683da2c9c6e3c4642af80af123;hb=53789059e0e9378041697c25af06a08a433fb964;hpb=6df831f25ebc9f55cd939f04392dad9237706e45

diff --git a/src/udev/udevadm-test-builtin.c b/src/udev/udevadm-test-builtin.c
index 3a49f7ce9..f4aa21ee7 100644
--- a/src/udev/udevadm-test-builtin.c
+++ b/src/udev/udevadm-test-builtin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2011 Kay Sievers <kay@vrfy.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,8 +55,6 @@ static int adm_builtin(struct udev *udev, int argc, char *argv[])
         enum udev_builtin_cmd cmd;
         int rc = EXIT_SUCCESS;
 
-        dbg(udev, "version %s\n", VERSION);
-
         for (;;) {
                 int option;
 
@@ -97,10 +95,10 @@ static int adm_builtin(struct udev *udev, int argc, char *argv[])
         }
 
         /* add /sys if needed */
-        if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0)
-                util_strscpyl(filename, sizeof(filename), udev_get_sys_path(udev), syspath, NULL);
+        if (!startswith(syspath, "/sys"))
+                strscpyl(filename, sizeof(filename), "/sys", syspath, NULL);
         else
-                util_strscpy(filename, sizeof(filename), syspath);
+                strscpy(filename, sizeof(filename), syspath);
         util_remove_trailing_chars(filename, '/');
 
         dev = udev_device_new_from_syspath(udev, filename);
@@ -110,8 +108,9 @@ static int adm_builtin(struct udev *udev, int argc, char *argv[])
                 goto out;
         }
 
-        if (udev_builtin_run(dev, cmd, command, true) < 0) {
-                fprintf(stderr, "error executing '%s'\n\n", command);
+        rc = udev_builtin_run(dev, cmd, command, true);
+        if (rc < 0) {
+                fprintf(stderr, "error executing '%s', exit code %i\n\n", command, rc);
                 rc = 6;
         }
 out: