aboutsummaryrefslogtreecommitdiff
path: root/shadow
diff options
context:
space:
mode:
Diffstat (limited to 'shadow')
-rw-r--r--shadow/fgetspent.c53
-rw-r--r--shadow/sgetspent.c58
-rw-r--r--shadow/sgetspent_r.c5
3 files changed, 96 insertions, 20 deletions
diff --git a/shadow/fgetspent.c b/shadow/fgetspent.c
index 6fe813b..bd54c7e 100644
--- a/shadow/fgetspent.c
+++ b/shadow/fgetspent.c
@@ -16,18 +16,63 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <errno.h>
+#include <libc-lock.h>
#include <shadow.h>
-#include <stdio.h>
+#include <stdlib.h>
+/* A reasonable size for a buffer to start with. */
+#define BUFLEN_SPWD 1024
+
+/* We need to protect the dynamic buffer handling. */
+__libc_lock_define_initialized (static, lock);
+
/* Read one shadow entry from the given stream. */
struct spwd *
fgetspent (FILE *stream)
{
- static char buffer[BUFSIZ];
+ static char *buffer;
+ static size_t buffer_size;
static struct spwd resbuf;
struct spwd *result;
+ int save;
+
+ /* Get lock. */
+ __libc_lock_lock (lock);
+
+ /* Allocate buffer if not yet available. */
+ if (buffer == NULL)
+ {
+ buffer_size = BUFLEN_SPWD;
+ buffer = malloc (buffer_size);
+ }
+
+ while (buffer != NULL
+ && __fgetspent_r (stream, &resbuf, buffer, buffer_size, &result) != 0
+ && errno == ERANGE)
+ {
+ char *new_buf;
+ buffer_size += BUFLEN_SPWD;
+ new_buf = realloc (buffer, buffer_size);
+ if (new_buf == NULL)
+ {
+ /* We are out of memory. Free the current buffer so that the
+ process gets a chance for a normal termination. */
+ save = errno;
+ free (buffer);
+ __set_errno (save);
+ }
+ buffer = new_buf;
+ }
+
+ if (buffer == NULL)
+ result = NULL;
+
+ /* Release lock. Preserve error value. */
+ save = errno;
+ __libc_lock_unlock (lock);
+ __set_errno (save);
- return __fgetspent_r (stream, &resbuf, buffer, sizeof buffer, &result)
- ? NULL : result;
+ return result;
}
diff --git a/shadow/sgetspent.c b/shadow/sgetspent.c
index 05d997c..ecfe01e 100644
--- a/shadow/sgetspent.c
+++ b/shadow/sgetspent.c
@@ -16,33 +16,63 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <errno.h>
+#include <libc-lock.h>
#include <shadow.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
+/* A reasonable size for a buffer to start with. */
+#define BUFLEN_SPWD 1024
+
+/* We need to protect the dynamic buffer handling. */
+__libc_lock_define_initialized (static, lock);
/* Read one shadow entry from the given stream. */
struct spwd *
sgetspent (const char *string)
{
+ static char *buffer;
+ static size_t buffer_size;
static struct spwd resbuf;
- static int max_size = 0;
- static char *buffer = NULL;
struct spwd *result;
- int len;
+ int save;
+
+ /* Get lock. */
+ __libc_lock_lock (lock);
- len = strlen (string) + 1;
- if (len > max_size)
+ /* Allocate buffer if not yet available. */
+ if (buffer == NULL)
{
- max_size = MAX (128, len + 32);
- buffer = realloc (buffer, max_size);
- if (buffer == NULL)
- return NULL;
+ buffer_size = BUFLEN_SPWD;
+ buffer = malloc (buffer_size);
}
- return __sgetspent_r (string, &resbuf, buffer, max_size, &result)
- ? NULL : result;
+ while (buffer != NULL
+ && __sgetspent_r (string, &resbuf, buffer, buffer_size, &result) != 0
+ && errno == ERANGE)
+ {
+ char *new_buf;
+ buffer_size += BUFLEN_SPWD;
+ new_buf = realloc (buffer, buffer_size);
+ if (new_buf == NULL)
+ {
+ /* We are out of memory. Free the current buffer so that the
+ process gets a chance for a normal termination. */
+ save = errno;
+ free (buffer);
+ __set_errno (save);
+ }
+ buffer = new_buf;
+ }
+
+ if (buffer == NULL)
+ result = NULL;
+
+ /* Release lock. Preserve error value. */
+ save = errno;
+ __libc_lock_unlock (lock);
+ __set_errno (save);
+
+ return result;
}
diff --git a/shadow/sgetspent_r.c b/shadow/sgetspent_r.c
index fb7d015..8aa5a9b 100644
--- a/shadow/sgetspent_r.c
+++ b/shadow/sgetspent_r.c
@@ -90,8 +90,9 @@ int
__sgetspent_r (const char *string, struct spwd *resbuf, char *buffer,
size_t buflen, struct spwd **result)
{
- *result = parse_line (strncpy (buffer, string, buflen), resbuf, NULL, 0)
- ? resbuf : NULL;
+ int parse_result = parse_line (strncpy (buffer, string, buflen),
+ resbuf, NULL, 0);
+ *result = parse_result > 0 ? resbuf : NULL;
return *result == NULL ? errno : 0;
}