Updated by gnulib-sync

 /* Declaration for error-reporting function
 /* Declaration for error-reporting function
-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
 
-
-   NOTE: The canonical source of this file is maintained with the GNU C Library.
-   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
 
    This program is distributed in the hope that it will be useful,
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    GNU General Public License for more details.
 
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
 #ifndef _ERROR_H
 #ifndef _ERROR_H
 #define _ERROR_H 1
 #define _ERROR_H 1
 
 
 #ifndef __attribute__
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
 #  define __attribute__(Spec) /* empty */
 #  define __attribute__(Spec) /* empty */
 # endif
 # endif
 /* The __-protected variants of `format' and `printf' attributes
 /* The __-protected variants of `format' and `printf' attributes
@@ -40,17 +36,15 @@
 extern "C" {
 extern "C" {
 #endif
 #endif
 
 
-#if defined (__STDC__) && __STDC__
-
 /* Print a message with `fprintf (stderr, FORMAT, ...)';
 /* Print a message with `fprintf (stderr, FORMAT, ...)';
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
    If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
    If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
 
 
-extern void error (int status, int errnum, const char *format, ...)
+extern void error (int __status, int __errnum, const char *__format, ...)
      __attribute__ ((__format__ (__printf__, 3, 4)));
      __attribute__ ((__format__ (__printf__, 3, 4)));
 
 
-extern void error_at_line (int status, int errnum, const char *fname,
-			   unsigned int lineno, const char *format, ...)
+extern void error_at_line (int __status, int __errnum, const char *__fname,
+			   unsigned int __lineno, const char *__format, ...)
      __attribute__ ((__format__ (__printf__, 5, 6)));
      __attribute__ ((__format__ (__printf__, 5, 6)));
 
 
 /* If NULL, error will flush stdout, then print on stderr the program
 /* If NULL, error will flush stdout, then print on stderr the program
@@ -58,12 +52,6 @@ extern void error_at_line (int status, int errnum, const char *fname,
    function without parameters instead.  */
    function without parameters instead.  */
 extern void (*error_print_progname) (void);
 extern void (*error_print_progname) (void);
 
 
-#else
-void error ();
-void error_at_line ();
-extern void (*error_print_progname) ();
-#endif
-
 /* This variable is incremented each time `error' is called.  */
 /* This variable is incremented each time `error' is called.  */
 extern unsigned int error_message_count;
 extern unsigned int error_message_count;
 
 

-/* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2001, 2003, 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
 
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
 
-   This library is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
-#include  <stdio.h>
-#include  <string.h>
-#include  <stdlib.h>
-#include  <termios.h>
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 
-/* Alain: Parts originally from GNU Lib C.  */
+#if !_LIBC
+# include "getpass.h"
+#endif
 
 
-static void
-echo_off(int fd, struct termios *stored_settings)
-{
-  struct termios new_settings;
-  tcgetattr (fd, stored_settings);
-  new_settings = *stored_settings;
-  new_settings.c_lflag &= (~ECHO);
-  tcsetattr (fd, TCSANOW, &new_settings);
-}
+#if _LIBC
+# define HAVE_STDIO_EXT_H 1
+#endif
+
+#include <stdbool.h>
+
+#include <stdio.h>
+#if HAVE_STDIO_EXT_H
+# include <stdio_ext.h>
+#else
+# define __fsetlocking(stream, type) /* empty */
+#endif
+#if !_LIBC
+# include "getline.h"
+#endif
+
+#include <termios.h>
+#include <unistd.h>
+
+#if _LIBC
+# include <wchar.h>
+#endif
+
+#if _LIBC
+# define NOTCANCEL_MODE "c"
+#else
+# define NOTCANCEL_MODE
+#endif
+
+#if _LIBC
+# define flockfile(s) _IO_flockfile (s)
+# define funlockfile(s) _IO_funlockfile (s)
+#elif USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#else
+# if !HAVE_DECL_FFLUSH_UNLOCKED
+#  undef fflush_unlocked
+#  define fflush_unlocked(x) fflush (x)
+# endif
+# if !HAVE_DECL_FLOCKFILE
+#  undef flockfile
+#  define flockfile(x) ((void) 0)
+# endif
+# if !HAVE_DECL_FUNLOCKFILE
+#  undef funlockfile
+#  define funlockfile(x) ((void) 0)
+# endif
+# if !HAVE_DECL_FPUTS_UNLOCKED
+#  undef fputs_unlocked
+#  define fputs_unlocked(str,stream) fputs (str, stream)
+# endif
+# if !HAVE_DECL_PUTC_UNLOCKED
+#  undef putc_unlocked
+#  define putc_unlocked(c,stream) putc (c, stream)
+# endif
+#endif
+
+#if _LIBC
+# include <bits/libc-lock.h>
+#else
+# define __libc_cleanup_push(function, arg) /* empty */
+# define __libc_cleanup_pop(execute) /* empty */
+#endif
+
+#if !_LIBC
+# define __getline getline
+# define __tcgetattr tcgetattr
+#endif
+
+/* It is desirable to use this bit on systems that have it.
+   The only bit of terminal state we want to twiddle is echoing, which is
+   done in software; there is no need to change the state of the terminal
+   hardware.  */
+
+#ifndef TCSASOFT
+# define TCSASOFT 0
+#endif
 
 
 static void
 static void
