Module Name: src
Committed By: joerg
Date: Fri Oct 7 13:39:33 UTC 2011
Modified Files:
src/tests/lib/libcurses/director: director.c testlang_conf.l
Log Message:
Fix off-by-one error and simplify at the same time.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/lib/libcurses/director/director.c
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libcurses/director/testlang_conf.l
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/director.c
diff -u src/tests/lib/libcurses/director/director.c:1.8 src/tests/lib/libcurses/director/director.c:1.9
--- src/tests/lib/libcurses/director/director.c:1.8 Thu Sep 15 11:53:12 2011
+++ src/tests/lib/libcurses/director/director.c Fri Oct 7 13:39:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: director.c,v 1.8 2011/09/15 11:53:12 blymn Exp $ */
+/* $NetBSD: director.c,v 1.9 2011/10/07 13:39:33 joerg Exp $ */
/*-
* Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -267,11 +267,9 @@ main(int argc, char *argv[])
if ((yyin = fopen(argv[0], "r")) == NULL)
err(1, "Cannot open command file %s", argv[0]);
- if ((cur_file = malloc(strlen(argv[0]) + 1)) == NULL)
+ if ((cur_file = strdup(argv[0])) == NULL)
err(2, "Failed to alloc memory for test file name");
- strlcpy(cur_file, argv[0], strlen(argv[0]) + 1);
-
init_parse_variables(1);
yyparse();
Index: src/tests/lib/libcurses/director/testlang_conf.l
diff -u src/tests/lib/libcurses/director/testlang_conf.l:1.5 src/tests/lib/libcurses/director/testlang_conf.l:1.6
--- src/tests/lib/libcurses/director/testlang_conf.l:1.5 Sat Jun 18 20:05:28 2011
+++ src/tests/lib/libcurses/director/testlang_conf.l Fri Oct 7 13:39:33 2011
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_conf.l,v 1.5 2011/06/18 20:05:28 joerg Exp $ */
+/* $NetBSD: testlang_conf.l,v 1.6 2011/10/07 13:39:33 joerg Exp $ */
/*-
* Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -197,11 +197,9 @@ include BEGIN(incl);
include_stack[include_ptr] = line;
include_files[include_ptr++] = cur_file;
- cur_file = malloc(strlen(inc_file));
+ cur_file = strdup(inc_file);
if (cur_file == NULL)
err(2, "Cannot allocate new include file string");
-
- strlcpy(cur_file, inc_file, sizeof(inc_file));
line = 0;
BEGIN(INITIAL);
}
