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

ash: alloc slightly smaller buffer in cvtnum(); faster unsetvar()

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-26 14:38:19 +02:00
parent b31b61bb9b
commit cf3a796dd1
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
shell/ash.c
View File

@ -214,6 +214,9 @@
#include "shell_common.h" #include "shell_common.h"
#if ENABLE_FEATURE_SH_MATH #if ENABLE_FEATURE_SH_MATH
# include "math.h" # include "math.h"
#else
typedef long arith_t;
# define ARITH_FMT "%ld"
#endif #endif
#if ENABLE_ASH_RANDOM_SUPPORT #if ENABLE_ASH_RANDOM_SUPPORT
# include "random.h" # include "random.h"
@ -621,8 +624,8 @@ fmtstr(char *outbuf, size_t length, const char *fmt, ...)
va_list ap; va_list ap;
int ret; int ret;
va_start(ap, fmt);
INT_OFF; INT_OFF;
va_start(ap, fmt);
ret = vsnprintf(outbuf, length, fmt, ap); ret = vsnprintf(outbuf, length, fmt, ap);
va_end(ap); va_end(ap);
INT_ON; INT_ON;
@ -2345,7 +2348,7 @@ setvar0(const char *name, const char *val)
static void static void
unsetvar(const char *s) unsetvar(const char *s)
{ {
setvar0(s, NULL); setvar(s, NULL, 0);
} }
/* /*
@ -5697,19 +5700,20 @@ static struct arglist exparg;
/* /*
* Our own itoa(). * Our own itoa().
* cvtnum() is used even if math support is off (to prepare $? values and such).
*/ */
#if !ENABLE_FEATURE_SH_MATH
/* cvtnum() is used even if math support is off (to prepare $? values and such) */
typedef long arith_t;
# define ARITH_FMT "%ld"
#endif
static int static int
cvtnum(arith_t num) cvtnum(arith_t num)
{ {
int len; int len;
expdest = makestrspace(sizeof(arith_t)*3 + 2, expdest); /* 32-bit and wider ints require buffer size of bytes*3 (or less) */
len = fmtstr(expdest, sizeof(arith_t)*3 + 2, ARITH_FMT, num); len = sizeof(arith_t) * 3;
/* If narrower: worst case, 1-byte ints: need 5 bytes: "-127<NUL>" */
if (sizeof(arith_t) < 4) len += 2;
expdest = makestrspace(len, expdest);
len = fmtstr(expdest, len, ARITH_FMT, num);
STADJUST(len, expdest); STADJUST(len, expdest);
return len; return len;
} }