-echo_on(int fd, struct termios *stored_settings)
+call_fclose (void *arg)
 {
 {
-  tcsetattr (fd, TCSANOW, stored_settings);
+  if (arg != NULL)
+    fclose (arg);
 }
 }
 
 
 char *
 char *
-getpass (const char * prompt)
+getpass (const char *prompt)
 {
 {
+  FILE *tty;
   FILE *in, *out;
   FILE *in, *out;
-  struct termios stored_settings;
+  struct termios s, t;
+  bool tty_changed;
   static char *buf;
   static char *buf;
-  static size_t buf_size;
-  char *pbuf;
+  static size_t bufsize;
+  ssize_t nread;
+
+  /* Try to write to and read from the terminal if we can.
+     If we can't open the terminal, use stderr and stdin.  */
 
 
-  /* First pass initialize the buffer.  */
-  if (buf_size == 0)
+  tty = fopen ("/dev/tty", "w+" NOTCANCEL_MODE);
+  if (tty == NULL)
     {
     {
-      buf_size = 256;
-      buf = calloc (1, buf_size);
-      if (buf == NULL)
-	return NULL;
+      in = stdin;
+      out = stderr;
     }
     }
   else
   else
-    memset (buf, '\0', buf_size);
+    {
+      /* We do the locking ourselves.  */
+      __fsetlocking (tty, FSETLOCKING_BYCALLER);
+
+      out = in = tty;
+    }
+
+  /* Make sure the stream we opened is closed even if the thread is
+     canceled.  */
+  __libc_cleanup_push (call_fclose, tty);
+
+  flockfile (out);
 
 
   /* Turn echoing off if it is on now.  */
   /* Turn echoing off if it is on now.  */
-  echo_off (fileno (stdin), &stored_settings);
+
+  if (__tcgetattr (fileno (in), &t) == 0)
+    {
+      /* Save the old one. */
+      s = t;
+      /* Tricky, tricky. */
+      t.c_lflag &= ~(ECHO|ISIG);
+      tty_changed = (tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &t) == 0);
+    }
+  else
+    tty_changed = false;
 
 
   /* Write the prompt.  */
   /* Write the prompt.  */
-  fputs (prompt, stdout);
-  fflush (stdout);
+#ifdef USE_IN_LIBIO
+  if (_IO_fwide (out, 0) > 0)
+    __fwprintf (out, L"%s", prompt);
+  else
+#endif
+    fputs_unlocked (prompt, out);
+  fflush_unlocked (out);
 
 
   /* Read the password.  */
   /* Read the password.  */
-  pbuf = fgets (buf, buf_size, stdin);
-  if (pbuf)
+  nread = __getline (&buf, &bufsize, in);
+
+#if !_LIBC
+  /* As far as is known, glibc doesn't need this no-op fseek.  */
+
+  /* According to the C standard, input may not be followed by output
+     on the same stream without an intervening call to a file
+     positioning function.  Suppose in == out; then without this fseek
+     call, on Solaris, HP-UX, AIX, OSF/1, the previous input gets
+     echoed, whereas on IRIX, the following newline is not output as
+     it should be.  POSIX imposes similar restrictions if fileno (in)
+     == fileno (out).  The POSIX restrictions are tricky and change
+     from POSIX version to POSIX version, so play it safe and invoke
+     fseek even if in != out.  */
+  fseek (out, 0, SEEK_CUR);
+#endif
+
+  if (buf != NULL)
     {
     {
-      size_t nread = strlen (pbuf);
-      if (nread && pbuf[nread - 1] == '\n')
-        {
-          /* Remove the newline.  */
-          pbuf[nread - 1] = '\0';
-	  /* Write the newline that was not echoed.  */
-	  putc ('\n', stdout);
-        }
+      if (nread < 0)
+	buf[0] = '\0';
+      else if (buf[nread - 1] == '\n')
+	{
+	  /* 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);
+	    }
+	}
     }
     }
 
 
   /* Restore the original setting.  */
   /* Restore the original setting.  */
-  echo_on (fileno (stdin), &stored_settings);
+  if (tty_changed)
+    (void) tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &s);
 
 
-  return pbuf;
-}
+  funlockfile (out);
 
 
-#ifdef _GETPASS_STANDALONE_TEST
+  __libc_cleanup_pop (0);
 
 
-int
-main ()
-{
-  char *p;
-  p = getpass ("my prompt: ");
-  if (p)
-    printf ("Passwd: %s\n", p);
-  return 0;
+  call_fclose (tty);
+
+  return buf;
 }
 }
-#endif

-/* rpl_malloc.c -- a replacement for malloc that don't accept 0 size
-   Copyright (C) 2001 Free Software Foundation, Inc.
+/* malloc() function that is glibc compatible.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
 
 
    This program is free software; you can redistribute it and/or modify
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by
@@ -15,12 +15,22 @@
    along with this program; if not, write to the Free Software Foundation,
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
+/* written by Jim Meyering */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#undef malloc
+
 #include <stdlib.h>
 #include <stdlib.h>
 
 
+/* Allocate an N-byte block of memory from the heap.
+   If N is zero, allocate a 1-byte block.  */
+
 void *
 void *
-rpl_malloc(size_t size)
+rpl_malloc (size_t n)
 {
 {
-	if (!size)
-		size++;
-	return malloc(size);
+  if (n == 0)
+    n = 1;
+  return malloc (n);
 }
 }

-/* rpl_realloc.c -- a replacement for broken realloc implementations
-   Copyright (C) 2001 Free Software Foundation, Inc.
+/* realloc() function that is glibc compatible.
+   Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc.
 
 
    This program is free software; you can redistribute it and/or modify
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by
@@ -15,18 +15,32 @@
    along with this program; if not, write to the Free Software Foundation,
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
+/* written by Jim Meyering */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#undef realloc
+
 #include <stdlib.h>
 #include <stdlib.h>
 
 
+/* Change the size of an allocated block of memory P to N bytes,
+   with error checking.  If N is zero, change it to 1.  If P is NULL,
+   use malloc.  */
+
 void *
 void *
-rpl_realloc(void *ptr, size_t size)
+rpl_realloc (void *p, size_t n)
 {
 {
-  if (!ptr)
-    return malloc(size);
-  if (!size)
+  if (n == 0)
     {
     {
-      if (ptr)
-        free(ptr);
-      return malloc(size);
+      n = 1;
+
+      /* In theory realloc might fail, so don't rely on it to free.  */
+      free (p);
+      p = NULL;
     }
     }
-  return realloc(ptr, size);
+
+  if (p == NULL)
+    return malloc (n);
+  return realloc (p, n);
 }
 }