Module Name: src
Committed By: blymn
Date: Thu Apr 21 10:23:50 UTC 2011
Modified Files:
src/tests/lib/libcurses/director: testlang_parse.y
src/tests/lib/libcurses/slave: slave.c
Log Message:
Allow a NULL pointer to be passed as an argument to a call.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/director/testlang_parse.y
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/slave/slave.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/director/testlang_parse.y
diff -u src/tests/lib/libcurses/director/testlang_parse.y:1.1 src/tests/lib/libcurses/director/testlang_parse.y:1.2
--- src/tests/lib/libcurses/director/testlang_parse.y:1.1 Sun Apr 10 09:55:09 2011
+++ src/tests/lib/libcurses/director/testlang_parse.y Thu Apr 21 10:23:50 2011
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_parse.y,v 1.1 2011/04/10 09:55:09 blymn Exp $ */
+/* $NetBSD: testlang_parse.y,v 1.2 2011/04/21 10:23:50 blymn Exp $ */
/*-
* Copyright 2009 Brett Lymn <[email protected]>
@@ -73,11 +73,12 @@
typedef enum {
arg_static,
arg_byte,
- arg_var
+ arg_var,
+ arg_null
} args_state_t;
static char *args_enum_names[] = {
- "static", "byte", "var"
+ "static", "byte", "var", "NULL"
};
typedef struct {
@@ -399,6 +400,7 @@
| FILENAME { assign_arg(arg_static, $1); } args
| VARNAME { assign_arg(arg_static, $1); } args
| VARIABLE { assign_arg(arg_var, $1); } args
+ | NULL_RET { assign_arg(arg_null, $1); } args
;
eol : EOL
@@ -525,31 +527,36 @@
command.function, arg, args_enum_names[arg_type]);
cur.arg_type = arg_type;
- if (arg_type != arg_var) {
- if (arg_type != arg_byte) {
- str = arg;
- cur.arg_len = strlen(str);
- cur.arg_string = malloc(cur.arg_len + 1);
- if (cur.arg_string == NULL)
- err(1,
- "Could not malloc memory for arg string");
- strcpy(cur.arg_string, arg);
- } else {
- ret = arg;
- cur.arg_len = ret->return_len;
- cur.arg_string = malloc(cur.arg_len);
- if (cur.arg_string == NULL)
- err(1,
- "Could not malloc memory for arg bytes");
- memcpy(cur.arg_string, ret->return_value,
- cur.arg_len);
- }
- } else {
+ switch (arg_type) {
+ case arg_var:
cur.var_index = find_var_index(arg);
if (cur.var_index < 0)
err(1, "Invalid variable %s at line %d of file %s",
arg, line, cur_file);
cur.arg_type = ret_string;
+ break;
+
+ case arg_byte:
+ ret = arg;
+ cur.arg_len = ret->return_len;
+ cur.arg_string = malloc(cur.arg_len);
+ if (cur.arg_string == NULL)
+ err(1, "Could not malloc memory for arg bytes");
+ memcpy(cur.arg_string, ret->return_value, cur.arg_len);
+ break;
+
+ case arg_null:
+ cur.arg_len = 0;
+ cur.arg_string = NULL;
+ break;
+
+ default:
+ str = arg;
+ cur.arg_len = strlen(str);
+ cur.arg_string = malloc(cur.arg_len + 1);
+ if (cur.arg_string == NULL)
+ err(1, "Could not malloc memory for arg string");
+ strcpy(cur.arg_string, arg);
}
temp = realloc(command.args, sizeof(args_t) * (command.nargs + 1));
@@ -1296,7 +1303,23 @@
void *cmd;
arg_data = data;
- if (type != arg_var) {
+ switch (type) {
+ case arg_var:
+ var_data = data;
+ len = var_data->len;
+ cmd = var_data->value;
+ if (var_data->type == arg_byte)
+ send_type = ret_byte;
+ else
+ send_type = ret_string;
+ break;
+
+ case arg_null:
+ send_type = ret_null;
+ len = 0;
+ break;
+
+ default:
if ((arg_data->arg_len == 0) && (arg_data->arg_string == NULL))
len = -1;
else
@@ -1306,14 +1329,6 @@
send_type = ret_byte;
else
send_type = ret_string;
- } else {
- var_data = data;
- len = var_data->len;
- cmd = var_data->value;
- if (var_data->type == arg_byte)
- send_type = ret_byte;
- else
- send_type = ret_string;
}
if (verbose)
Index: src/tests/lib/libcurses/slave/slave.c
diff -u src/tests/lib/libcurses/slave/slave.c:1.1 src/tests/lib/libcurses/slave/slave.c:1.2
--- src/tests/lib/libcurses/slave/slave.c:1.1 Sun Apr 10 09:55:10 2011
+++ src/tests/lib/libcurses/slave/slave.c Thu Apr 21 10:23:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: slave.c,v 1.1 2011/04/10 09:55:10 blymn Exp $ */
+/* $NetBSD: slave.c,v 1.2 2011/04/21 10:23:50 blymn Exp $ */
/*-
* Copyright 2009 Brett Lymn <[email protected]>
@@ -100,15 +100,19 @@
"failed");
args = tmpargs;
- args[argslen] = malloc(len + 1);
+ if (type != ret_null)
+ args[argslen] = malloc(len + 1);
if (args[argslen] == NULL)
err(1, "slave alloc of %d bytes for"
" args failed", len);
- if (len == 0)
- args[argslen][0] = '\0';
- else {
+ if (len == 0) {
+ if (type == ret_null)
+ args[argslen] = NULL;
+ else
+ args[argslen][0] = '\0';
+ } else {
read(cmdpipe[READ_PIPE], args[argslen],
len);
if (type != ret_byte)
