svn commit: branches/uClibc-nptl/libc/pwd_grp
sjhill at uclibc.org
sjhill at uclibc.org
Tue Aug 22 02:26:18 UTC 2006
Author: sjhill
Date: 2006-08-21 19:26:17 -0700 (Mon, 21 Aug 2006)
New Revision: 15902
Log:
Merge from trunk.
Modified:
branches/uClibc-nptl/libc/pwd_grp/Makefile.in
branches/uClibc-nptl/libc/pwd_grp/lckpwdf.c
branches/uClibc-nptl/libc/pwd_grp/pwd_grp.c
branches/uClibc-nptl/libc/pwd_grp/pwd_grp_internal.c
Changeset:
Modified: branches/uClibc-nptl/libc/pwd_grp/Makefile.in
===================================================================
--- branches/uClibc-nptl/libc/pwd_grp/Makefile.in 2006-08-22 02:20:04 UTC (rev 15901)
+++ branches/uClibc-nptl/libc/pwd_grp/Makefile.in 2006-08-22 02:26:17 UTC (rev 15902)
@@ -1,6 +1,5 @@
# Makefile for uClibc
#
-# Copyright (C) 2000 by Lineo, inc.
# Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
@@ -25,6 +24,8 @@
PWDGRP_OBJ := $(patsubst %.c,$(PWDGRP_OUT)/%.o,$(CSRC))
libc-y += $(PWDGRP_OBJ)
+libc-a-y += $(PWDGRP_OBJ)
+libc-so-y += $(PWDGRP_OBJ:.o=.os)
objclean-y += pwdgrp_objclean
Modified: branches/uClibc-nptl/libc/pwd_grp/lckpwdf.c
===================================================================
--- branches/uClibc-nptl/libc/pwd_grp/lckpwdf.c 2006-08-22 02:20:04 UTC (rev 15901)
+++ branches/uClibc-nptl/libc/pwd_grp/lckpwdf.c 2006-08-22 02:26:17 UTC (rev 15902)
@@ -1,23 +1,23 @@
/* vi: set sw=4 ts=4: */
/* Handle locking of password file.
- Copyright (C) 1996, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1996,98,2000,02 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper at cygnus.com>, 1996.
The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. 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 Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
#include <features.h>
#include <fcntl.h>
@@ -39,6 +39,15 @@
libc_hidden_proto(sigemptyset)
libc_hidden_proto(alarm)
+/* How long to wait for getting the lock before returning with an
+ error. */
+#define TIMEOUT 15 /* sec */
+
+
+/* File descriptor for lock file. */
+static int lock_fd = -1;
+
+/* Prevent problems in multithreaded program by using mutex. */
#ifdef __UCLIBC_HAS_THREADS__
# include <pthread.h>
static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER;
@@ -46,145 +55,148 @@
#define LOCK __pthread_mutex_lock(&mylock)
#define UNLOCK __pthread_mutex_unlock(&mylock)
-/* How long to wait for getting the lock before returning with an
- error. */
-#define TIMEOUT 15 /* sec */
-/* File descriptor for lock file. */
-static int lock_fd = -1;
-
/* Prototypes for local functions. */
static void noop_handler (int __sig);
-int lckpwdf (void)
+int
+lckpwdf (void)
{
- int flags;
- sigset_t saved_set; /* Saved set of caught signals. */
- struct sigaction saved_act; /* Saved signal action. */
- sigset_t new_set; /* New set of caught signals. */
- struct sigaction new_act; /* New signal action. */
- struct flock fl; /* Information struct for locking. */
- int result;
+ int flags;
+ sigset_t saved_set; /* Saved set of caught signals. */
+ struct sigaction saved_act; /* Saved signal action. */
+ sigset_t new_set; /* New set of caught signals. */
+ struct sigaction new_act; /* New signal action. */
+ struct flock fl; /* Information struct for locking. */
+ int result;
- if (lock_fd != -1)
- /* Still locked by own process. */
- return -1;
+ if (lock_fd != -1)
+ /* Still locked by own process. */
+ return -1;
- LOCK;
+ /* Prevent problems caused by multiple threads. */
+ LOCK;
- lock_fd = open (_PATH_PASSWD, O_WRONLY);
- if (lock_fd == -1) {
- /* Cannot create lock file. */
- UNLOCK;
- return -1;
- }
+ lock_fd = open (_PATH_PASSWD, O_WRONLY);
+ if (lock_fd == -1) {
+ /* Cannot create lock file. */
+ UNLOCK;
+ return -1;
+ }
- /* Make sure file gets correctly closed when process finished. */
- flags = fcntl (lock_fd, F_GETFD, 0);
- if (flags == -1) {
- /* Cannot get file flags. */
- close(lock_fd);
- lock_fd = -1;
- UNLOCK;
- return -1;
- }
- flags |= FD_CLOEXEC; /* Close on exit. */
- if (fcntl (lock_fd, F_SETFD, flags) < 0) {
- /* Cannot set new flags. */
- close(lock_fd);
- lock_fd = -1;
- UNLOCK;
- return -1;
- }
+ /* Make sure file gets correctly closed when process finished. */
+ flags = fcntl (lock_fd, F_GETFD, 0);
+ if (flags == -1) {
+ /* Cannot get file flags. */
+ close(lock_fd);
+ lock_fd = -1;
+ UNLOCK;
+ return -1;
+ }
+ flags |= FD_CLOEXEC; /* Close on exit. */
+ if (fcntl (lock_fd, F_SETFD, flags) < 0) {
+ /* Cannot set new flags. */
+ close(lock_fd);
+ lock_fd = -1;
+ UNLOCK;
+ return -1;
+ }
- /* Now we have to get exclusive write access. Since multiple
- process could try this we won't stop when it first fails.
- Instead we set a timeout for the system call. Once the timer
- expires it is likely that there are some problems which cannot be
- resolved by waiting.
+ /* Now we have to get exclusive write access. Since multiple
+ process could try this we won't stop when it first fails.
+ Instead we set a timeout for the system call. Once the timer
+ expires it is likely that there are some problems which cannot be
+ resolved by waiting.
- It is important that we don't change the signal state. We must
- restore the old signal behaviour. */
- memset (&new_act, '\0', sizeof (struct sigaction));
- new_act.sa_handler = noop_handler;
- sigfillset (&new_act.sa_mask);
- new_act.sa_flags = 0ul;
+ It is important that we don't change the signal state. We must
+ restore the old signal behaviour. */
+ memset (&new_act, '\0', sizeof (struct sigaction));
+ new_act.sa_handler = noop_handler;
+ sigfillset (&new_act.sa_mask);
+ new_act.sa_flags = 0ul;
- /* Install new action handler for alarm and save old. */
- if (sigaction (SIGALRM, &new_act, &saved_act) < 0) {
- /* Cannot install signal handler. */
- close(lock_fd);
- lock_fd = -1;
- UNLOCK;
- return -1;
- }
+ /* Install new action handler for alarm and save old. */
+ if (sigaction (SIGALRM, &new_act, &saved_act) < 0) {
+ /* Cannot install signal handler. */
+ close(lock_fd);
+ lock_fd = -1;
+ UNLOCK;
+ return -1;
+ }
- /* Now make sure the alarm signal is not blocked. */
- sigemptyset (&new_set);
- sigaddset (&new_set, SIGALRM);
- if (sigprocmask (SIG_UNBLOCK, &new_set, &saved_set) < 0) {
- sigaction (SIGALRM, &saved_act, NULL);
- close(lock_fd);
- lock_fd = -1;
- UNLOCK;
- return -1;
- }
+ /* Now make sure the alarm signal is not blocked. */
+ sigemptyset (&new_set);
+ sigaddset (&new_set, SIGALRM);
+ if (sigprocmask (SIG_UNBLOCK, &new_set, &saved_set) < 0) {
+ sigaction (SIGALRM, &saved_act, NULL);
+ close(lock_fd);
+ lock_fd = -1;
+ UNLOCK;
+ return -1;
+ }
- /* Start timer. If we cannot get the lock in the specified time we
- get a signal. */
- alarm (TIMEOUT);
+ /* Start timer. If we cannot get the lock in the specified time we
+ get a signal. */
+ alarm (TIMEOUT);
- /* Try to get the lock. */
- memset (&fl, '\0', sizeof (struct flock));
- fl.l_type = F_WRLCK;
- fl.l_whence = SEEK_SET;
- result = fcntl (lock_fd, F_SETLKW, &fl);
+ /* Try to get the lock. */
+ memset (&fl, '\0', sizeof (struct flock));
+ fl.l_type = F_WRLCK;
+ fl.l_whence = SEEK_SET;
+ result = fcntl (lock_fd, F_SETLKW, &fl);
- /* Clear alarm. */
- alarm (0);
+ /* Clear alarm. */
+ alarm (0);
- /* Restore old set of handled signals. We don't need to know
- about the current one.*/
- sigprocmask (SIG_SETMASK, &saved_set, NULL);
+ /* Restore old set of handled signals. We don't need to know
+ about the current one.*/
+ sigprocmask (SIG_SETMASK, &saved_set, NULL);
- /* Restore old action handler for alarm. We don't need to know
- about the current one. */
- sigaction (SIGALRM, &saved_act, NULL);
+ /* Restore old action handler for alarm. We don't need to know
+ about the current one. */
+ sigaction (SIGALRM, &saved_act, NULL);
- if (result < 0) {
- close(lock_fd);
- lock_fd = -1;
- UNLOCK;
- return -1;
- }
+ if (result < 0) {
+ close(lock_fd);
+ lock_fd = -1;
+ UNLOCK;
+ return -1;
+ }
- UNLOCK;
- return 0;
+ UNLOCK;
+ return 0;
}
-int ulckpwdf (void)
+int
+ulckpwdf (void)
{
- int result;
+ int result;
- if (lock_fd == -1) {
- /* There is no lock set. */
- result = -1;
- }
- else {
- LOCK;
- result = close (lock_fd);
- /* Mark descriptor as unused. */
- lock_fd = -1;
- UNLOCK;
- }
+ if (lock_fd == -1)
+ /* There is no lock set. */
+ result = -1;
+ else
+ {
+ /* Prevent problems caused by multiple threads. */
+ LOCK;
- return result;
+ result = close (lock_fd);
+
+ /* Mark descriptor as unused. */
+ lock_fd = -1;
+
+ /* Clear mutex. */
+ UNLOCK;
+ }
+
+ return result;
}
-static void noop_handler (attribute_unused int sig)
+static void
+noop_handler (int sig)
{
- /* We simply return which makes the `fcntl' call return with an error. */
+ /* We simply return which makes the `fcntl' call return with an error. */
}
Modified: branches/uClibc-nptl/libc/pwd_grp/pwd_grp.c
===================================================================
--- branches/uClibc-nptl/libc/pwd_grp/pwd_grp.c 2006-08-22 02:20:04 UTC (rev 15901)
+++ branches/uClibc-nptl/libc/pwd_grp/pwd_grp.c 2006-08-22 02:26:17 UTC (rev 15902)
@@ -13,7 +13,7 @@
* lenient. See the various glibc difference comments below.
*
* TODO:
- * Move to dynamic allocation of (currently staticly allocated)
+ * Move to dynamic allocation of (currently statically allocated)
* buffers; especially for the group-related functions since
* large group member lists will cause error returns.
*
@@ -42,7 +42,6 @@
libc_hidden_proto(strcmp)
libc_hidden_proto(strcpy)
libc_hidden_proto(strlen)
-libc_hidden_proto(setgroups)
libc_hidden_proto(strtoul)
libc_hidden_proto(rewind)
libc_hidden_proto(fgets_unlocked)
@@ -53,12 +52,12 @@
libc_hidden_proto(fprintf)
#ifdef __UCLIBC_HAS_XLOCALE__
libc_hidden_proto(__ctype_b_loc)
-#else
+#elif __UCLIBC_HAS_CTYPE_TABLES__
libc_hidden_proto(__ctype_b)
#endif
/**********************************************************************/
-/* Sizes for staticly allocated buffers. */
+/* Sizes for statically allocated buffers. */
/* If you change these values, also change _SC_GETPW_R_SIZE_MAX and
* _SC_GETGR_R_SIZE_MAX in libc/unistd/sysconf.c to match */
@@ -92,6 +91,7 @@
/**********************************************************************/
#ifdef L_fgetpwent_r
+#ifdef __USE_SVID
libc_hidden_proto(fgetpwent_r)
int fgetpwent_r(FILE *__restrict stream, struct passwd *__restrict resultbuf,
char *__restrict buffer, size_t buflen,
@@ -108,11 +108,13 @@
return rv;
}
libc_hidden_def(fgetpwent_r)
+#endif
#endif
/**********************************************************************/
#ifdef L_fgetgrent_r
+#ifdef __USE_SVID
libc_hidden_proto(fgetgrent_r)
int fgetgrent_r(FILE *__restrict stream, struct group *__restrict resultbuf,
char *__restrict buffer, size_t buflen,
@@ -129,6 +131,7 @@
return rv;
}
libc_hidden_def(fgetgrent_r)
+#endif
#endif
/**********************************************************************/
@@ -154,11 +157,12 @@
#endif
/**********************************************************************/
/* For the various fget??ent funcs, return NULL on failure and a
- * pointer to the appropriate struct (staticly allocated) on success.
+ * pointer to the appropriate struct (statically allocated) on success.
*/
/**********************************************************************/
#ifdef L_fgetpwent
+#ifdef __USE_SVID
libc_hidden_proto(fgetpwent_r)
struct passwd *fgetpwent(FILE *stream)
@@ -170,11 +174,13 @@
fgetpwent_r(stream, &resultbuf, buffer, sizeof(buffer), &result);
return result;
}
+#endif
#endif
/**********************************************************************/
#ifdef L_fgetgrent
+#ifdef __USE_SVID
libc_hidden_proto(fgetgrent_r)
struct group *fgetgrent(FILE *stream)
@@ -186,6 +192,7 @@
fgetgrent_r(stream, &resultbuf, buffer, sizeof(buffer), &result);
return result;
}
+#endif
#endif
/**********************************************************************/
@@ -694,6 +701,10 @@
/**********************************************************************/
#ifdef L_initgroups
+#ifdef __USE_BSD
+
+libc_hidden_proto(setgroups)
+
int initgroups(const char *user, gid_t gid)
{
FILE *grfile;
@@ -747,11 +758,13 @@
free(group_list);
return rv;
}
+#endif
#endif
/**********************************************************************/
#ifdef L_putpwent
+#ifdef __USE_SVID
int putpwent(const struct passwd *__restrict p, FILE *__restrict f)
{
int rv = -1;
@@ -772,6 +785,7 @@
return rv;
}
+#endif
#endif
/**********************************************************************/
Modified: branches/uClibc-nptl/libc/pwd_grp/pwd_grp_internal.c
===================================================================
--- branches/uClibc-nptl/libc/pwd_grp/pwd_grp_internal.c 2006-08-22 02:20:04 UTC (rev 15901)
+++ branches/uClibc-nptl/libc/pwd_grp/pwd_grp_internal.c 2006-08-22 02:26:17 UTC (rev 15902)
@@ -13,7 +13,7 @@
* lenient. See the various glibc difference comments below.
*
* TODO:
- * Move to dynamic allocation of (currently staticly allocated)
+ * Move to dynamic allocation of (currently statically allocated)
* buffers; especially for the group-related functions since
* large group member lists will cause error returns.
*
@@ -39,7 +39,7 @@
#endif
/**********************************************************************/
-/* Sizes for staticly allocated buffers. */
+/* Sizes for statically allocated buffers. */
/* If you change these values, also change _SC_GETPW_R_SIZE_MAX and
* _SC_GETGR_R_SIZE_MAX in libc/unistd/sysconf.c to match */
More information about the uClibc-cvs
mailing list