chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] correct error path for PROGRAM execution
[elogind.git]
/
udev_rules.c
diff --git
a/udev_rules.c
b/udev_rules.c
index c07abb9be064b6897c150e095510a5c7ffa196eb..9a0ee833e2acc1d94eff59e3241d405f63b5a8d7 100644
(file)
--- a/
udev_rules.c
+++ b/
udev_rules.c
@@
-415,11
+415,13
@@
static int execute_program(struct udevice *udev, const char *path, char *value,
dup2(fds[1], STDOUT_FILENO);
retval = execv(arg, argv);
dup2(fds[1], STDOUT_FILENO);
retval = execv(arg, argv);
- info(KEY_PROGRAM " execution of '%s' failed", path);
- exit(1);
+ err(KEY_PROGRAM " execution of '%s' failed", path);
+ retval = -1;
+ break;
case -1:
err("fork of '%s' failed", path);
case -1:
err("fork of '%s' failed", path);
- return -1;
+ retval = -1;
+ break;
default:
/* parent reads from fds[0] */
close(fds[1]);
default:
/* parent reads from fds[0] */
close(fds[1]);