emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: make tryexec(cmd) parameter const char

Browse Source 
Fewer casts this way.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-29 01:20:53 +02:00
parent f128bdbbd7
commit 00a1dbd230
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shell/ash.c
View File

@ -7687,7 +7687,7 @@ static int builtinloc = -1; /* index in path of %builtin, or -1 */
static void static void
tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **envp) tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, char **envp)
{ {
#if ENABLE_FEATURE_SH_STANDALONE #if ENABLE_FEATURE_SH_STANDALONE
if (applet_no >= 0) { if (applet_no >= 0) {
@ -7713,7 +7713,7 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **
#else #else
execve(cmd, argv, envp); execve(cmd, argv, envp);
#endif #endif
if (cmd != (char*) bb_busybox_exec_path && errno == ENOEXEC) { if (cmd != bb_busybox_exec_path && errno == ENOEXEC) {
/* Run "cmd" as a shell script: /* Run "cmd" as a shell script:
* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html * http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html
* "If the execve() function fails with ENOEXEC, the shell * "If the execve() function fails with ENOEXEC, the shell
@ -7730,8 +7730,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **
* message and exit code 126. For one, this prevents attempts * message and exit code 126. For one, this prevents attempts
* to interpret foreign ELF binaries as shell scripts. * to interpret foreign ELF binaries as shell scripts.
*/ */
argv[0] = cmd; argv[0] = (char*) cmd;
cmd = (char*) bb_busybox_exec_path; cmd = bb_busybox_exec_path;
/* NB: this is only possible because all callers of shellexec() /* NB: this is only possible because all callers of shellexec()
* ensure that the argv[-1] slot exists! * ensure that the argv[-1] slot exists!
*/ */