X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=shell%2Fshell_common.c;h=98d862744432d25be36bceeac57e3de12a612a5f;hb=3df1410a00a7a57f3a43373c00cdea2031d7d70c;hp=780e27ebd4f05ea4b9015c45ffe8c4ca9935e5d6;hpb=c5fe9f7b723f949457263ef8e22ab807d5b549ce;p=oweals%2Fbusybox.git diff --git a/shell/shell_common.c b/shell/shell_common.c index 780e27ebd..98d862744 100644 --- a/shell/shell_common.c +++ b/shell/shell_common.c @@ -21,6 +21,7 @@ #include /* getrlimit */ const char defifsvar[] ALIGN1 = "IFS= \t\n"; +const char defoptindvar[] ALIGN1 = "OPTIND=1"; int FAST_FUNC is_well_formed_var_name(const char *s, char terminator) @@ -37,7 +38,7 @@ int FAST_FUNC is_well_formed_var_name(const char *s, char terminator) /* read builtin */ -/* Needs to be interruptible: shell mush handle traps and shell-special signals +/* Needs to be interruptible: shell must handle traps and shell-special signals * while inside read. To implement this, be sure to not loop on EINTR * and return errno == EINTR reliably. */ @@ -170,7 +171,7 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val), int timeout; if ((bufpos & 0xff) == 0) - buffer = xrealloc(buffer, bufpos + 0x100); + buffer = xrealloc(buffer, bufpos + 0x101); timeout = -1; if (end_ms) { @@ -328,7 +329,7 @@ enum { }; /* "-": treat args as parameters of option with ASCII code 1 */ -static const char ulimit_opt_string[] = "-HSa" +static const char ulimit_opt_string[] ALIGN1 = "-HSa" #ifdef RLIMIT_FSIZE "f::" #endif @@ -380,7 +381,7 @@ static void printlim(unsigned opts, const struct rlimit *limit, val = limit->rlim_cur; if (val == RLIM_INFINITY) - printf("unlimited\n"); + puts("unlimited"); else { val >>= l->factor_shift; printf("%llu\n", (long long) val); @@ -493,7 +494,6 @@ shell_builtin_ulimit(char **argv) /* bad option. getopt already complained. */ break; } - } /* while (there are options) */ return 0;