mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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...
This commit is contained in:
Marc G. Fournier 1997-01-25 23:54:08 +00:00
parent aa46d53fa4
commit 917042f1c6
4 changed files with 19 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/psql/Makefile
View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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 endif
endif endif
OBJS= psql.o stringutils.o
else
OBJS= psql.o stringutils.o rlstubs.o
endif endif
OBJS= psql.o stringutils.o
ifeq ($(PORTNAME), ultrix4) ifeq ($(PORTNAME), ultrix4)
OBJS+= ../../utils/strdup.o OBJS+= ../../utils/strdup.o
endif endif

19
src/bin/psql/psql.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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 * char *
gets_readline(char *prompt, FILE * source) 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); fputc('\r', stdout);
fflush(stdout); fflush(stdout);
return s; return s;
@ -1158,8 +1165,10 @@ HandleSlashCmds(PsqlSettings * settings,
case 's': /* \s is save history to a file */ case 's': /* \s is save history to a file */
if (!optarg) if (!optarg)
optarg = "/dev/tty"; optarg = "/dev/tty";
#ifdef HAVE_HISTORY
if (write_history(optarg) != 0) if (write_history(optarg) != 0)
fprintf(stderr, "cannot write history to %s\n", optarg); fprintf(stderr, "cannot write history to %s\n", optarg);
#endif
break; break;
case 'm': /* monitor like type-setting */ case 'm': /* monitor like type-setting */
if (toggle(settings, &settings->opt.standard, "standard SQL separaters and padding")) { if (toggle(settings, &settings->opt.standard, "standard SQL separaters and padding")) {
@ -1254,7 +1263,9 @@ MainLoop(PsqlSettings * settings, FILE * source)
else else
sprintf(settings->prompt, "%s%s", PQdb(settings->db), PROMPT); sprintf(settings->prompt, "%s%s", PQdb(settings->db), PROMPT);
if (settings->useReadline) { if (settings->useReadline) {
#ifdef HAVE_HISTORY
using_history(); using_history();
#endif
GetNextLine = gets_readline; GetNextLine = gets_readline;
} else } else
GetNextLine = gets_noreadline; GetNextLine = gets_noreadline;
@ -1282,8 +1293,10 @@ MainLoop(PsqlSettings * settings, FILE * source)
settings->prompt[strlen(settings->prompt)-3] = '='; settings->prompt[strlen(settings->prompt)-3] = '=';
} }
line = GetNextLine(settings->prompt, source); line = GetNextLine(settings->prompt, source);
#ifdef HAVE_HISTORY
if (interactive && settings->useReadline && line != NULL) if (interactive && settings->useReadline && line != NULL)
add_history(line); /* save non-empty lines in history */ add_history(line); /* save non-empty lines in history */
#endif
} }
query_start = line; query_start = line;
@ -1448,7 +1461,7 @@ main(int argc, char **argv)
settings.opt.pager = 1; settings.opt.pager = 1;
if (!isatty(0) || !isatty(1)) if (!isatty(0) || !isatty(1))
settings.quiet = settings.notty = 1; settings.quiet = settings.notty = 1;
#ifndef NOREADLINE #ifdef HAVE_LIBREADLINE
else else
settings.useReadline = 1; settings.useReadline = 1;
#endif #endif

43
src/bin/psql/rlstubs.c
View File

@ -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;
}

17
src/bin/psql/rlstubs.h
View File

@ -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);