d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

expr(1) didn't comply to Posix.2 and its own man page: any

Browse Source 
comparisions have been made as string comparisions, even in cases
where both operands clearly qualified as integers.

The fix is to make the parser properly analyzing whether an operand is
a valid integer or not.
This commit is contained in:
Joerg Wunsch 1995-08-04 17:08:07 +00:00
parent 048a238135
commit 2a353a9fb4
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/expr/expr.y
View File

@ -4,7 +4,7 @@
*
* Largely rewritten by J.T. Conklin (jtc@wimsey.com)
*
* $Id: expr.y,v 1.8 1994/09/24 02:55:37 davidg Exp $
* $Id: expr.y,v 1.9 1995/03/19 13:28:41 joerg Exp $
*/
#include <stdio.h>
@ -107,13 +107,25 @@ make_str (s)
char *s;
{
struct val *vp;
int i, isint;
vp = (struct val *) malloc (sizeof (*vp));
if (vp == NULL || ((vp->u.s = strdup (s)) == NULL)) {
err (2, NULL);
}
for(i = 1, isint = isdigit(s[0]) || s[0] == '-';
isint && i < strlen(s);
i++)
{
if(!isdigit(s[i]))
isint = 0;
}
vp->type = string;
if(isint)
to_integer(vp);
return vp;
}