switch (state) {
case EVENT_QUEUED:
unlink(filename_failed);
+ delete_path(filename_failed);
strlcpy(target, sysfs_path, sizeof(target));
strlcat(target, msg->devpath, sizeof(target));
symlink(target, filename);
return;
case EVENT_FINISHED:
+ case EVENT_FAILED:
unlink(filename_failed);
+ delete_path(filename_failed);
- /* don't remove if events for the same path are still pending */
+ /* don't remove, if events for the same path are still pending */
list_for_each_entry(loop_msg, &running_list, node)
if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
return;
- unlink(filename);
- case EVENT_FAILED:
- create_path(filename_failed);
- rename(filename, filename_failed);
+
+ /* move failed events to the failed directory */
+ if (state == EVENT_FAILED) {
+ create_path(filename_failed);
+ rename(filename, filename_failed);
+ } else {
+ unlink(filename);
+ }
+
+ /* clean up the queue directory */
+ delete_path(filename);
+
return;
}
}
break;
if (WIFEXITED(status))
status = WEXITSTATUS(status);
+ else if (WIFSIGNALED(status))
+ status = WTERMSIG(status) + 128;
else
status = 0;
udev_done(pid, status);