command: Let builtin command take precedence
In theory we can overwrite a builtin command with a script. However, I don't know a single case where this has been done. Scripts are often more unflexible than commands so it's unlikely that a script can extend the functionality of a builtin command. Moreover, the internal command is no longer accessible once it's overwritten by a script. Invert this logic so that a builtin command can overwrite an existing script. This will help when the 'boot' script is converted to a builting command. Then with old environments the builtin command will be used instead of the script. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
56f33b4679
commit
45212cdd72
|
@ -60,6 +60,9 @@ int execute_binfmt(int argc, char **argv)
|
||||||
if (strchr(argv[0], '/'))
|
if (strchr(argv[0], '/'))
|
||||||
return binfmt_run(argv[0], argc, argv);
|
return binfmt_run(argv[0], argc, argv);
|
||||||
|
|
||||||
|
if (find_cmd(argv[0]))
|
||||||
|
return execute_command(argc, &argv[0]);
|
||||||
|
|
||||||
path = find_execable(argv[0]);
|
path = find_execable(argv[0]);
|
||||||
if (path) {
|
if (path) {
|
||||||
ret = binfmt_run(path, argc, argv);
|
ret = binfmt_run(path, argc, argv);
|
||||||
|
@ -67,7 +70,7 @@ int execute_binfmt(int argc, char **argv)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
return execute_command(argc, &argv[0]);
|
return -ENOENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
int binfmt_register(struct binfmt_hook *b)
|
int binfmt_register(struct binfmt_hook *b)
|
||||||
|
|
Loading…
Reference in New Issue