From 6278781655261a5011376b2fa2600996e32ca889 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 6 Apr 2001 20:28:45 +0000
Subject: Fix include/errno.h to not use kernel header, and instead use
 bits/errno.h. This required we use _LIBC instead of __LIBC__ to be consistent
 with glibc. This had some sideffects in sys/syscalls.h.  While fixing things,
 I made everything use __set_errno() for (eventual) thread support.  -Erik

---
 libc/pwd_grp/fgetgrent.c | 2 +-
 libc/pwd_grp/fgetpwent.c | 2 +-
 libc/pwd_grp/getgrnam.c  | 2 +-
 libc/pwd_grp/getpw.c     | 4 ++--
 libc/pwd_grp/getpwnam.c  | 2 +-
 libc/pwd_grp/putpwent.c  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libc/pwd_grp')

diff --git a/libc/pwd_grp/fgetgrent.c b/libc/pwd_grp/fgetgrent.c
index 09701a38b..50aa01722 100644
--- a/libc/pwd_grp/fgetgrent.c
+++ b/libc/pwd_grp/fgetgrent.c
@@ -25,7 +25,7 @@
 struct group *fgetgrent(FILE * file)
 {
 	if (file == NULL) {
-		errno = EINTR;
+		__set_errno(EINTR);
 		return NULL;
 	}
 
diff --git a/libc/pwd_grp/fgetpwent.c b/libc/pwd_grp/fgetpwent.c
index 74c59427c..aab1ec744 100644
--- a/libc/pwd_grp/fgetpwent.c
+++ b/libc/pwd_grp/fgetpwent.c
@@ -32,7 +32,7 @@ int fgetpwent_r (FILE *file, struct passwd *password,
 	char *buff, size_t buflen, struct passwd **crap)
 {
 	if (file == NULL) {
-		errno = EINTR;
+		__set_errno(EINTR);
 		return -1;
 	}
 	return(__getpwent_r(password, buff, buflen, fileno(file)));
diff --git a/libc/pwd_grp/getgrnam.c b/libc/pwd_grp/getgrnam.c
index 999404284..6f2634cee 100644
--- a/libc/pwd_grp/getgrnam.c
+++ b/libc/pwd_grp/getgrnam.c
@@ -30,7 +30,7 @@ struct group *getgrnam(const char *name)
 	struct group *group;
 
 	if (name == NULL) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return NULL;
 	}
 
diff --git a/libc/pwd_grp/getpw.c b/libc/pwd_grp/getpw.c
index f0663c917..83f6fe973 100644
--- a/libc/pwd_grp/getpw.c
+++ b/libc/pwd_grp/getpw.c
@@ -28,7 +28,7 @@ int getpw(uid_t uid, char *buf)
 	struct passwd *passwd;
 
 	if (buf == NULL) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return -1;
 	}
 	if ((passwd = getpwuid(uid)) == NULL)
@@ -38,7 +38,7 @@ int getpw(uid_t uid, char *buf)
 		(buf, "%s:%s:%u:%u:%s:%s:%s", passwd->pw_name, passwd->pw_passwd,
 		 passwd->pw_gid, passwd->pw_uid, passwd->pw_gecos, passwd->pw_dir,
 		 passwd->pw_shell) < 0) {
-		errno = ENOBUFS;
+		__set_errno(ENOBUFS);
 		return -1;
 	}
 
diff --git a/libc/pwd_grp/getpwnam.c b/libc/pwd_grp/getpwnam.c
index 399e24ddc..5cb4f64f8 100644
--- a/libc/pwd_grp/getpwnam.c
+++ b/libc/pwd_grp/getpwnam.c
@@ -38,7 +38,7 @@ int getpwnam_r (const char *name, struct passwd *password,
 	int passwd_fd;
 
 	if (name == NULL) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return -1;
 	}
 
diff --git a/libc/pwd_grp/putpwent.c b/libc/pwd_grp/putpwent.c
index da8e13d67..014cefa86 100644
--- a/libc/pwd_grp/putpwent.c
+++ b/libc/pwd_grp/putpwent.c
@@ -25,7 +25,7 @@
 int putpwent(const struct passwd *passwd, FILE * f)
 {
 	if (passwd == NULL || f == NULL) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return -1;
 	}
 	if (fprintf
-- 
cgit v1.2.3