Ensure we use gnulib mktime rather than glibc's mktime, on hosts

[gnulib.git] / lib / getline.c

diff --git a/lib/getline.c b/lib/getline.c
index e95aace..f4edecc 100644 (file)
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -1,71 +1,72 @@
 /* getline.c -- Replacement for GNU C library function getline
 
-Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1996, 1997, 1998, 2000, 2003 Free Software
+   Foundation, Inc.
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program 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
-General Public License for more details.
+   This program 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 General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; 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 General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
+#include "getline.h"
+
+/* The `getdelim' function is only declared if the following symbol
+   is defined.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
+#include <stddef.h>
 #include <stdio.h>
-#include <sys/types.h>
 
-#if defined __GNU_LIBRARY__ && defined HAVE_GETDELIM
+#if defined __GNU_LIBRARY__ && HAVE_GETDELIM
 
 int
-getline (lineptr, n, stream)
-     char **lineptr;
-     size_t *n;
-     FILE *stream;
+getline (char **lineptr, size_t *n, FILE *stream)
 {
   return getdelim (lineptr, n, '\n', stream);
 }
 
-
 #else /* ! have getdelim */
 
-#define NDEBUG
-#include <assert.h>
-
-#if STDC_HEADERS
-# include <stdlib.h>
-#else
+# if STDC_HEADERS
+#  include <stdlib.h>
+# else
 char *malloc (), *realloc ();
-#endif
+# endif
+
+#include "unlocked-io.h"
 
 /* Always add at least this many bytes when extending the buffer.  */
 #define MIN_CHUNK 64
 
-/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
-   + OFFSET (and null-terminate it). *LINEPTR is a pointer returned from
-   malloc (or NULL), pointing to *N characters of space.  It is realloc'd
-   as necessary.  Return the number of characters read (not including the
-   null terminator), or -1 on error or EOF.  */
+/* Read up to (and including) a delimiter DELIM1 from STREAM into *LINEPTR
+   + OFFSET (and NUL-terminate it).  If DELIM2 is non-zero, then read up
+   and including the first occurrence of DELIM1 or DELIM2.  *LINEPTR is
+   a pointer returned from malloc (or NULL), pointing to *N characters of
+   space.  It is realloc'd as necessary.  Return the number of characters
+   read (not including the NUL terminator), or -1 on error or EOF.  */
 
-int
-getstr (lineptr, n, stream, terminator, offset)
-     char **lineptr;
-     size_t *n;
-     FILE *stream;
-     char terminator;
-     size_t offset;
+static int
+getdelim2 (char **lineptr, size_t *n, FILE *stream, int delim1, int delim2,
+          size_t offset)
 {
-  int nchars_avail;            /* Allocated but unused chars in *LINEPTR.  */
+  size_t nchars_avail;         /* Allocated but unused chars in *LINEPTR.  */
   char *read_pos;              /* Where we're reading into *LINEPTR. */
   int ret;
 
@@ -80,6 +81,9 @@ getstr (lineptr, n, stream, terminator, offset)
        return -1;
     }
 
+  if (*n < offset)
+    return -1;
+
   nchars_avail = *n - offset;
   read_pos = *lineptr + offset;
 
@@ -91,7 +95,6 @@ getstr (lineptr, n, stream, terminator, offset)
         always (unless we get an error while reading the first char)
         NUL-terminate the line buffer.  */
 
-      assert(*n - nchars_avail == read_pos - *lineptr);
       if (nchars_avail < 2)
        {
          if (*n > MIN_CHUNK)
@@ -104,7 +107,6 @@ getstr (lineptr, n, stream, terminator, offset)
          if (!*lineptr)
            return -1;
          read_pos = *n - nchars_avail + *lineptr;
-         assert(*n - nchars_avail == read_pos - *lineptr);
        }
 
       if (c == EOF || ferror (stream))
@@ -119,7 +121,7 @@ getstr (lineptr, n, stream, terminator, offset)
       *read_pos++ = c;
       nchars_avail--;
 
-      if (c == terminator)
+      if (c == delim1 || (delim2 && c == delim2))
        /* Return the line.  */
        break;
     }
@@ -131,22 +133,16 @@ getstr (lineptr, n, stream, terminator, offset)
   return ret;
 }
 
+
 int
-getline (lineptr, n, stream)
-     char **lineptr;
-     size_t *n;
-     FILE *stream;
+getline (char **lineptr, size_t *n, FILE *stream)
 {
-  return getstr (lineptr, n, stream, '\n', 0);
+  return getdelim2 (lineptr, n, stream, '\n', 0, 0);
 }
 
 int
-getdelim (lineptr, n, delimiter, stream)
-     char **lineptr;
-     size_t *n;
-     int delimiter;
-     FILE *stream;
+getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream)
 {
-  return getstr (lineptr, n, stream, delimiter, 0);
+  return getdelim2 (lineptr, n, stream, delimiter, 0, 0);
 }
 #endif