diff --git a/cmdline/handle.c b/cmdline/handle.c index 1172e67a..d721f045 100644 --- a/cmdline/handle.c +++ b/cmdline/handle.c @@ -567,7 +567,7 @@ struct snapraid_handle* handle_mapping(struct snapraid_state* state, unsigned* h map = 0; for (k = state->maplist; k != 0; k = k->next) { map = k->data; - if (strcmp(disk->name, map->name) == 0) + if (pathcmp(disk->name, map->name) == 0) break; } if (!map) { diff --git a/cmdline/selftest.c b/cmdline/selftest.c index bbb0764e..8c0a59d4 100644 --- a/cmdline/selftest.c +++ b/cmdline/selftest.c @@ -1930,6 +1930,24 @@ static void test_disk_name(void) assert(disk_name_invalid_reason("r-parity") != 0); assert(disk_name_invalid_reason("z-parity") != 0); +#ifdef _WIN32 + /* case-insensitive parity names rejected on Windows */ + assert(disk_name_invalid_reason("PARITY") != 0); + assert(disk_name_invalid_reason("Parity") != 0); + assert(disk_name_invalid_reason("1-PARITY") != 0); + assert(disk_name_invalid_reason("2-PARITY") != 0); + assert(disk_name_invalid_reason("Q-PARITY") != 0); + assert(disk_name_invalid_reason("Z-PARITY") != 0); +#else + /* case-sensitive on Unix: uppercase variants are distinct from reserved lowercase parity names */ + assert(disk_name_invalid_reason("PARITY") == 0); + assert(disk_name_invalid_reason("Parity") == 0); + assert(disk_name_invalid_reason("1-PARITY") == 0); + assert(disk_name_invalid_reason("2-PARITY") == 0); + assert(disk_name_invalid_reason("Q-PARITY") == 0); + assert(disk_name_invalid_reason("Z-PARITY") == 0); +#endif + /* valid names containing parity as substring */ assert(disk_name_invalid_reason("parity1") == 0); assert(disk_name_invalid_reason("parity_data") == 0); diff --git a/cmdline/state.c b/cmdline/state.c index 568a235f..0dadf667 100644 --- a/cmdline/state.c +++ b/cmdline/state.c @@ -117,6 +117,9 @@ static int lev_config_scan(const char* s, unsigned* level, unsigned* mode) const char* disk_name_invalid_reason(const char* name) { unsigned dummy_level; +#ifdef _WIN32 + char lower[DISK_NAME_MAX + 1]; +#endif if (strlen(name) > DISK_NAME_MAX) return "Name is too long (maximum 127 bytes)"; @@ -126,8 +129,16 @@ const char* disk_name_invalid_reason(const char* name) return "Name contains '\\'"; if (strchr(name, ':') != 0) return "Name contains ':'"; + +#ifdef _WIN32 + pathcpy(lower, sizeof(lower), name); + strlwr(lower); + if (lev_config_scan(lower, &dummy_level, 0) == 0) + return "Name is a reserved parity name"; +#else if (lev_config_scan(name, &dummy_level, 0) == 0) return "Name is a reserved parity name"; +#endif return 0; } @@ -1081,7 +1092,7 @@ void state_config(struct snapraid_state* state, const char* path, const char* co /* check if the disk name already exists */ for (i = state->disklist; i != 0; i = i->next) { disk = i->data; - if (strcmp(disk->name, buffer) == 0) + if (pathcmp(disk->name, buffer) == 0) break; } if (i) { @@ -1093,7 +1104,7 @@ void state_config(struct snapraid_state* state, const char* path, const char* co for (i = state->extralist; i != 0; i = i->next) { struct snapraid_extra* found_extra = i->data; - if (strcmp(found_extra->name, buffer) == 0) + if (pathcmp(found_extra->name, buffer) == 0) break; } if (i) { @@ -1203,7 +1214,7 @@ void state_config(struct snapraid_state* state, const char* path, const char* co /* check if the disk name already exists */ for (i = state->extralist; i != 0; i = i->next) { extra = i->data; - if (strcmp(extra->name, buffer) == 0) + if (pathcmp(extra->name, buffer) == 0) break; } if (i) { @@ -1215,7 +1226,7 @@ void state_config(struct snapraid_state* state, const char* path, const char* co for (i = state->disklist; i != 0; i = i->next) { struct snapraid_disk* found_disk = i->data; - if (strcmp(found_disk->name, buffer) == 0) + if (pathcmp(found_disk->name, buffer) == 0) break; } if (i) { @@ -1316,7 +1327,7 @@ void state_config(struct snapraid_state* state, const char* path, const char* co struct snapraid_disk* found_disk = 0; for (i = state->disklist; i != 0; i = i->next) { struct snapraid_disk* disk = i->data; - if (strcmp(disk->name, buffer) == 0) { + if (pathcmp(disk->name, buffer) == 0) { found_disk = disk; break; } @@ -1324,7 +1335,7 @@ void state_config(struct snapraid_state* state, const char* path, const char* co struct snapraid_extra* found_extra = 0; for (i = state->extralist; i != 0; i = i->next) { struct snapraid_extra* extra = i->data; - if (strcmp(extra->name, buffer) == 0) { + if (pathcmp(extra->name, buffer) == 0) { found_extra = extra; break; } @@ -1385,7 +1396,7 @@ void state_config(struct snapraid_state* state, const char* path, const char* co struct snapraid_disk* found_disk = 0; for (i = state->disklist; i != 0; i = i->next) { struct snapraid_disk* disk = i->data; - if (strcmp(disk->name, buffer) == 0) { + if (pathcmp(disk->name, buffer) == 0) { found_disk = disk; break; } @@ -1393,7 +1404,7 @@ void state_config(struct snapraid_state* state, const char* path, const char* co struct snapraid_extra* found_extra = 0; for (i = state->extralist; i != 0; i = i->next) { struct snapraid_extra* extra = i->data; - if (strcmp(extra->name, buffer) == 0) { + if (pathcmp(extra->name, buffer) == 0) { found_extra = extra; break; } @@ -1705,7 +1716,7 @@ static struct snapraid_disk* find_disk_by_name(struct snapraid_state* state, con for (i = state->disklist; i != 0; i = i->next) { struct snapraid_disk* disk = i->data; - if (strcmp(disk->name, name) == 0) + if (pathcmp(disk->name, name) == 0) return disk; } @@ -1804,7 +1815,7 @@ static void state_map(struct snapraid_state* state) /* check if the disk is already mapped */ for (j = state->maplist; j != 0; j = j->next) { map = j->data; - if (strcmp(disk->name, map->name) == 0) { + if (pathcmp(disk->name, map->name) == 0) { /* mapping found */ break; } @@ -2096,7 +2107,7 @@ static void state_content_check(struct snapraid_state* state, const char* path) tommy_node* j; for (j = i->next; j != 0; j = j->next) { struct snapraid_map* other = j->data; - if (strcmp(map->name, other->name) == 0) { + if (pathcmp(map->name, other->name) == 0) { /* LCOV_EXCL_START */ log_fatal(ECONTENT, "Conflicting 'map' disk specification in '%s'\n", path); exit(EXIT_FAILURE);