chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: add a makefile target to run all tests through valgrind
[elogind.git]
/
src
/
run
/
run.c
diff --git
a/src/run/run.c
b/src/run/run.c
index c5d314bdf1974701720017cbe7091dfa80a98275..18a4920f0371fd91bb5d1c0e3e775241554e73f6 100644
(file)
--- a/
src/run/run.c
+++ b/
src/run/run.c
@@
-28,6
+28,7
@@
#include "strv.h"
#include "build.h"
#include "unit-name.h"
#include "strv.h"
#include "build.h"
#include "unit-name.h"
+#include "path-util.h"
static bool arg_scope = false;
static bool arg_user = false;
static bool arg_scope = false;
static bool arg_user = false;
@@
-39,7
+40,7
@@
static bool arg_send_sighup = false;
static int help(void) {
static int help(void) {
- printf("%s [OPTIONS...]
[COMMAND LINE
...]\n\n"
+ printf("%s [OPTIONS...]
COMMAND [ARGS
...]\n\n"
"Run the specified command in a transient scope or service unit.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
"Run the specified command in a transient scope or service unit.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
@@
-324,7
+325,7
@@
static int start_transient_scope(
int main(int argc, char* argv[]) {
sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_unref_ sd_bus *bus = NULL;
int main(int argc, char* argv[]) {
sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_unref_ sd_bus *bus = NULL;
- _cleanup_free_ char *description = NULL;
+ _cleanup_free_ char *description = NULL
, *command = NULL
;
int r;
log_parse_environment();
int r;
log_parse_environment();
@@
-334,6
+335,13
@@
int main(int argc, char* argv[]) {
if (r <= 0)
goto fail;
if (r <= 0)
goto fail;
+ r = find_binary(argv[optind], &command);
+ if (r < 0) {
+ log_error("Failed to find executable %s: %s", argv[optind], strerror(-r));
+ goto fail;
+ }
+ argv[optind] = command;
+
if (!arg_description) {
description = strv_join(argv + optind, " ");
if (!description) {
if (!arg_description) {
description = strv_join(argv + optind, " ");
if (!description) {