[src/netbsd-7]: src/lib/libc/gen Pull up following revision(s) (requested by ...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d60598c97166
branches:  netbsd-7
changeset: 799809:d60598c97166
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Feb 26 21:57:12 2016 +0000

description:
Pull up following revision(s) (requested by christos in ticket #1101):
        lib/libc/gen/getpass.c: revision 1.30
PR/50695: coypu: ctrl-c in su password input breaks shell (bash, csh)
Always restore the tty settings.

diffstat:

 lib/libc/gen/getpass.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 789e62174137 -r d60598c97166 lib/libc/gen/getpass.c
--- a/lib/libc/gen/getpass.c    Fri Feb 26 21:50:54 2016 +0000
+++ b/lib/libc/gen/getpass.c    Fri Feb 26 21:57:12 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getpass.c,v 1.28 2014/06/16 16:29:30 christos Exp $    */
+/*     $NetBSD: getpass.c,v 1.28.2.1 2016/02/26 21:57:12 snj Exp $     */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getpass.c,v 1.28 2014/06/16 16:29:30 christos Exp $");
+__RCSID("$NetBSD: getpass.c,v 1.28.2.1 2016/02/26 21:57:12 snj Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -287,12 +287,12 @@
        good = true;
 
 restore:
+out:
        if (havetty) {
                c = errno;
                (void)tcsetattr(fd[0], TCSAFLUSH|TCSASOFT, &gt);
                errno = c;
        }
-out:
        if (good && (flags & GETPASS_ECHO_NL))
                (void)write(fd[1], "\n", 1);