diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-07-21 08:25:57 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-07-21 08:25:57 +0000 |
| commit | 736e2ab430e006ba09a2fe34d7887d3812ac808f (patch) | |
| tree | f2d5948776e91112fcfd9199a757cd58e1be867a /misc/getpass.c | |
| parent | 366c71f353afc163b8d31c9db6e90919b5c2e1c0 (diff) | |
Updated to fedora-glibc-20050721T0814
Diffstat (limited to 'misc/getpass.c')
| -rw-r--r-- | misc/getpass.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/misc/getpass.c b/misc/getpass.c index 62e56866a1..5290c3c7d3 100644 --- a/misc/getpass.c +++ b/misc/getpass.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-1999, 2001, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1992-1999,2001,2003,2004,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -91,12 +91,7 @@ getpass (prompt) tty_changed = 0; /* Write the prompt. */ -#ifdef USE_IN_LIBIO - if (_IO_fwide (out, 0) > 0) - __fwprintf (out, L"%s", prompt); - else -#endif - fputs_unlocked (prompt, out); + __fxprintf (out, "%s", prompt); fflush_unlocked (out); /* Read the password. */ @@ -110,15 +105,8 @@ getpass (prompt) /* Remove the newline. */ buf[nread - 1] = '\0'; if (tty_changed) - { - /* Write the newline that was not echoed. */ -#ifdef USE_IN_LIBIO - if (_IO_fwide (out, 0) > 0) - putwc_unlocked (L'\n', out); - else -#endif - putc_unlocked ('\n', out); - } + /* Write the newline that was not echoed. */ + __fxprintf (out, "\n"); } } |