diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-11-10 10:52:50 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-11-10 10:52:50 +0000 |
| commit | 550b6b0421d3f74c2c6ff3f8d9dfbc9e7ac22c3a (patch) | |
| tree | 9c48aa74b3a7ca2d58a740af4eca3bbf7d8e7096 /include | |
| parent | 87ff6cda847a11db5994205cb068d8deb8c4fdd1 (diff) | |
| parent | 87e039d0160be16a9a242f74af2e90cdb9f97e12 (diff) | |
| download | busybox-w32-550b6b0421d3f74c2c6ff3f8d9dfbc9e7ac22c3a.tar.gz busybox-w32-550b6b0421d3f74c2c6ff3f8d9dfbc9e7ac22c3a.tar.bz2 busybox-w32-550b6b0421d3f74c2c6ff3f8d9dfbc9e7ac22c3a.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h index 30a0e00ba..91702fa6e 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -1360,7 +1360,7 @@ char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC; | |||
| 1360 | #endif | 1360 | #endif |
| 1361 | extern void bb_do_delay(int seconds) FAST_FUNC; | 1361 | extern void bb_do_delay(int seconds) FAST_FUNC; |
| 1362 | extern void change_identity(const struct passwd *pw) FAST_FUNC; | 1362 | extern void change_identity(const struct passwd *pw) FAST_FUNC; |
| 1363 | extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args) NORETURN FAST_FUNC; | 1363 | extern void run_shell(const char *shell, int loginshell, const char **args) NORETURN FAST_FUNC; |
| 1364 | 1364 | ||
| 1365 | /* Returns $SHELL, getpwuid(getuid())->pw_shell, or DEFAULT_SHELL. | 1365 | /* Returns $SHELL, getpwuid(getuid())->pw_shell, or DEFAULT_SHELL. |
| 1366 | * Note that getpwuid result might need xstrdup'ing | 1366 | * Note that getpwuid result might need xstrdup'ing |