devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-26 04:06:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(flatfile): single-line file header with format-version marker

Browse Source
This commit is contained in:
jabber.developer2
2026-05-05 13:50:06 +03:00
parent b8a4900393
commit 2990ec795a
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/database_flatfile.h
View File

@@ -26,12 +26,12 @@
#define DIR_FLATLOG "flatlog" #define DIR_FLATLOG "flatlog"
#define FLATFILE_FORMAT_VERSION 1 #define FLATFILE_FORMAT_VERSION 1
#define FF_VERSION_PREFIX "# format-version: " #define FF_VERSION_MARKER "format-version: "
#define FLATFILE_HEADER \ #define FF_STRINGIFY_(x) #x
"# profanity chat log — UTF-8, LF line endings\n" \ #define FF_STRINGIFY(x) FF_STRINGIFY_(x)
"# format-version: 1\n" #define FLATFILE_HEADER "# cproof chat log — UTF-8, LF line endings, " FF_VERSION_MARKER FF_STRINGIFY(FLATFILE_FORMAT_VERSION) "\n"
#define FF_MAX_LINE_LEN (10 * 1024 * 1024) /* 10 MB — reject lines longer than this */ #define FF_MAX_LINE_LEN (10 * 1024 * 1024) /* 10 MB — reject lines longer than this */
#define FF_MAX_LMC_DEPTH 100 /* max correction chain depth */ #define FF_MAX_LMC_DEPTH 100 /* max correction chain depth */
// --- Shared global --- // --- Shared global ---

19
src/database_flatfile_parser.c
View File

@@ -342,10 +342,11 @@ ff_skip_bom(FILE* fp)
// Format-version helper // Format-version helper
// ========================================================================= // =========================================================================
// //
// Scan leading '#' comment lines for `# format-version: <N>`. Stops at // Scan leading '#' comment lines for the `format-version: <N>` marker
// the first non-comment line or after FF_VERSION_SCAN_MAX comments. // (anywhere within the comment line). Stops at the first non-comment
// Restores fp to its position at entry, so callers can re-parse the // line or after FF_VERSION_SCAN_MAX comments. Restores fp to its
// header normally afterwards. // position at entry, so callers can re-parse the header normally
// afterwards.
#define FF_VERSION_SCAN_MAX 16 #define FF_VERSION_SCAN_MAX 16
int int
@@ -356,7 +357,7 @@ ff_read_format_version(FILE* fp)
return -1; return -1;
int version = 0; int version = 0;
size_t prefix_len = strlen(FF_VERSION_PREFIX); size_t marker_len = strlen(FF_VERSION_MARKER);
for (int i = 0; i < FF_VERSION_SCAN_MAX; i++) { for (int i = 0; i < FF_VERSION_SCAN_MAX; i++) {
gboolean truncated = FALSE; gboolean truncated = FALSE;
@@ -367,10 +368,12 @@ ff_read_format_version(FILE* fp)
free(line); free(line);
break; break;
} }
if (strncmp(line, FF_VERSION_PREFIX, prefix_len) == 0) { char* found = strstr(line, FF_VERSION_MARKER);
if (found) {
char* num_start = found + marker_len;
char* endptr = NULL; char* endptr = NULL;
long v = strtol(line + prefix_len, &endptr, 10); long v = strtol(num_start, &endptr, 10);
if (endptr != line + prefix_len && v > 0 && v <= INT_MAX) if (endptr != num_start && v > 0 && v <= INT_MAX)
version = (int)v; version = (int)v;
free(line); free(line);
break; break;

2
tests/unittests/test_database_export.c
View File

@@ -458,7 +458,7 @@ void
test_ff_parse_line_comment(void** state) test_ff_parse_line_comment(void** state)
{ {
assert_null(ff_parse_line("# this is a comment")); assert_null(ff_parse_line("# this is a comment"));
assert_null(ff_parse_line("# profanity chat log — UTF-8, LF line endings")); assert_null(ff_parse_line("# cproof chat log — UTF-8, LF line endings"));
} }
void void