mirror of
https://github.com/mdbtools/mdbtools.git
synced 2026-03-10 00:20:54 +08:00
Patches from Brent Johnson for double, off page memo, and big endian support
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
# Generated automatically from Makefile.in by configure.
|
||||
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
||||
top_srcdir = ..
|
||||
@@ -14,11 +13,12 @@ mandir = $(exec_prefix)/man/man1
|
||||
|
||||
CC = gcc
|
||||
CPPFLAGS =
|
||||
CFLAGS = $(CPPFLAG) -g -O2
|
||||
CFLAGS = $(CPPFLAG) -g -O2 -DHW_LITTLE_ENDIAN
|
||||
LDFLAGS =
|
||||
LIBS =
|
||||
INSTALL= @INSTALL@
|
||||
INC = -I ../include `glib-config --cflags`
|
||||
MDBLIB = ../libmdb/libmdb.a
|
||||
LIBS = -L ../libmdb -lmdb `glib-config --libs`
|
||||
PROGS = prcat prkkd prtable prdata prdump mdb-schema mdb-export mdb-tables mdb-header mdb-parsecsv mdb-array
|
||||
PRCATOBJS = prcat.o
|
||||
@@ -35,44 +35,44 @@ ARROBJS = mdb-array.o
|
||||
|
||||
all: $(PROGS)
|
||||
|
||||
prcat: $(PRCATOBJS)
|
||||
prcat: $(PRCATOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(PRCATOBJS) $(LIBS)
|
||||
|
||||
prkkd: $(PRKKDOBJS)
|
||||
prkkd: $(PRKKDOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(PRKKDOBJS) $(LIBS)
|
||||
|
||||
prtable: $(PRTABLEOBJS)
|
||||
prtable: $(PRTABLEOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(PRTABLEOBJS) $(LIBS)
|
||||
|
||||
prdata: $(PRDATAOBJS)
|
||||
prdata: $(PRDATAOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(PRDATAOBJS) $(LIBS)
|
||||
|
||||
prdump: $(PRDUMPOBJS)
|
||||
prdump: $(PRDUMPOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(PRDUMPOBJS) $(LIBS)
|
||||
|
||||
mdb-schema: $(SCHEMAOBJS)
|
||||
mdb-schema: $(SCHEMAOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(SCHEMAOBJS) $(LIBS)
|
||||
|
||||
mdb-export: $(EXPORTOBJS)
|
||||
mdb-export: $(EXPORTOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(EXPORTOBJS) $(LIBS)
|
||||
|
||||
mdb-tables: $(TABLEOBJS)
|
||||
mdb-tables: $(TABLEOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(TABLEOBJS) $(LIBS)
|
||||
|
||||
mdb-header: $(HEADEROBJS)
|
||||
mdb-header: $(HEADEROBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(HEADEROBJS) $(LIBS)
|
||||
|
||||
mdb-parsecsv: $(CSVOBJS)
|
||||
mdb-parsecsv: $(CSVOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(CSVOBJS) $(LIBS)
|
||||
|
||||
mdb-array: $(ARROBJS)
|
||||
mdb-array: $(ARROBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(ARROBJS) $(LIBS)
|
||||
|
||||
clean:
|
||||
rm -f core *.o $(PROGS)
|
||||
|
||||
.c.o:
|
||||
$(CC) -g -c $< $(INC)
|
||||
$(CC) $(CFLAGS) -g -c $< $(INC)
|
||||
|
||||
install:
|
||||
@for prog in $(PROGS); do \
|
||||
@@ -85,3 +85,16 @@ uninstall:
|
||||
echo " removing $$prog from $(bindir)"; \
|
||||
rm -f $(bindir)/$$prog; \
|
||||
done
|
||||
|
||||
header.o: header.c ../include/mdbtools.h
|
||||
mdb-array.o: mdb-array.c ../include/mdbtools.h
|
||||
mdb-export.o: mdb-export.c ../include/mdbtools.h
|
||||
parsecsv.o: parsecsv.c ../include/mdbtools.h
|
||||
prcat.o: prcat.c ../include/mdbtools.h
|
||||
prdata.o: prdata.c ../include/mdbtools.h
|
||||
prdump.o: prdump.c ../include/mdbtools.h
|
||||
prkkd.o: prkkd.c ../include/mdbtools.h
|
||||
prtable.o: prtable.c ../include/mdbtools.h
|
||||
schema.o: schema.c ../include/mdbtools.h
|
||||
tables.o: tables.c ../include/mdbtools.h
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
|
||||
@@ -19,6 +18,7 @@ LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
INSTALL= @INSTALL@
|
||||
INC = -I ../include `glib-config --cflags`
|
||||
MDBLIB = ../libmdb/libmdb.a
|
||||
LIBS = -L ../libmdb -lmdb `glib-config --libs`
|
||||
PROGS = prcat prkkd prtable prdata prdump mdb-schema mdb-export mdb-tables mdb-header mdb-parsecsv mdb-array
|
||||
PRCATOBJS = prcat.o
|
||||
@@ -35,44 +35,44 @@ ARROBJS = mdb-array.o
|
||||
|
||||
all: $(PROGS)
|
||||
|
||||
prcat: $(PRCATOBJS)
|
||||
prcat: $(PRCATOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(PRCATOBJS) $(LIBS)
|
||||
|
||||
prkkd: $(PRKKDOBJS)
|
||||
prkkd: $(PRKKDOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(PRKKDOBJS) $(LIBS)
|
||||
|
||||
prtable: $(PRTABLEOBJS)
|
||||
prtable: $(PRTABLEOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(PRTABLEOBJS) $(LIBS)
|
||||
|
||||
prdata: $(PRDATAOBJS)
|
||||
prdata: $(PRDATAOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(PRDATAOBJS) $(LIBS)
|
||||
|
||||
prdump: $(PRDUMPOBJS)
|
||||
prdump: $(PRDUMPOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(PRDUMPOBJS) $(LIBS)
|
||||
|
||||
mdb-schema: $(SCHEMAOBJS)
|
||||
mdb-schema: $(SCHEMAOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(SCHEMAOBJS) $(LIBS)
|
||||
|
||||
mdb-export: $(EXPORTOBJS)
|
||||
mdb-export: $(EXPORTOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(EXPORTOBJS) $(LIBS)
|
||||
|
||||
mdb-tables: $(TABLEOBJS)
|
||||
mdb-tables: $(TABLEOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(TABLEOBJS) $(LIBS)
|
||||
|
||||
mdb-header: $(HEADEROBJS)
|
||||
mdb-header: $(HEADEROBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(HEADEROBJS) $(LIBS)
|
||||
|
||||
mdb-parsecsv: $(CSVOBJS)
|
||||
mdb-parsecsv: $(CSVOBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(CSVOBJS) $(LIBS)
|
||||
|
||||
mdb-array: $(ARROBJS)
|
||||
mdb-array: $(ARROBJS) $(MDBLIB)
|
||||
$(CC) -g -o $@ $(ARROBJS) $(LIBS)
|
||||
|
||||
clean:
|
||||
rm -f core *.o $(PROGS)
|
||||
|
||||
.c.o:
|
||||
$(CC) -g -c $< $(INC)
|
||||
$(CC) $(CFLAGS) -g -c $< $(INC)
|
||||
|
||||
install:
|
||||
@for prog in $(PROGS); do \
|
||||
@@ -85,3 +85,16 @@ uninstall:
|
||||
echo " removing $$prog from $(bindir)"; \
|
||||
rm -f $(bindir)/$$prog; \
|
||||
done
|
||||
|
||||
header.o: header.c ../include/mdbtools.h
|
||||
mdb-array.o: mdb-array.c ../include/mdbtools.h
|
||||
mdb-export.o: mdb-export.c ../include/mdbtools.h
|
||||
parsecsv.o: parsecsv.c ../include/mdbtools.h
|
||||
prcat.o: prcat.c ../include/mdbtools.h
|
||||
prdata.o: prdata.c ../include/mdbtools.h
|
||||
prdump.o: prdump.c ../include/mdbtools.h
|
||||
prkkd.o: prkkd.c ../include/mdbtools.h
|
||||
prtable.o: prtable.c ../include/mdbtools.h
|
||||
schema.o: schema.c ../include/mdbtools.h
|
||||
tables.o: tables.c ../include/mdbtools.h
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@ main (int argc, char **argv)
|
||||
{
|
||||
int rows;
|
||||
int i, j;
|
||||
unsigned char buf [2048];
|
||||
MdbHandle *mdb;
|
||||
MdbCatalogEntry entry;
|
||||
MdbTableDef *table;
|
||||
@@ -62,7 +61,7 @@ int started;
|
||||
|
||||
for (j = 0; j < table->num_cols; j++)
|
||||
{
|
||||
bound_values [j] = (char *) malloc (256);
|
||||
bound_values [j] = (char *) malloc (MDB_BIND_SIZE);
|
||||
bound_values [j] [0] = '\0';
|
||||
mdb_bind_column (table, j + 1, bound_values [j]);
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ char quote_text = 1;
|
||||
mdb_rewind_table(table);
|
||||
|
||||
for (j=0;j<table->num_cols;j++) {
|
||||
bound_values[j] = (char *) malloc(256);
|
||||
bound_values[j] = (char *) malloc(MDB_BIND_SIZE);
|
||||
bound_values[j][0] = '\0';
|
||||
mdb_bind_column(table, j+1, bound_values[j]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user