From f6cfb61578920a2aba19afbf320e007efd863730 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 8 Aug 2002 07:28:33 +0000
Subject: Fix locking  -Erik

---
 libc/pwd_grp/spent.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'libc/pwd_grp/spent.c')

diff --git a/libc/pwd_grp/spent.c b/libc/pwd_grp/spent.c
index c1305b15e..d1b8ca07c 100644
--- a/libc/pwd_grp/spent.c
+++ b/libc/pwd_grp/spent.c
@@ -17,12 +17,23 @@
  *
  */
 
+#include <features.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 #include "config.h"
 
+#ifdef __UCLIBC_HAS_THREADS__
+#include <pthread.h>
+static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER;
+# define LOCK   pthread_mutex_lock(&mylock)
+# define UNLOCK pthread_mutex_unlock(&mylock);
+#else       
+# define LOCK
+# define UNLOCK
+#endif      
+
 /*
  * setspent(), endspent(), and getspent() are included in the same object
  * file, since one cannot be used without the other two, so it makes sense to
@@ -34,25 +45,31 @@ static int spwd_fd = -1;
 
 void setspent(void)
 {
+    LOCK;
     if (spwd_fd != -1)
 	close(spwd_fd);
-
     spwd_fd = open(_PATH_SHADOW, O_RDONLY);
+    UNLOCK;
 }
 
 void endspent(void)
 {
+    LOCK;
     if (spwd_fd != -1)
 	close(spwd_fd);
     spwd_fd = -1;
+    UNLOCK;
 }
 
 int getspent_r (struct spwd *spwd, char *buff, 
 	size_t buflen, struct spwd **crap)
 {
+    LOCK;
     if (spwd_fd != -1 && __getspent_r(spwd, buff, buflen, spwd_fd) != -1) {
+	UNLOCK;
 	return 0;
     }
+    UNLOCK;
     return -1;
 }
 
@@ -61,9 +78,12 @@ struct spwd *getspent(void)
     static char line_buff[PWD_BUFFER_SIZE];
     static struct spwd spwd;
 
+    LOCK;
     if (getspent_r(&spwd, line_buff, sizeof(line_buff), NULL) != -1) {
+	UNLOCK;
 	return &spwd;
     }
+    UNLOCK;
     return NULL;
 }
 
-- 
cgit v1.2.3