chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: introduce new SD_BUS_VTABLE_HIDDEN flag for vtable members
[elogind.git]
/
src
/
core
/
execute.c
diff --git
a/src/core/execute.c
b/src/core/execute.c
index a0d63a41f9a521b82b806537d4db1e19505da468..55b8bb5bea07820c1f77dd57a5806f413d0dc826 100644
(file)
--- a/
src/core/execute.c
+++ b/
src/core/execute.c
@@
-41,6
+41,7
@@
#include <linux/seccomp-bpf.h>
#include <glob.h>
#include <libgen.h>
#include <linux/seccomp-bpf.h>
#include <glob.h>
#include <libgen.h>
+#undef basename
#ifdef HAVE_PAM
#include <security/pam_appl.h>
#ifdef HAVE_PAM
#include <security/pam_appl.h>
@@
-908,7
+909,7
@@
static void rename_process_from_path(const char *path) {
/* This resulting string must fit in 10 chars (i.e. the length
* of "/sbin/init") to look pretty in /bin/ps */
/* This resulting string must fit in 10 chars (i.e. the length
* of "/sbin/init") to look pretty in /bin/ps */
- p =
path_get_file_
name(path);
+ p =
base
name(path);
if (isempty(p)) {
rename_process("(...)");
return;
if (isempty(p)) {
rename_process("(...)");
return;
@@
-1197,13
+1198,13
@@
int exec_spawn(ExecCommand *command,
goto fail_child;
}
goto fail_child;
}
- err = setup_output(context, STDOUT_FILENO, socket_fd,
path_get_file_
name(command->path), unit_id, apply_tty_stdin);
+ err = setup_output(context, STDOUT_FILENO, socket_fd,
base
name(command->path), unit_id, apply_tty_stdin);
if (err < 0) {
r = EXIT_STDOUT;
goto fail_child;
}
if (err < 0) {
r = EXIT_STDOUT;
goto fail_child;
}
- err = setup_output(context, STDERR_FILENO, socket_fd,
path_get_file_
name(command->path), unit_id, apply_tty_stdin);
+ err = setup_output(context, STDERR_FILENO, socket_fd,
base
name(command->path), unit_id, apply_tty_stdin);
if (err < 0) {
r = EXIT_STDERR;
goto fail_child;
if (err < 0) {
r = EXIT_STDERR;
goto fail_child;