github/recorder
1
0
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2026-08-27 16:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocat --dump will not dump internal db names

Browse Source 
a previous commit erroneously avoided dumping content if it
	didn't contain JSON (i.e. a '{') which broke dumping of
	friends.

	The reason I did that at the time is to avoid gcache_dump()
	outputs the db names, as in:

	$ ./ocat --dump | grep -E '^[a-z0-9]+   *$'
	friends
	luadb
	topic2tid
	wp

	This fixes that. (includes 'keys' db which exists with ENCRYPT)

	fixes #572
This commit is contained in:
Jan-Piet Mens
2026-07-16 20:20:39 +02:00
parent ae2fd296ca
commit 5c319d16c9
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gcache.c
+12 -5
View File
@@ -319,12 +319,19 @@ void gcache_dump(char *path, char *lmdbname)
/* -1 because we 0-terminate strings in values */
while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
/* Don't dump mdb keys if we seem to not have JSON data */
if (strchr((char *)data.mv_data, '{') != NULL) {
printf("%*.*s %*.*s\n",
(int)key.mv_size, (int)key.mv_size, (char *)key.mv_data,
(int)data.mv_size - 1, (int)data.mv_size - 1, (char *)data.mv_data);
/* Don't dump mdb keys if they are internal db names */
if ((key.mv_size == 7 && strncmp(key.mv_data, "friends", 7) == 0) ||
(key.mv_size == 2 && strncmp(key.mv_data, "wp", 2) == 0) ||
(key.mv_size == 5 && strncmp(key.mv_data, "luadb", 5) == 0) ||
#ifdef WITH_ENCRYPT
(key.mv_size == 4 && strncmp(key.mv_data, "keys", 4) == 0) ||
#endif
(key.mv_size == 9 && strncmp(key.mv_data, "topic2tid", 9) == 0)) {
continue;
}
printf("%*.*s %*.*s\n",
(int)key.mv_size, (int)key.mv_size, (char *)key.mv_data,
(int)data.mv_size - 1, (int)data.mv_size - 1, (char *)data.mv_data);
}
mdb_cursor_close(cursor);
mdb_txn_commit(txn);