lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-04-05 20:31:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Readline usage fixes

Browse Source
This commit is contained in:
whydoubt 2004-10-25 04:11:13 +00:00
parent 062259b408
commit fd04c906c8
6 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sun Oct 24 23:07:16 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* configure.in:
* src/gmdb2/Makefile.am:
* src/libmdb/Makefile.am:
* src/util/Makefile.am:
* src/util/mdb-sql.c: Readline usage fixes
Wed Oct 20 21:49:04 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/sql/mdbsql.c: Get rid of GLib 2.4+ call

2
configure.in
View File

@ -168,8 +168,6 @@ dnl Checks for library functions.
OLDLDFLAGS=$LDFLAGS
VL_LIB_READLINE
READLINE_LIBS=$vl_cv_lib_readline
AC_SUBST(READLINE_LIBS)
LDFLAGS=$OLDLDFLAGS

2
src/gmdb2/Makefile.am
View File

@ -2,7 +2,7 @@ SUBDIRS = help gladefiles pixmaps
bin_PROGRAMS = gmdb2
include_HEADERS = gmdb.h
gmdb2_SOURCES = main2.c file.c util.c table.c query.c module.c macro.c report.c form.c info.c table_def.c table_data.c table_export.c debug.c sql.c schema.c prefs.c
LIBS = -rdynamic $(GNOME_LIBS) @LEXLIB@
LIBS = -rdynamic $(GNOME_LIBS) @LIBS@ @LEXLIB@
AM_CPPFLAGS = -I$(top_srcdir)/include \
$(GNOME_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \

2
src/libmdb/Makefile.am
View File

@ -2,4 +2,4 @@ lib_LTLIBRARIES = libmdb.la
libmdb_la_SOURCES= catalog.c mem.c file.c kkd.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c props.c worktable.c options.c iconv.c
libmdb_la_LDFLAGS = -version-info 1:0:0
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
LIBS = $(GLIB_LIBS) -lm
LIBS = $(GLIB_LIBS) @LIBS@ -lm

2
src/util/Makefile.am
View File

@ -1,5 +1,5 @@
bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver mdb-prop mdb-import prtable prcat prdata prkkd prdump prole updrow prindex
LIBS = $(GLIB_LIBS) $(READLINE_LIBS) @LEXLIB@
LIBS = $(GLIB_LIBS) @LIBS@ @LEXLIB@
DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
LDADD = ../libmdb/libmdb.la

33
src/util/mdb-sql.c
View File

@ -25,12 +25,11 @@
# include <readline/readline.h>
# elif defined(HAVE_READLINE_H)
# include <readline.h>
# else /* !defined(HAVE_READLINE_H) */
# else
/* no readline.h */
extern char *readline ();
# endif /* !defined(HAVE_READLINE_H) */
# endif
char *cmdline = NULL;
#else /* !defined(HAVE_READLINE_READLINE_H) */
/* no readline */
#endif /* HAVE_LIBREADLINE */
#ifdef HAVE_READLINE_HISTORY
@ -38,12 +37,12 @@ char *cmdline = NULL;
# include <readline/history.h>
# elif defined(HAVE_HISTORY_H)
# include <history.h>
# else /* !defined(HAVE_HISTORY_H) */
# else
/* no history.h */
extern void add_history ();
extern int write_history ();
extern int read_history ();
# endif /* defined(HAVE_READLINE_HISTORY_H) */
/* no history */
# endif
#endif /* HAVE_READLINE_HISTORY */
#include <string.h>
@ -66,7 +65,9 @@ char *delimiter;
int showplan = 0;
int noexec = 0;
#ifdef HAVE_READLINE_HISTORY
#define HISTFILE ".mdbhistory"
#endif
#ifndef HAVE_LIBREADLINE
char *readline(char *prompt)
@ -89,16 +90,6 @@ int i = 0;
return buf;
}
void add_history(char *s)
{
}
void read_history(char *s)
{
}
void write_history(char *s)
{
}
#endif
int parse(MdbSQL *sql, char *buf)
@ -190,8 +181,10 @@ read_file(char *s, int line, unsigned int *bufsz, char *mybuf)
mybuf = (char *) realloc(mybuf, *bufsz);
}
strcat(mybuf, buf);
#ifdef HAVE_READLINE_HISTORY
/* don't record blank lines */
if (strlen(buf)) add_history(buf);
#endif
strcat(mybuf, "\n");
lines++;
printf("%d => %s",line+lines, buf);
@ -375,11 +368,13 @@ char *home = getenv("HOME");
char *histpath;
#ifdef HAVE_READLINE_HISTORY
if (home) {
histpath = (char *) g_strconcat(home, "/", HISTFILE, NULL);
read_history(histpath);
g_free(histpath);
}
#endif
if (!isatty(fileno(stdin))) {
in = stdin;
}
@ -462,8 +457,10 @@ char *histpath;
bufsz *= 2;
mybuf = (char *) g_realloc(mybuf, bufsz);
}
#ifdef HAVE_READLINE_HISTORY
/* don't record blank lines */
if (strlen(s)) add_history(s);
#endif
strcat(mybuf,s);
/* preserve line numbering for the parser */
strcat(mybuf,"\n");
@ -494,11 +491,13 @@ char *histpath;
g_free(mybuf);
if (s) free(s);
#ifdef HAVE_READLINE_HISTORY
if (home) {
histpath = (char *) g_strconcat(home, "/", HISTFILE, NULL);
write_history(histpath);
g_free(histpath);
}
#endif
myexit(0);