fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop maxdigits in expr(1)

Browse Source 
This just begs for off-by-ones. Just drop it and use BUFSIZ.
We'll survive it.
This commit is contained in:
FRIGN 2015-03-23 22:56:26 +01:00
parent f668afa1ff
commit 8db1632409
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
expr.c
View File

@ -17,8 +17,6 @@ struct val {
long long num; long long num;
}; };
static size_t maxdigits;
static void static void
enan(struct val *v) enan(struct val *v)
{ {
@ -39,7 +37,7 @@ static int
valcmp(struct val *a, struct val *b) valcmp(struct val *a, struct val *b)
{ {
int ret; int ret;
char buf[maxdigits]; char buf[BUFSIZ];
if (!a->str && !b->str) { if (!a->str && !b->str) {
ret = (a->num > b->num) - (a->num < b->num); ret = (a->num > b->num) - (a->num < b->num);
@ -63,7 +61,7 @@ match(struct val *vstr, struct val *vregx, struct val *ret)
regmatch_t matches[2]; regmatch_t matches[2];
long long d; long long d;
size_t anchlen; size_t anchlen;
char strbuf[maxdigits + 1], regxbuf[maxdigits + 1], char strbuf[BUFSIZ], regxbuf[BUFSIZ],
*s, *p, *anchreg, *str, *regx; *s, *p, *anchreg, *str, *regx;
const char *errstr; const char *errstr;
@ -263,11 +261,6 @@ usage(void)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
long long n = LLONG_MIN;
/* maximum number of digits + sign */
for (maxdigits = (n < 0); n; n /= 10, ++maxdigits);
ARGBEGIN { ARGBEGIN {
default: default:
usage(); usage();