udev: Fix exit value when device is already handled

zdohnal · zdohnal · commit 77540d0cb539 · 2024-03-12T18:59:48.000+01:00
diff --git a/NEWS b/NEWS
@@ -1,6 +1,7 @@
 1.5.19 changes
 --------------
 - Fix `debugprint()` call in options.py (Issue #291)
+- Fix exit value if the device is already handled
 
 1.5.18 changes
 --------------
diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
@@ -806,7 +806,7 @@ device_id_from_devpath (struct udev *udev, const char *devpath,
   {
     udev_device_unref (dev);
     syslog (LOG_ERR, "unable to access %s", syspath);
-    return NULL;
+    exit (1);
   }
 
   usb_device_devpath = strdup (udev_device_get_devpath (dev));
@@ -831,7 +831,7 @@ device_id_from_devpath (struct udev *udev, const char *devpath,
     syslog (LOG_DEBUG, "Device already handled");
     free (usb_device_devpath);
     free (devicefilepath);
-    return NULL;
+    exit (0);
   }
 
   serial = udev_device_get_sysattr_value (dev, "serial");

Original file line number	Diff line number	Diff line change
`@@ -806,7 +806,7 @@ device_id_from_devpath (struct udev udev, const char devpath,`
`806`	`806`	`{`
`807`	`807`	`udev_device_unref (dev);`
`808`	`808`	`syslog (LOG_ERR, "unable to access %s", syspath);`
`809`		`- return NULL;`
	`809`	`+ exit (1);`
`810`	`810`	`}`
`811`	`811`
`812`	`812`	`usb_device_devpath = strdup (udev_device_get_devpath (dev));`
`@@ -831,7 +831,7 @@ device_id_from_devpath (struct udev udev, const char devpath,`
`831`	`831`	`syslog (LOG_DEBUG, "Device already handled");`
`832`	`832`	`free (usb_device_devpath);`
`833`	`833`	`free (devicefilepath);`
`834`		`- return NULL;`
	`834`	`+ exit (0);`
`835`	`835`	`}`
`836`	`836`
`837`	`837`	`serial = udev_device_get_sysattr_value (dev, "serial");`