From 9fbdef8e601ce611b13edaa2690238e95caeb0ee Mon Sep 17 00:00:00 2001 From: tg Date: Fri, 21 Sep 2012 17:20:22 +0000 Subject: [PATCH] pure RCSID sync with OpenBSD, as we introduced SIGWINCH tracking earlier XXX we could track whether tty_fd has already been successfully opened, XXX the ttystate initialised, and then just never close it unless it is XXX necessary, then we can keep COLUMNS/LINES accurate in scripts, even --- edit.c | 4 ++-- main.c | 4 ++-- sh.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/edit.c b/edit.c index 11e7dd5..6144b6b 100644 --- a/edit.c +++ b/edit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: edit.c,v 1.34 2010/05/20 01:13:07 fgsch Exp $ */ +/* $OpenBSD: edit.c,v 1.35 2012/09/10 01:25:30 tedu Exp $ */ /* $OpenBSD: edit.h,v 1.9 2011/05/30 17:14:35 martynas Exp $ */ /* $OpenBSD: emacs.c,v 1.44 2011/09/05 04:50:33 marco Exp $ */ /* $OpenBSD: vi.c,v 1.26 2009/06/29 22:50:19 martynas Exp $ */ @@ -28,7 +28,7 @@ #ifndef MKSH_NO_CMDLINE_EDITING -__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.251 2012/08/24 21:33:49 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.252 2012/09/21 17:20:20 tg Exp $"); /* * in later versions we might use libtermcap for this, but since external diff --git a/main.c b/main.c index 5dbf7ae..267aea6 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.50 2012/09/06 18:04:34 millert Exp $ */ +/* $OpenBSD: main.c,v 1.51 2012/09/10 01:25:30 tedu Exp $ */ /* $OpenBSD: tty.c,v 1.9 2006/03/14 22:08:01 deraadt Exp $ */ /* $OpenBSD: io.c,v 1.22 2006/03/17 16:30:13 millert Exp $ */ /* $OpenBSD: table.c,v 1.15 2012/02/19 07:52:30 otto Exp $ */ @@ -34,7 +34,7 @@ #include #endif -__RCSID("$MirOS: src/bin/mksh/main.c,v 1.227 2012/09/07 21:02:43 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/main.c,v 1.228 2012/09/21 17:20:21 tg Exp $"); extern char **environ; diff --git a/sh.h b/sh.h index 679fe26..bcd8f5c 100644 --- a/sh.h +++ b/sh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sh.h,v 1.30 2010/01/04 18:07:11 deraadt Exp $ */ +/* $OpenBSD: sh.h,v 1.31 2012/09/10 01:25:30 tedu Exp $ */ /* $OpenBSD: shf.h,v 1.6 2005/12/11 18:53:51 deraadt Exp $ */ /* $OpenBSD: table.h,v 1.8 2012/02/19 07:52:30 otto Exp $ */ /* $OpenBSD: tree.h,v 1.10 2005/03/28 21:28:22 deraadt Exp $ */ @@ -157,7 +157,7 @@ #endif #ifdef EXTERN -__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.586 2012/09/07 21:02:43 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.587 2012/09/21 17:20:22 tg Exp $"); #endif #define MKSH_VERSION "R40 2012/09/07"