Lock stream while generating the output.

Avoid writting (none) in the passwd file.

diff --git a/shadow/putspent.c b/shadow/putspent.c
index 0e8649b..a952a22 100644 (file)
--- a/shadow/putspent.c
+++ b/shadow/putspent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1996, 1997, 1998 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
@@ -19,6 +19,13 @@
 #include <stdio.h>
 #include <shadow.h>
 
+#ifdef USE_IN_LIBIO
+# define flockfile(s) _IO_flockfile (s)
+# define funlockfile(s) _IO_funlockfile (s)
+#endif
+
+#define _S(x)  x ? x : ""
+
 
 /* Write an entry to the given stream.
    This must know the format of the password file.  */
@@ -27,51 +34,55 @@ putspent (const struct spwd *p, FILE *stream)
 {
   int errors = 0;
 
-  if (fprintf (stream, "%s:%s:", p->sp_namp, p->sp_pwdp) < 0)
+  flockfile (stream);
+
+  if (fprintf (stream, "%s:%s:", p->sp_namp, _S (p->sp_pwdp)) < 0)
     ++errors;
 
   if ((p->sp_lstchg != (long int) -1
        && fprintf (stream, "%ld:", p->sp_lstchg) < 0)
       || (p->sp_lstchg == (long int) -1
-         && putc (':', stream) == EOF))
+         && putc_unlocked (':', stream) == EOF))
     ++errors;
 
   if ((p->sp_min != (long int) -1
        && fprintf (stream, "%ld:", p->sp_min) < 0)
       || (p->sp_min == (long int) -1
-         && putc (':', stream) == EOF))
+         && putc_unlocked (':', stream) == EOF))
     ++errors;
 
   if ((p->sp_max != (long int) -1
        && fprintf (stream, "%ld:", p->sp_max) < 0)
       || (p->sp_max == (long int) -1
-         && putc (':', stream) == EOF))
+         && putc_unlocked (':', stream) == EOF))
     ++errors;
 
   if ((p->sp_warn != (long int) -1
        && fprintf (stream, "%ld:", p->sp_warn) < 0)
       || (p->sp_warn == (long int) -1
-         && putc (':', stream) == EOF))
+         && putc_unlocked (':', stream) == EOF))
     ++errors;
 
   if ((p->sp_inact != (long int) -1
        && fprintf (stream, "%ld:", p->sp_inact) < 0)
       || (p->sp_inact == (long int) -1
-         && putc (':', stream) == EOF))
+         && putc_unlocked (':', stream) == EOF))
     ++errors;
 
   if ((p->sp_expire != (long int) -1
        && fprintf (stream, "%ld:", p->sp_expire) < 0)
       || (p->sp_expire == (long int) -1
-         && putc (':', stream) == EOF))
+         && putc_unlocked (':', stream) == EOF))
     ++errors;
 
   if (p->sp_flag != ~0ul
       && fprintf (stream, "%ld", p->sp_flag) < 0)
     ++errors;
 
-  if (putc ('\n', stream) == EOF)
+  if (putc_unlocked ('\n', stream) == EOF)
     ++errors;
 
+  funlockfile (stream);
+
   return errors ? -1 : 0;
 }