Mailing List Archive

Update of /usr/local/cvs/libnasl/nasl
In directory raccoon.nessus.org:/tmp/cvs-serv97879

Modified Files:
exec.c nasl_tree.c nasl_tree.h nasl_var.c
Log Message:
Cleaner trace + error messages on REF_ARRAY


Index: exec.c
===================================================================
RCS file: /usr/local/cvs/libnasl/nasl/exec.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- exec.c 14 Jan 2003 13:53:21 -0000 1.13
+++ exec.c 15 Jan 2003 10:41:22 -0000 1.14
@@ -76,7 +76,12 @@

return 0;
if(c->x.str_val[0] == '0' && c->size == 1)
return 0;
- return 1;
+ return 1;
+
+ case REF_ARRAY:
+ case DYN_ARRAY:
+ fprintf(stderr, "cell2bool: converting array to boolean does not make sense!\n");
+ return 1;

default:
c2 = nasl_exec(lexic, c);
@@ -465,7 +470,7 @@

break;
case CONST_STR:
case CONST_DATA:
- fprintf(fp, "\"%d\"", c->x.str_val);
+ fprintf(fp, "\"%s\"", c->x.str_val);
break;

case NODE_ARRAY_EL:

Index: nasl_tree.c
===================================================================
RCS file: /usr/local/cvs/libnasl/nasl/nasl_tree.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- nasl_tree.c 12 Jan 2003 14:09:59 -0000 1.8
+++ nasl_tree.c 15 Jan 2003 10:41:23 -0000 1.9
@@ -282,7 +282,7 @@

snprintf(txt, sizeof(txt), "\"%s\"", c->x.str_val);
break;
default:
- return "??????";
+ sprintf(txt, "???? (%s)", nasl_type_name(c->type));
break;
}
return txt;
@@ -373,7 +373,7 @@

}
}

-char*
+const char*
nasl_type_name(int t)
{
static char txt[64];

Index: nasl_tree.h
===================================================================
RCS file: /usr/local/cvs/libnasl/nasl/nasl_tree.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- nasl_tree.h 12 Jan 2003 14:09:59 -0000 1.7
+++ nasl_tree.h 15 Jan 2003 10:41:23 -0000 1.8
@@ -132,5 +132,6 @@

void nasl_dump_tree(const tree_cell*);
void ref_cell(tree_cell*);
void deref_cell(tree_cell*);
+const char* nasl_type_name(int);

#endif

Index: nasl_var.c
===================================================================
RCS file: /usr/local/cvs/libnasl/nasl/nasl_var.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- nasl_var.c 11 Jan 2003 13:14:24 -0000 1.6
+++ nasl_var.c 15 Jan 2003 10:41:23 -0000 1.7
@@ -535,8 +535,12 @@

case VAR2_DATA:
fprintf(nasl_trace_fp, "NASL> %s <- \"%s\"\n", get_var_name(v1), v1->v.str_val);
break;
+ case VAR2_ARRAY:
+ fprintf(nasl_trace_fp, "NASL> %s <- (VAR2_ARRAY)\n", get_var_name(v1));
+ break;
default:
- fprintf(nasl_trace_fp, "NASL> %s <- ????\n", get_var_name(v1));
+ fprintf(nasl_trace_fp, "NASL> %s <- (Type 0x%x)\n",
+ get_var_name(v1), t2);
break;