diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-07-20 07:43:27 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-07-20 07:43:27 +0000 |
| commit | df6f89692fd7e802f38f944ed73942354a9911f8 (patch) | |
| tree | 12debd445b11886fcf433fc6f85e9abe615670cc /misc | |
| parent | 10ffcd52f0578b13b48bdf84e73759353b29b673 (diff) | |
| download | glibc-df6f89692fd7e802f38f944ed73942354a9911f8.tar.gz glibc-df6f89692fd7e802f38f944ed73942354a9911f8.tar.xz glibc-df6f89692fd7e802f38f944ed73942354a9911f8.zip | |
* wcsmbs/bits/wchar2.h: Add definitions for wcrtomb, mbsrtowcs,
wcsrtombs, mbsnrtowcs, and wcsnrtombs. * debug/Makefile (routines): Add wcrtomb_chk, mbsrtowcs_chk, wcsrtombs_chk, mbsnrtowcs_chk, and wcsnrtombs_chk. * debug/Versions: Add __wcrtomb_chk, __mbsrtowcs_chk, __wcsrtombs_chk, __mbsnrtowcs_chk, and __wcsnrtombs_chk. * debug/tst-chk1.c: Add tests for new functions. * debug/mbsnrtowcs_chk.c: New file. * debug/mbsrtowcs_chk.c: New file. * debug/wcrtomb_chk.c: New file. * debug/wcsnrtombs_chk.c: New file. * debug/wcsrtombs_chk.c: New file. * include/stdio.h: Add declaration for __fxprintf.
Diffstat (limited to 'misc')
| -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..a6e568ac08 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", L"%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, "%c", L"%c", '\n'); } } |