Remove rlstubs.[ch], since they weren't actually doing anything that couldn't

be #ifdef'd into psql.c itself

From what I can tell, if USE_READLINE is true or false, psql works under
FreeBSD, without configure.  Now to test it *again* under sparc_solaris
with configure and see if it works...

diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index c0fc92ed5b05304fd0fd6ecfa7427c7be1903dac..c10b63925b635ae65e6d6869d60d2aacd8297571 100644 (file)
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.18 1997/01/25 22:51:26 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.19 1997/01/25 23:53:59 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -50,11 +50,10 @@ ifeq ($(USE_READLINE), true)
        endif
      endif
    endif
-   OBJS= psql.o stringutils.o  
-else
-   OBJS= psql.o stringutils.o  rlstubs.o
 endif
 
+OBJS= psql.o stringutils.o  
+
 ifeq ($(PORTNAME), ultrix4)
 OBJS+= ../../utils/strdup.o
 endif

diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 0c6e19e65be6bdb395abbcd7591d8b5ef4f83dd9..19a549c33a3f04ff81f017819408fd2553214ca3 100644 (file)
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.53 1997/01/25 22:51:56 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.54 1997/01/25 23:54:02 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -404,7 +404,14 @@ gets_noreadline(char *prompt, FILE * source)
 char           *
 gets_readline(char *prompt, FILE * source)
 {
-    char *s = readline(prompt);
+    char *s;
+#ifdef HAVE_LIBREADLINE
+    s = readline(prompt);
+#else
+    char buf[500];
+    printf("%s", prompt);
+    s = fgets(buf, 500, stdin);
+#endif
     fputc('\r', stdout);
     fflush(stdout);
     return s;
@@ -1158,8 +1165,10 @@ HandleSlashCmds(PsqlSettings * settings,
     case 's':                  /* \s is save history to a file */
        if (!optarg)
            optarg = "/dev/tty";
+#ifdef HAVE_HISTORY
        if (write_history(optarg) != 0)
            fprintf(stderr, "cannot write history to %s\n", optarg);
+#endif
        break;
     case 'm':                  /* monitor like type-setting */
        if (toggle(settings, &settings->opt.standard, "standard SQL separaters and padding")) {
@@ -1254,7 +1263,9 @@ MainLoop(PsqlSettings * settings, FILE * source)
        else
            sprintf(settings->prompt, "%s%s", PQdb(settings->db), PROMPT);
        if (settings->useReadline) {
+#ifdef HAVE_HISTORY
            using_history();
+#endif
            GetNextLine = gets_readline;
        } else
            GetNextLine = gets_noreadline;
@@ -1282,8 +1293,10 @@ MainLoop(PsqlSettings * settings, FILE * source)
                    settings->prompt[strlen(settings->prompt)-3] = '=';
            }
            line = GetNextLine(settings->prompt, source);
+#ifdef HAVE_HISTORY
            if (interactive && settings->useReadline && line != NULL)
                add_history(line);      /* save non-empty lines in history */
+#endif
        }
 
        query_start = line;
@@ -1448,7 +1461,7 @@ main(int argc, char **argv)
     settings.opt.pager = 1;
     if (!isatty(0) || !isatty(1))
        settings.quiet = settings.notty = 1;
-#ifndef NOREADLINE
+#ifdef HAVE_LIBREADLINE
     else
        settings.useReadline = 1;
 #endif

diff --git a/src/bin/psql/rlstubs.c b/src/bin/psql/rlstubs.c
deleted file mode 100644 (file)
index 64c11db..0000000
--- a/src/bin/psql/rlstubs.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * rlstubs.c--
- *    stub routines when compiled without readline and history libraries
- *
- * Copyright (c) 1994-5, Regents of the University of California
- *
- *
- * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/rlstubs.c,v 1.6 1997/01/25 22:52:08 scrappy Exp $
- *
- *-------------------------------------------------------------------------
- */
-#include <stdio.h>
-
-#include "rlstubs.h"
-
-char *
-readline(const char *prompt)
-{
-    static char buf[500];
-
-    printf("%s", prompt);
-    return fgets(buf, 500, stdin);
-}
-
-int
-write_history(const char *dum)
-{
-    return 0;
-}
-
-int
-using_history(void)
-{
-    return 0;
-}
-
-int
-add_history(const char *dum)
-{
-    return 0;
-}

diff --git a/src/bin/psql/rlstubs.h b/src/bin/psql/rlstubs.h
deleted file mode 100644 (file)
index 49f7ef7..0000000
--- a/src/bin/psql/rlstubs.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * rlstubs.h
- *    stub routines when compiled without readline and history libraries
- *
- * Copyright (c) 1994-5, Regents of the University of California
- *
- *
- * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/rlstubs.h,v 1.2 1996/11/11 14:55:49 scrappy Exp $
- *
- *-------------------------------------------------------------------------
- */
-extern char *readline(const char *prompt);
-extern int write_history(const char *dum);
-extern int using_history(void);
-extern int add_history(const char *dum);