lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-06-28 15:39:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert memo fields (Artur Frysiak, me)

Browse Source
This commit is contained in:
whydoubt 2005-02-10 06:30:55 +00:00
parent 12bd73f38e
commit 93979e0881
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
Wed Feb 9 23:37:43 CST 2005 Jeff Smith <whydoubt@yahoo.com> Wed Feb 9 23:37:43 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/data.c: Date calculation bugfix (David Mansfield) * src/libmdb/data.c: Date calculation bugfix (David Mansfield)
* src/libmdb/data.c: Deleted rows bugfix (David Mansfield) * src/libmdb/data.c: Deleted rows bugfix (David Mansfield)
* src/libmdb/data.c: Convert memo fields (Artur Frysiak, me)
Thu Feb 3 21:12:55 CST 2005 Jeff Smith <whydoubt@yahoo.com> Thu Feb 3 21:12:55 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* HACKING: Small documentation fix * HACKING: Small documentation fix

17
src/libmdb/data.c
View File

@ -617,9 +617,8 @@ static char *mdb_memo_to_string(MdbHandle *mdb, int start, int size)
if (memo_flags & 0x8000) { if (memo_flags & 0x8000) {
/* inline memo field */ /* inline memo field */
strncpy(text, &mdb->pg_buf[start + MDB_MEMO_OVERHEAD], mdb_unicode2ascii(mdb, &mdb->pg_buf[start + MDB_MEMO_OVERHEAD],
size - MDB_MEMO_OVERHEAD); size - MDB_MEMO_OVERHEAD, text, MDB_BIND_SIZE);
text[size - MDB_MEMO_OVERHEAD]='\0';
return text; return text;
} else if (memo_flags & 0x4000) { } else if (memo_flags & 0x4000) {
pg_row = mdb_get_int32(mdb->pg_buf, start+4); pg_row = mdb_get_int32(mdb->pg_buf, start+4);
@ -637,11 +636,13 @@ static char *mdb_memo_to_string(MdbHandle *mdb, int start, int size)
mdb_unicode2ascii(mdb, buf + row_start, len, text, MDB_BIND_SIZE); mdb_unicode2ascii(mdb, buf + row_start, len, text, MDB_BIND_SIZE);
return text; return text;
} else { /* if (memo_flags == 0x0000) { */ } else { /* if (memo_flags == 0x0000) { */
char *tmp;
pg_row = mdb_get_int32(mdb->pg_buf, start+4); pg_row = mdb_get_int32(mdb->pg_buf, start+4);
#if MDB_DEBUG #if MDB_DEBUG
printf("Reading LVAL page %06x\n", pg_row >> 8); printf("Reading LVAL page %06x\n", pg_row >> 8);
#endif #endif
text[0]='\0'; tmp = (char *) g_malloc(MDB_BIND_SIZE);
tmp[0] = '\0';
do { do {
if (mdb_find_pg_row(mdb,pg_row,&buf,&row_start,&len)) { if (mdb_find_pg_row(mdb,pg_row,&buf,&row_start,&len)) {
return ""; return "";
@ -650,13 +651,15 @@ static char *mdb_memo_to_string(MdbHandle *mdb, int start, int size)
printf("row num %d start %d len %d\n", printf("row num %d start %d len %d\n",
pg_row & 0xff, row_start, len); pg_row & 0xff, row_start, len);
#endif #endif
strncat(text, buf + row_start + 4, strncat(tmp, buf + row_start + 4,
strlen(text) + len - 4 > MDB_BIND_SIZE ? strlen(tmp) + len - 4 > MDB_BIND_SIZE ?
MDB_BIND_SIZE - strlen(text) : len - 4); MDB_BIND_SIZE - strlen(tmp) : len - 4);
/* find next lval page */ /* find next lval page */
pg_row = mdb_get_int32(mdb->pg_buf, row_start); pg_row = mdb_get_int32(mdb->pg_buf, row_start);
} while ((pg_row >> 8)); } while ((pg_row >> 8));
mdb_unicode2ascii(mdb, tmp, strlen(tmp), text, MDB_BIND_SIZE);
g_free(tmp);
return text; return text;
/* /*
} else { } else {