|
@@ -94,16 +94,13 @@ static char * evalstr(char *s)
|
|
|
|
|
|
static int stringcomp(char *s, char *t, int op)
|
|
static int stringcomp(char *s, char *t, int op)
|
|
{
|
|
{
|
|
- int n, p;
|
|
|
|
|
|
+ int p;
|
|
char *l, *r;
|
|
char *l, *r;
|
|
|
|
|
|
l = evalstr(s);
|
|
l = evalstr(s);
|
|
r = evalstr(t);
|
|
r = evalstr(t);
|
|
|
|
|
|
- /* we'll do a compare based on the length of the shortest string */
|
|
|
|
- n = min(strlen(l), strlen(r));
|
|
|
|
-
|
|
|
|
- p = strncmp(l, r, n);
|
|
|
|
|
|
+ p = strcmp(l, r);
|
|
switch (op) {
|
|
switch (op) {
|
|
case EQ: return (p == 0);
|
|
case EQ: return (p == 0);
|
|
case NE: return (p != 0);
|
|
case NE: return (p != 0);
|