From 5d53a0f463c4297f2bce629ed696f3b93158f603 Mon Sep 17 00:00:00 2001 From: whydoubt Date: Mon, 25 Oct 2004 04:23:02 +0000 Subject: [PATCH] Remove obsolete file --- ChangeLog | 2 + src/sql/Makefile.am | 1 - src/sql/main.c | 112 -------------------------------------------- 3 files changed, 2 insertions(+), 113 deletions(-) delete mode 100644 src/sql/main.c diff --git a/ChangeLog b/ChangeLog index de3d7d9..88d4b7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ Sun Oct 24 23:07:16 CDT 2004 Jeff Smith * src/libmdb/Makefile.am: * src/util/Makefile.am: * src/util/mdb-sql.c: Readline usage fixes + * src/sql/Makefile.am: + * src/sql/main.c: Remove obsolete file Wed Oct 20 21:49:04 CDT 2004 Jeff Smith * src/sql/mdbsql.c: Get rid of GLib 2.4+ call diff --git a/src/sql/Makefile.am b/src/sql/Makefile.am index c36977c..4c10816 100644 --- a/src/sql/Makefile.am +++ b/src/sql/Makefile.am @@ -1,7 +1,6 @@ lib_LTLIBRARIES = libmdbsql.la libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l libmdbsql_la_LDFLAGS = -version-info 1:0:0 -EXTRA_DIST = main.c DISTCLEANFILES = parser.c parser.h lexer.c AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) LIBS = $(GLIB_LIBS) diff --git a/src/sql/main.c b/src/sql/main.c deleted file mode 100644 index fdf2aea..0000000 --- a/src/sql/main.c +++ /dev/null @@ -1,112 +0,0 @@ -#include -#ifdef HAVE_READLINE -#include -#endif -#include -#include "mdbsql.h" - -extern MdbSQL *g_sql; - -char *g_input_ptr; - -#ifndef HAVE_READLINE -char *readline(char *prompt) -{ -char *buf, line[1000]; -int i = 0; - - printf("%s",prompt); - fgets(line,1000,stdin); - for (i=strlen(line);i>0;i--) { - if (line[i]=='\n') { - line[i]='\0'; - break; - } - } - buf = (char *) malloc(strlen(line)+1); - strcpy(buf,line); - - return buf; -} -add_history(char *s) -{ -} -#endif - -int mdb_sql_yyinput(char *buf, int need) -{ -int cplen, have; - - have = strlen(g_input_ptr); - cplen = need > have ? have : need; - - if (cplen>0) { - memcpy(buf, g_input_ptr, cplen); - g_input_ptr += cplen; - } - return cplen; -} - -int parse(char *buf) -{ - g_input_ptr = buf; - if (yyparse()) { - fprintf(stderr, "Couldn't parse SQL\n"); - mdb_sql_reset(g_sql); - return 1; - } else { - return 0; - } -} - -main(int argc, char **argv) -{ -char *s; -char prompt[20]; -int line = 1; -char *mybuf; -int bufsz = 4096; -int done = 0; - - /* initialize the SQL engine */ - g_sql = mdb_sql_init(); - if (argc>1) { - mdb_sql_open(g_sql, argv[1]); - } - - /* give the buffer an initial size */ - bufsz = 4096; - mybuf = (char *) g_malloc(bufsz); - mybuf[0]='\0'; - - sprintf(prompt,"1 => "); - s=readline(prompt); - while (!done) { - if (!strcmp(s,"go")) { - line = 0; - parse(mybuf); - mybuf[0]='\0'; - } else if (!strcmp(s,"reset")) { - line = 0; - mybuf[0]='\0'; - } else { - while (strlen(mybuf) + strlen(s) > bufsz) { - bufsz *= 2; - mybuf = (char *) g_realloc(mybuf, bufsz); - } - add_history(s); - strcat(mybuf,s); - /* preserve line numbering for the parser */ - strcat(mybuf,"\n"); - } - sprintf(prompt,"%d => ",++line); - free(s); - s=readline(prompt); - if (!strcmp(s,"exit") || !strcmp(s,"quit") || !strcmp(s,"bye")) { - done = 1; - } - } - free(s); - g_free(mybuf); - mdb_sql_exit(g_sql); -}