Finish renaming getstr -> getdelim2 and readline -> readlinebuffer,

to avoid collisions with libcurses and libreadline.

diff --git a/ChangeLog b/ChangeLog
index 40a94a8..dad9ffc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-12  Paul Eggert  <eggert@twinsun.com>
+
+       Finish renaming getstr -> getdelim2 and readline -> readlinebuffer,
+       to avoid collisions with libcurses and libreadline.
+       * getstr: Remove.
+       * MODULES.html.sh: Remove getstr.
+       * modules/getline: Depend on unlocked-io, not getstr.
+
 2003-01-10  Bruno Haible  <bruno@clisp.org>
 
        * modules/alloca: Change Makefile.am requirements. Simplify Include

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 0531550..581842c 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,20 @@
+2003-01-12  Paul Eggert  <eggert@twinsun.com>
+
+       Finish renaming getstr -> getdelim2 and readline -> readlinebuffer,
+       to avoid collisions with libcurses and libreadline.
+
+       * Makefile.am (libfetish_a_SOURCES): Remove getstr.c, getstr.h.
+       * getstr.h, getstr.c: Remove.
+       * getline.c: Include "getline.h", to check interface.
+       Move body of old getstr.c here: this defines MIN_CHUNK and
+       declares getdelim2, which is renamed from getstr.
+       (getline, getdelim): Adjust to renaming of getstr -> getdelim2.
+
+       * linebuffer.c (readlinebuffer): Renamed from readline.
+       All uses changed.
+       * linebuffer.h: Likewise.
+       (readline): Remove backward-compatibility macro.
+
 2003-01-12  Jim Meyering  <jim@meyering.net>
 
        * makepath.c: Don't test HAVE_ERRNO_H.  It's not necessary.

diff --git a/lib/getstr.c b/lib/getstr.c
deleted file mode 100644 (file)
index 6e748a4..0000000
--- a/lib/getstr.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* getstr.c -- core function for GNU C library getline replacement function
-
-   Copyright (C) 1993, 1996-2001 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 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. */
-
-/* Written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-
-#if STDC_HEADERS
-# include <stdlib.h>
-#else
-char *malloc (), *realloc ();
-#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 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 (char **lineptr, size_t *n, FILE *stream, int delim1, int delim2,
-       size_t offset)
-{
-  size_t nchars_avail;         /* Allocated but unused chars in *LINEPTR.  */
-  char *read_pos;              /* Where we're reading into *LINEPTR. */
-  int ret;
-
-  if (!lineptr || !n || !stream)
-    return -1;
-
-  if (!*lineptr)
-    {
-      *n = MIN_CHUNK;
-      *lineptr = malloc (*n);
-      if (!*lineptr)
-       return -1;
-    }
-
-  if (*n < offset)
-    return -1;
-
-  nchars_avail = *n - offset;
-  read_pos = *lineptr + offset;
-
-  for (;;)
-    {
-      register int c = getc (stream);
-
-      /* We always want at least one char left in the buffer, since we
-        always (unless we get an error while reading the first char)
-        NUL-terminate the line buffer.  */
-
-      if (nchars_avail < 2)
-       {
-         if (*n > MIN_CHUNK)
-           *n *= 2;
-         else
-           *n += MIN_CHUNK;
-
-         nchars_avail = *n + *lineptr - read_pos;
-         *lineptr = realloc (*lineptr, *n);
-         if (!*lineptr)
-           return -1;
-         read_pos = *n - nchars_avail + *lineptr;
-       }
-
-      if (c == EOF || ferror (stream))
-       {
-         /* Return partial line, if any.  */
-         if (read_pos == *lineptr)
-           return -1;
-         else
-           break;
-       }
-
-      *read_pos++ = c;
-      nchars_avail--;
-
-      if (c == delim1 || (delim2 && c == delim2))
-       /* Return the line.  */
-       break;
-    }
-
-  /* Done - NUL terminate and return the number of chars read.  */
-  *read_pos = '\0';
-
-  ret = read_pos - (*lineptr + offset);
-  return ret;
-}

diff --git a/lib/getstr.h b/lib/getstr.h
deleted file mode 100644 (file)
index 48276d5..0000000
--- a/lib/getstr.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef GETSTR_H_
-# define GETSTR_H_ 1
-
-# include <stdio.h>
-
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-/* Avoid collision with getstr() from libcurses.  */
-#define getstr getdelim2
-
-int
-getstr PARAMS ((char **lineptr, size_t *n, FILE *stream,
-               int delim1, int delim2,
-               size_t offset));
-
-#endif

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 168512b..927ab9d 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-12  Paul Eggert  <eggert@twinsun.com>
+
+       Finish renaming getstr -> getdelim2 and readline -> readlinebuffer,
+       to avoid collisions with libcurses and libreadline.
+
+       * getstr.m4: Remove.
+       * getline.m4 (gl_PREREQ_GETLINE): Require AC_HEADER_STDC.
+
 2003-01-10  Bruno Haible  <bruno@clisp.org>
 
        * alloca.m4 (gl_FUNC_ALLOCA): Also define ALLOCA_H.

diff --git a/m4/getstr.m4 b/m4/getstr.m4
deleted file mode 100644 (file)
index e5f04c2..0000000
--- a/m4/getstr.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-# getstr.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-AC_DEFUN([gl_GETSTR],
-[
-  dnl Prerequisites of lib/getstr.c.
-  AC_REQUIRE([AC_HEADER_STDC])
-])

diff --git a/modules/getstr b/modules/getstr
deleted file mode 100644 (file)
index 5e3bcc7..0000000
--- a/modules/getstr
+++ /dev/null
@@ -1,19 +0,0 @@
-Description:
-
-Files:
-lib/getstr.h
-lib/getstr.c
-m4/getstr.m4
-
-Depends-on:
-unlocked-io
-
-configure.ac:
-gl_GETSTR
-
-Makefile.am:
-lib_SOURCES += getstr.h getstr.c
-
-Include:
-"getstr.h"
-