chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevd: add timestamp to --debug output
[elogind.git]
/
libudev
/
libudev-util-private.c
diff --git
a/libudev/libudev-util-private.c
b/libudev/libudev-util-private.c
index 1a37490a9e364d76d1f2d305cd05f198bad0526f..f7daa9460beabeca74c08a80c548f1b5b129365a 100644
(file)
--- a/
libudev/libudev-util-private.c
+++ b/
libudev/libudev-util-private.c
@@
-249,6
+249,8
@@
int util_run_program(struct udev *udev, const char *command, char **envp,
int i;
int err = 0;
int i;
int err = 0;
+ info(udev, "'%s' started\n", command);
+
/* build argv from command */
util_strscpy(arg, sizeof(arg), command);
i = 0;
/* build argv from command */
util_strscpy(arg, sizeof(arg), command);
i = 0;
@@
-273,7
+275,6
@@
int util_run_program(struct udev *udev, const char *command, char **envp,
argv[0] = arg;
argv[1] = NULL;
}
argv[0] = arg;
argv[1] = NULL;
}
- info(udev, "'%s'\n", command);
/* prepare pipes from child to parent */
if (result != NULL || udev_get_log_priority(udev) >= LOG_INFO) {
/* prepare pipes from child to parent */
if (result != NULL || udev_get_log_priority(udev) >= LOG_INFO) {
@@
-435,11
+436,11
@@
int util_run_program(struct udev *udev, const char *command, char **envp,
}
waitpid(pid, &status, 0);
if (WIFEXITED(status)) {
}
waitpid(pid, &status, 0);
if (WIFEXITED(status)) {
- info(udev, "'%s' returned with
status %i\n", argv[0]
, WEXITSTATUS(status));
+ info(udev, "'%s' returned with
exitcode %i\n", command
, WEXITSTATUS(status));
if (WEXITSTATUS(status) != 0)
err = -1;
} else {
if (WEXITSTATUS(status) != 0)
err = -1;
} else {
- err(udev, "'%s'
abnormal exit\n", command
);
+ err(udev, "'%s'
unexpected exit with status 0x%04x\n", command, status
);
err = -1;
}
}
err = -1;
}
}