Fix readdir regressions on sparc 32-bit.

[platform/upstream/glibc.git] / shadow / sgetspent_r.c

diff --git a/shadow/sgetspent_r.c b/shadow/sgetspent_r.c
index 8678ac8..c0fef4d 100644 (file)
--- a/shadow/sgetspent_r.c
+++ b/shadow/sgetspent_r.c
@@ -1,22 +1,22 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2013 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
-   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, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <ctype.h>
+#include <errno.h>
 #include <shadow.h>
 #include <stdio.h>
 #include <string.h>
@@ -29,10 +29,10 @@
 struct spent_data {};
 
 /* Predicate which always returns false, needed below.  */
-#define FALSE(arg) 0
+#define FALSEP(arg) 0
 
 
-#include "../nss/nss_files/files-parse.c"
+#include <nss/nss_files/files-parse.c>
 LINE_PARSER
 (,
  STRING_FIELD (result->sp_namp, ISCOLON, 0);
@@ -51,12 +51,12 @@ LINE_PARSER
  else
    {
      STRING_FIELD (result->sp_pwdp, ISCOLON, 0);
-     INT_FIELD_MAYBE_NULL (result->sp_lstchg, ISCOLON, 0, 10, (long int),
+     INT_FIELD_MAYBE_NULL (result->sp_lstchg, ISCOLON, 0, 10, (long int) (int),
                           (long int) -1);
-     INT_FIELD_MAYBE_NULL (result->sp_min, ISCOLON, 0, 10, (long int),
+     INT_FIELD_MAYBE_NULL (result->sp_min, ISCOLON, 0, 10, (long int) (int),
+                          (long int) -1);
+     INT_FIELD_MAYBE_NULL (result->sp_max, ISCOLON, 0, 10, (long int) (int),
                           (long int) -1);
-     INT_FIELD_MAYBE_NULL (result->sp_max, ISCOLON, 0, 10, (long int),
-                          (long int -1);
      while (isspace (*line))
        ++line;
      if (*line == '\0')
@@ -69,14 +69,14 @@ LINE_PARSER
        }
      else
        {
-        INT_FIELD_MAYBE_NULL (result->sp_warn, ISCOLON, 0, 10, (long int),
-                              (long int) -1);
-        INT_FIELD_MAYBE_NULL (result->sp_inact, ISCOLON, 0, 10, (long int),
-                              (long int) -1);
-        INT_FIELD_MAYBE_NULL (result->sp_expire, ISCOLON, 0, 10, (long int),
-                              (long int) -1);
+        INT_FIELD_MAYBE_NULL (result->sp_warn, ISCOLON, 0, 10,
+                              (long int) (int), (long int) -1);
+        INT_FIELD_MAYBE_NULL (result->sp_inact, ISCOLON, 0, 10,
+                              (long int) (int), (long int) -1);
+        INT_FIELD_MAYBE_NULL (result->sp_expire, ISCOLON, 0, 10,
+                              (long int) (int), (long int) -1);
         if (*line != '\0')
-          INT_FIELD_MAYBE_NULL (result->sp_flag, FALSE, 0, 10,
+          INT_FIELD_MAYBE_NULL (result->sp_flag, FALSEP, 0, 10,
                                 (unsigned long int), ~0ul)
         else
           result->sp_flag = ~0ul;
@@ -90,8 +90,13 @@ 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;
+  buffer[buflen - 1] = '\0';
+  char *sp = strncpy (buffer, string, buflen);
+  if (buffer[buflen - 1] != '\0')
+    return ERANGE;
+
+  int parse_result = parse_line (sp, resbuf, NULL, 0, &errno);
+  *result = parse_result > 0 ? resbuf : NULL;
 
   return *result == NULL ? errno : 0;
 }