From b29d4affd855d0955865820dabf34182a2458da9 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Sun, 20 Sep 2009 18:31:16 +0000
Subject: [PATCH] Don't try to use tio if it is NULL.
---
compat/forkpty-aix.c | 4 ++--
compat/forkpty-sunos.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/compat/forkpty-aix.c b/compat/forkpty-aix.c
index abc4c690..f7bc1b8b 100644
--- a/compat/forkpty-aix.c
+++ b/compat/forkpty-aix.c
@@ -1,4 +1,4 @@
-/* $Id: forkpty-aix.c,v 1.3 2009-08-19 16:06:45 nicm Exp $ */
+/* $Id: forkpty-aix.c,v 1.4 2009-09-20 18:31:16 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -70,7 +70,7 @@ forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
fatal("open failed");
close(fd);
- if (tcsetattr(slave, TCSAFLUSH, tio) == -1)
+ if (tio != NULL && tcsetattr(slave, TCSAFLUSH, tio) == -1)
fatal("tcsetattr failed");
if (ioctl(slave, TIOCSWINSZ, ws) == -1)
fatal("ioctl failed");
diff --git a/compat/forkpty-sunos.c b/compat/forkpty-sunos.c
index 09d1e572..8d7caac5 100644
--- a/compat/forkpty-sunos.c
+++ b/compat/forkpty-sunos.c
@@ -1,4 +1,4 @@
-/* $Id: forkpty-sunos.c,v 1.7 2009-08-19 16:06:45 nicm Exp $ */
+/* $Id: forkpty-sunos.c,v 1.8 2009-09-20 18:31:16 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -62,7 +62,7 @@ forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
if (ioctl(slave, I_PUSH, "ldterm") == -1)
fatal("ioctl failed");
- if (tcsetattr(slave, TCSAFLUSH, tio) == -1)
+ if (tio != NULL && tcsetattr(slave, TCSAFLUSH, tio) == -1)
fatal("tcsetattr failed");
if (ioctl(slave, TIOCSWINSZ, ws) == -1)
fatal("ioctl failed");