rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 02:49:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add missing esc_tag() in status and parity split log tags

Browse source
This commit is contained in:
Andrea Mazzoleni 2026-08-17 19:02:15 +02:00
parent e5246cc309
commit fa0a77f84c
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AGENTS.md
View file

@ -103,6 +103,7 @@ SnapRAID is designed to recover from an interruption, including `SIGKILL`, at an
- **Return codes**: `0` means no-error; `< 0` means error; positive for specific results
- **Logging**: Use `log_fatal()`, `log_tag()`, `msg_info()`, `msg_progress()`, `msg_verbose()` from `support.h`
- **Tag Escaping**: When emitting structured tags with `log_tag()`, always wrap file paths, directory paths, link targets, disk names, filter patterns, and arbitrary string fields with `esc_tag()` to prevent colons (e.g., Windows drive letters `C:`), backslashes, or newlines from breaking colon-delimited tag parsing.
- **Allocation**: Always use custom `malloc_nofail()`, `calloc_nofail()`, `nalloc_nofail()`, or `strdup_nofail()` wrappers (which handle OOM by aborting)
- **Path Manipulation**: Never use standard unsafe string functions (`strcpy`, `strcat`, `strcmp`) on paths. Always use the platform-correct, size-bounded wrappers in `support.h` (e.g., `pathcpy()`, `pathcat()`, `pathcmp()`, `pathslash()`).
- **TommyDS Iteration**: For `tommy_list`, iterate using:

12
cmdline/parity.c
View file

@ -291,9 +291,9 @@ static int parity_handle_grow(struct snapraid_split_handle* split, data_off_t pr
#endif
if (ret != 0)
log_tag("split:grow:%s:%" PRIu64 ": failed with error %s\n", split->path, size, strerror(errno));
log_tag("split:grow:%s:%" PRIu64 ": failed with error %s\n", esc_tag(split->path), size, strerror(errno));
else
log_tag("split:grow:%s:%" PRIu64 ": ok\n", split->path, size);
log_tag("split:grow:%s:%" PRIu64 ": ok\n", esc_tag(split->path), size);
return ret;
}
@ -305,9 +305,9 @@ static int parity_handle_shrink(struct snapraid_split_handle* split, data_off_t
ret = ftruncate(split->f, size);
if (ret != 0)
log_tag("split:shrink:%s:%" PRIu64 ": failed with error %s\n", split->path, size, strerror(errno));
log_tag("split:shrink:%s:%" PRIu64 ": failed with error %s\n", esc_tag(split->path), size, strerror(errno));
else
log_tag("split:shrink:%s:%" PRIu64 ": ok\n", split->path, size);
log_tag("split:shrink:%s:%" PRIu64 ": ok\n", esc_tag(split->path), size);
return ret;
}
@ -395,7 +395,7 @@ static int parity_handle_fill(struct snapraid_split_handle* split, data_off_t si
/* size we have to increase */
delta = size - base;
log_tag("split:fill:%s:%" PRIu64 ":%" PRIu64 ":\n", split->path, base, size);
log_tag("split:fill:%s:%" PRIu64 ":%" PRIu64 ":\n", esc_tag(split->path), base, size);
/* grow the size one bit at time, like a kind of binary search */
while (delta != 0) {
@ -405,7 +405,7 @@ static int parity_handle_fill(struct snapraid_split_handle* split, data_off_t si
/* mask out the bit we process */
delta &= ~run;
log_tag("split:delta:%s:%" PRIu64 ":%" PRIu64 ":\n", split->path, base, run);
log_tag("split:delta:%s:%" PRIu64 ":%" PRIu64 ":\n", esc_tag(split->path), base, run);
ret = parity_handle_grow(split, base, base + run, skip_fallocate);
if (ret != 0) {

2
cmdline/state.c
View file

@ -3745,7 +3745,7 @@ static void* state_write_thread(void* arg)
log_tag("content_parity_split:%s:%s:%s:%" PRIi64 "\n",
parity_name,
uuid,
state->parity[l].split_map[s].path,
esc_tag(state->parity[l].split_map[s].path),
state->parity[l].split_map[s].size);
}
}

4
cmdline/status.c
View file

@ -130,9 +130,9 @@ int state_status(struct snapraid_state* state)
++file_zerosubsecond;
++disk_file_zerosubsecond;
if (disk_file_zerosubsecond < 50)
log_tag("zerosubsecond:%s:%s: \n", disk->name, file->sub);
log_tag("zerosubsecond:%s:%s: \n", disk->name, esc_tag(file->sub));
if (disk_file_zerosubsecond == 50)
log_tag("zerosubsecond:%s:%s: (more follow)\n", disk->name, file->sub);
log_tag("zerosubsecond:%s:%s: (more follow)\n", disk->name, esc_tag(file->sub));
}
/* check fragmentation */