CVS commit: src/tests/lib/libcurses/director

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Tue Apr 19 20:13:56 UTC 2011

Modified Files:
        src/tests/lib/libcurses/director: director.c

Log Message:
Manually craft a (default) termios description instead of trying to fetch
one from stdin - ATF tests should not rely on stdin being a terminal.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/director/director.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/director.c
diff -u src/tests/lib/libcurses/director/director.c:1.2 src/tests/lib/libcurses/director/director.c:1.3
--- src/tests/lib/libcurses/director/director.c:1.2	Mon Apr 11 22:37:10 2011
+++ src/tests/lib/libcurses/director/director.c	Tue Apr 19 20:13:55 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: director.c,v 1.2 2011/04/11 22:37:10 joerg Exp $	*/
+/*	$NetBSD: director.c,v 1.3 2011/04/19 20:13:55 martin Exp $	*/
 
 /*-
  * Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -190,8 +190,15 @@
 		exit(2);
 	}
 
-	if (tcgetattr(0, &term_attr) < 0)
-		err(2, "Failed to get term attributes");
+	/*
+	 * Create default termios settings for later use
+	 */
+	memset(&term_attr, 0, sizeof(term_attr));
+	term_attr.c_iflag = TTYDEF_IFLAG;
+	term_attr.c_oflag = TTYDEF_OFLAG;
+	term_attr.c_cflag = TTYDEF_CFLAG;
+	term_attr.c_lflag = TTYDEF_LFLAG;
+	cfsetspeed(&term_attr, TTYDEF_SPEED);
 
 	if ((slave_pid = forkpty(&master, NULL, &term_attr, NULL)) < 0) {
 		fprintf(stderr, "Fork of pty for slave failed\n");