diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-05-16 09:33:03 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-05-16 09:33:03 +0100 |
| commit | 35d2f5bccb0f3dde600702ebcdb5424d4d50be4a (patch) | |
| tree | 6e0ff0341c69839e268459a199682628bae734ed /shell/shell_common.c | |
| parent | 248a2600a2f4b442101ad568d1994b908bb28d4b (diff) | |
| parent | f2559e5c2b7bd2c5fa0dd8e88d0a931da92a23af (diff) | |
| download | busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.gz busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.bz2 busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'shell/shell_common.c')
| -rw-r--r-- | shell/shell_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/shell_common.c b/shell/shell_common.c index dbd4286bf..c3bff477d 100644 --- a/shell/shell_common.c +++ b/shell/shell_common.c | |||
| @@ -335,7 +335,7 @@ enum { | |||
| 335 | }; | 335 | }; |
| 336 | 336 | ||
| 337 | /* "-": treat args as parameters of option with ASCII code 1 */ | 337 | /* "-": treat args as parameters of option with ASCII code 1 */ |
| 338 | static const char ulimit_opt_string[] = "-HSa" | 338 | static const char ulimit_opt_string[] ALIGN1 = "-HSa" |
| 339 | #ifdef RLIMIT_FSIZE | 339 | #ifdef RLIMIT_FSIZE |
| 340 | "f::" | 340 | "f::" |
| 341 | #endif | 341 | #endif |