lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-11-26 10:29:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

clean up for kkd / mdb-props, from Nirgal Vourgère

Browse Source
This commit is contained in:
Brian Bruns
2011-02-07 22:06:48 -05:00
parent 5c7e4216fa
commit 3adb7d6bab
4 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libmdb/kkd.c
View File

@@ -109,11 +109,13 @@ MdbHandle *mdb = entry->mdb;
int rowid = entry->kkd_rowid; int rowid = entry->kkd_rowid;
fprintf(stdout, "kkd_pg=%d kkd_rowid=%d\n", entry->kkd_pg, rowid);
mdb_read_pg(mdb, entry->kkd_pg); mdb_read_pg(mdb, entry->kkd_pg);
rows = mdb_get_int16(mdb->pg_buf, 8); rows = mdb_get_int16(mdb->pg_buf, 8);
fprintf(stdout,"number of rows = %d\n",rows); fprintf(stdout,"number of rows = %d\n",rows);
kkd_start = mdb_get_int16(mdb->pg_buf, 10+rowid*2); kkd_start = mdb_get_int16(mdb->pg_buf, 10+rowid*2);
fprintf(stdout,"kkd start = %d %04x\n",kkd_start,kkd_start); fprintf(stdout,"kkd start = %d 0x%04x\n",kkd_start,kkd_start);
kkd_end = mdb->fmt->pg_size; kkd_end = mdb->fmt->pg_size;
for (i=0;i<rows;i++) { for (i=0;i<rows;i++) {
tmp = mdb_get_int16(mdb->pg_buf, 10+i*2); tmp = mdb_get_int16(mdb->pg_buf, 10+i*2);
@@ -123,7 +125,7 @@ int rowid = entry->kkd_rowid;
kkd_end = tmp; kkd_end = tmp;
} }
} }
fprintf(stdout,"kkd end = %d %04x\n",kkd_end,kkd_end); fprintf(stdout,"kkd end = %d 0x%04x\n",kkd_end,kkd_end);
pos = kkd_start + 4; /* 4 = K K D \0 */ pos = kkd_start + 4; /* 4 = K K D \0 */
while (pos < kkd_end) { while (pos < kkd_end) {
tmp = mdb_pg_get_int16(mdb,pos); tmp = mdb_pg_get_int16(mdb,pos);

10
src/libmdb/props.c
View File

@@ -30,14 +30,14 @@ mdb_read_props_list(gchar *kkd, int len)
int i = 0; int i = 0;
names = g_ptr_array_new(); names = g_ptr_array_new();
#ifdef MDB_DEBUG #if MDB_DEBUG
buffer_dump(kkd, 0, len); buffer_dump(kkd, 0, len);
#endif #endif
pos = 0; pos = 0;
while (pos < len) { while (pos < len) {
record_len = mdb_get_int16(kkd, pos); record_len = mdb_get_int16(kkd, pos);
pos += 2; pos += 2;
#ifdef MDB_DEBUG #if MDB_DEBUG
printf("%02d ",i++); printf("%02d ",i++);
buffer_dump(kkd, pos - 2, record_len + 2); buffer_dump(kkd, pos - 2, record_len + 2);
#endif #endif
@@ -46,7 +46,7 @@ mdb_read_props_list(gchar *kkd, int len)
name[record_len] = '\0'; name[record_len] = '\0';
pos += record_len; pos += record_len;
g_ptr_array_add(names, name); g_ptr_array_add(names, name);
#ifdef MDB_DEBUG #if MDB_DEBUG
printf("new len = %d\n", names->len); printf("new len = %d\n", names->len);
#endif #endif
} }
@@ -79,7 +79,7 @@ mdb_read_props(MdbHandle *mdb, GPtrArray *names, gchar *kkd, int len)
MdbProperties *props; MdbProperties *props;
int i = 0; int i = 0;
#ifdef MDB_DEBUG #if MDB_DEBUG
buffer_dump(kkd, 0, len); buffer_dump(kkd, 0, len);
#endif #endif
pos = 0; pos = 0;
@@ -108,7 +108,7 @@ mdb_read_props(MdbHandle *mdb, GPtrArray *names, gchar *kkd, int len)
strncpy(value, &kkd[pos + 8], dsize); strncpy(value, &kkd[pos + 8], dsize);
value[dsize] = '\0'; value[dsize] = '\0';
name = g_ptr_array_index(names,elem); name = g_ptr_array_index(names,elem);
#ifdef MDB_DEBUG #if MDB_DEBUG
printf("%02d ",i++); printf("%02d ",i++);
buffer_dump(kkd, pos, record_len); buffer_dump(kkd, pos, record_len);
printf("elem %d dsize %d dtype %d\n", elem, dsize, dtype); printf("elem %d dsize %d dtype %d\n", elem, dsize, dtype);

20
src/util/mdb-prop.c
View File

@@ -20,9 +20,6 @@
#include "mdbtools.h" #include "mdbtools.h"
#undef MDB_DEBUG
//#define MDB_DEBUG 1
void dump_kkd(MdbHandle *mdb, void *kkd, size_t len); void dump_kkd(MdbHandle *mdb, void *kkd, size_t len);
int int
@@ -31,15 +28,20 @@ main(int argc, char **argv)
MdbHandle *mdb; MdbHandle *mdb;
MdbTableDef *table; MdbTableDef *table;
gchar name[256]; gchar name[256];
gchar *propColName;
void *buf; void *buf;
int col_num; int col_num;
int found = 0; int found = 0;
if (argc < 4) { if (argc < 3) {
fprintf(stderr,"Usage: %s <file> <object name> <prop col>\n", fprintf(stderr,"Usage: %s <file> <object name> [<prop col>]\n",
argv[0]); argv[0]);
return 1; return 1;
} }
if (argc < 4)
propColName = "LvProp";
else
propColName = argv[3];
mdb_init(); mdb_init();
@@ -60,12 +62,13 @@ main(int argc, char **argv)
mdb_bind_column_by_name(table, "Name", name, NULL); mdb_bind_column_by_name(table, "Name", name, NULL);
buf = g_malloc(MDB_BIND_SIZE); buf = g_malloc(MDB_BIND_SIZE);
col_num = mdb_bind_column_by_name(table, argv[3], buf, NULL); col_num = mdb_bind_column_by_name(table, propColName, buf, NULL);
if (col_num < 1) { if (col_num < 1) {
g_free(buf); g_free(buf);
mdb_free_tabledef(table); mdb_free_tabledef(table);
mdb_close(mdb); mdb_close(mdb);
mdb_exit(); mdb_exit();
printf("Column %s not found!\n", argv[3]);
return 1; return 1;
} }
@@ -81,7 +84,6 @@ main(int argc, char **argv)
gchar kkd_ptr[MDB_MEMO_OVERHEAD]; gchar kkd_ptr[MDB_MEMO_OVERHEAD];
void *kkd_pg = g_malloc(200000); void *kkd_pg = g_malloc(200000);
size_t len, pos; size_t len, pos;
memcpy(kkd_ptr, buf, MDB_MEMO_OVERHEAD); memcpy(kkd_ptr, buf, MDB_MEMO_OVERHEAD);
col = g_ptr_array_index(table->columns, col_num - 1); col = g_ptr_array_index(table->columns, col_num - 1);
len = mdb_ole_read(mdb, col, kkd_ptr, MDB_BIND_SIZE); len = mdb_ole_read(mdb, col, kkd_ptr, MDB_BIND_SIZE);
@@ -114,7 +116,7 @@ void dump_kkd(MdbHandle *mdb, void *kkd, size_t len)
GPtrArray *names = NULL; GPtrArray *names = NULL;
MdbProperties *props; MdbProperties *props;
#ifdef MDB_DEBUG #if MDB_DEBUG
buffer_dump(kkd, 0, len); buffer_dump(kkd, 0, len);
#endif #endif
if (strcmp("KKD", kkd)) { if (strcmp("KKD", kkd)) {
@@ -140,6 +142,7 @@ void dump_kkd(MdbHandle *mdb, void *kkd, size_t len)
props = mdb_read_props(mdb, names, kkd+pos+6, record_len - 6); props = mdb_read_props(mdb, names, kkd+pos+6, record_len - 6);
printf("type 0x00 name %s\n", props->name ? props->name : "(none)"); printf("type 0x00 name %s\n", props->name ? props->name : "(none)");
g_hash_table_foreach(props->hash, print_keyvalue, NULL); g_hash_table_foreach(props->hash, print_keyvalue, NULL);
putchar('\n');
mdb_free_props(props); mdb_free_props(props);
break; break;
case 0x01: case 0x01:
@@ -150,6 +153,7 @@ void dump_kkd(MdbHandle *mdb, void *kkd, size_t len)
props = mdb_read_props(mdb, names, kkd+pos+6, record_len - 6); props = mdb_read_props(mdb, names, kkd+pos+6, record_len - 6);
printf("type 0x01 name %s\n", props->name ? props->name : "(none)"); printf("type 0x01 name %s\n", props->name ? props->name : "(none)");
g_hash_table_foreach(props->hash, print_keyvalue, NULL); g_hash_table_foreach(props->hash, print_keyvalue, NULL);
putchar('\n');
mdb_free_props(props); mdb_free_props(props);
break; break;
default: default:

23
src/util/prkkd.c
View File

@@ -23,10 +23,10 @@ main(int argc, char **argv)
{ {
#if 0 #if 0
int i; MdbHandle *mdb;
MdbCatalogEntry entry; MdbTableDef *table;
if (argc<2) { if (argc<3) {
fprintf(stderr,"Usage: %s <file> <table>\n",argv[0]); fprintf(stderr,"Usage: %s <file> <table>\n",argv[0]);
exit(1); exit(1);
} }
@@ -34,21 +34,16 @@ main(int argc, char **argv)
mdb_init(); mdb_init();
mdb = mdb_open(argv[1], MDB_NOFLAGS); mdb = mdb_open(argv[1], MDB_NOFLAGS);
mdb_read_pg(mdb, MDB_CATALOG_PG); table = mdb_read_table_by_name(mdb, argv[2], MDB_TABLE);
rows = mdb_catalog_rows(mdb); if (!table) {
fprintf(stderr,"No table named %s found.\n", argv[2]);
for (i=0;i<rows;i++) { exit(1);
if (mdb_read_catalog_entry(mdb, i, &entry)) {
if (!strcmp(entry.object_name,argv[2])) {
mdb_kkd_dump(&entry);
}
}
} }
/* FIXME: table->entry->*kkd* are not initialized */
mdb_kkd_dump(table->entry);
mdb_close(mdb); mdb_close(mdb);
mdb_exit(); mdb_exit();
#endif #endif
exit(0); exit(0);
} }