build problem with 0.002

src/include/mdbtools.h

@@ -77,6 +77,15 @@ typedef struct {
 	GArray		*columns;
 } MdbCatalogEntry;
 
+typedef struct {
+	char	name[MDB_MAX_OBJ_NAME+1];
+	int	num_cols;
+	int	num_rows;
+	int	num_pgs;
+	int	first_data_pg;
+	GArray	*columns;
+} MdbTableDef;
+
 typedef struct {
 	char		name[MDB_MAX_OBJ_NAME+1];
 } MdbColumnProp;
@@ -90,6 +99,7 @@ typedef struct {
 extern MdbHandle *mdb_alloc_handle();
 extern void mdb_free_handle(MdbHandle *mdb);
 extern void mdb_free_catalog(MdbHandle *mdb);
+extern MdbTableDef *mdb_alloc_tabledef(MdbCatalogEntry *entry);
 
 extern size_t mdb_read_pg(MdbHandle *mdb, unsigned long pg);
 extern int    mdb_get_int16(MdbHandle *mdb, int offset);

src/libmdb/catalog.c

@@ -42,7 +42,7 @@ static char *type_name[] = {"Form",
 	}
 }
 
-MdbCatalogEntry *mdb_catalog_entry(MdbHandle *mdb, int rowid, MdbCatalogEntry *entry)
+MdbCatalogEntry *mdb_read_catalog_entry(MdbHandle *mdb, int rowid, MdbCatalogEntry *entry)
 {
 int offset;
 int rows;
@@ -118,7 +118,7 @@ int next_pg, next_pg_off;
 				fprintf(stdout,"YES! next pg = %04x %d\n",next_pg, next_pg); 
 				continue;
 			}
-			if (mdb_catalog_entry(mdb, i, &entry)) {
+			if (mdb_read_catalog_entry(mdb, i, &entry)) {
 				data = g_memdup(&entry,sizeof(MdbCatalogEntry));
 				mdb->catalog = g_list_append(mdb->catalog, data);
 			}
@@ -134,7 +134,7 @@ int next_pg, next_pg_off;
 			rows = mdb_catalog_rows(mdb);
 			for (i=0;i<rows;i++) {
 				if (mdb->pg_buf[11 + 2 * i] & 0x40) continue;
-				if (mdb_catalog_entry(mdb, i, &entry)) {
+				if (mdb_read_catalog_entry(mdb, i, &entry)) {
 					data = g_memdup(&entry,sizeof(MdbCatalogEntry));
 					mdb->catalog = g_list_append(mdb->catalog, data);
 				}

src/libmdb/mem.c

@@ -46,3 +46,17 @@ MdbCatalogEntry *entryp;
 		g_free(entryp);
 	}
 }
+MdbTableDef *mdb_alloc_tabledef(MdbCatalogEntry *entry)
+{
+MdbTableDef *table;
+
+	table = (MdbTableDef *) malloc(sizeof(MdbTableDef));
+	memset(table, '\0', sizeof(MdbTableDef));
+	strcpy(table->name, entry->object_name);
+
+	return table;	
+}
+void mdb_free_tabledef(MdbTableDef *table)
+{
+	if (table) free(table);
+}

src/libmdb/table.c

@@ -58,39 +58,53 @@ unsigned char mdb_col_needs_size(int col_type)
 	}
 }
 
-/*
-**   
-*/
+MdbTableDef *mdb_read_table(MdbCatalogEntry *entry)
+{
+MdbTableDef *table;
+MdbHandle *mdb = entry->mdb;
+int len, i;
+
+	table = mdb_alloc_tabledef(entry);
+
+	mdb_read_pg(mdb, entry->table_pg);
+	len = mdb_get_int16(mdb,8);
+
+	table->num_rows = mdb_get_int32(mdb,12);
+	table->num_cols = mdb_get_int16(mdb,25);
+	table->num_pgs = mdb_get_int32(mdb,27);
+	table->first_data_pg = mdb_get_int16(mdb,36);
+
+	return table;
+}
+
+MdbColumn *mdb_read_column(MdbTableDef *table)
+{
+}
 
 void mdb_table_dump(MdbCatalogEntry *entry)
 {
-int num_cols, num_rows, data_pgs, first_dpg;
 int len, i;
 int cur_col, cur_name;
 int col_type, col_size;
 int col_start, name_start;
 char name[MDB_MAX_OBJ_NAME+1];
 int name_sz;
+MdbTableDef *table;
 MdbHandle *mdb = entry->mdb;
 
-	mdb_read_pg(mdb, entry->table_pg);
-	len = mdb_get_int16(mdb,8);
-	num_rows = mdb_get_int32(mdb,12);
-	num_cols = mdb_get_int16(mdb,25);
-	data_pgs = mdb_get_int32(mdb,27);
-	first_dpg = mdb_get_int16(mdb,36);
-	fprintf(stdout,"number of datarows  = %d\n",num_rows);
-	fprintf(stdout,"number of columns   = %d\n",num_cols);
-	fprintf(stdout,"number of datapages = %d\n",data_pgs);
-	fprintf(stdout,"first data page     = %d\n",first_dpg);
+	table = mdb_read_table(entry);
+	fprintf(stdout,"number of datarows  = %d\n",table->num_rows);
+	fprintf(stdout,"number of columns   = %d\n",table->num_cols);
+	fprintf(stdout,"number of datapages = %d\n",table->num_pgs);
+	fprintf(stdout,"first data page     = %d\n",table->first_data_pg);
 
-	col_start = 43 + (data_pgs * 8);
-	name_start = col_start + (num_cols * 18);
+	col_start = 43 + (table->num_pgs * 8);
+	name_start = col_start + (table->num_cols * 18);
 
 	cur_col = col_start;
 	cur_name = name_start;
 
-	for (i=0;i<num_cols;i++) {
+	for (i=0;i<table->num_cols;i++) {
 		col_type = mdb->pg_buf[cur_col];
 		col_size = mdb_get_int16(mdb,cur_col+16);
 		
@@ -106,4 +120,3 @@ MdbHandle *mdb = entry->mdb;
 		cur_name += name_sz + 1;
 	}
 }
-

src/util/prcat.c

@@ -1,20 +1,19 @@
 /* MDB Tools - A library for reading MS Access database file
  * Copyright (C) 2000 Brian Bruns
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "mdbtools.h"

src/util/prtable.c

@@ -1,7 +1,8 @@
 /* MDB Tools - A library for reading MS Access database file
  * Copyright (C) 2000 Brian Bruns
  *
- * This library is free software; you can redistribute it and/or
+ *
+ * This library is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ -25,7 +26,8 @@ int rows;
 int i;
 unsigned char buf[2048];
 MdbHandle *mdb;
-MdbCatalogEntry entry;
+MdbCatalogEntry *entry;
+GList *l;
 
 
 	if (argc<2) {
@@ -35,14 +37,12 @@ MdbCatalogEntry entry;
 	
 	mdb = mdb_open(argv[1]);
 
-	mdb_read_pg(mdb, MDB_CATALOG_PG);
-	rows = mdb_catalog_rows(mdb);
+	mdb_read_catalog(mdb, MDB_TABLE);
 
-	for (i=0;i<rows;i++) {
-  		if (mdb_catalog_entry(mdb, i, &entry)) {
-			if (!strcmp(entry.object_name,argv[2])) {
-				mdb_table_dump(&entry);
-  			}
+	for (l=g_list_first(mdb->catalog);l;l=g_list_next(l)) {
+		entry = l->data;
+		if (!strcmp(entry->object_name,argv[2])) {
+				mdb_table_dump(entry);
 		}
 	}