Lock unsafe command-line options after enabling --lock-options

This commit is contained in:
Andrea Mazzoleni 2026-09-16 12:35:32 +02:00
parent 209b902301
commit d92d296bcd
2 changed files with 56 additions and 0 deletions

View file

@ -213,6 +213,7 @@ int main(int argc, char* argv[])
int i;
int pos;
int mode;
int lock_options;
int ret;
(void)argc;
@ -246,7 +247,11 @@ int main(int argc, char* argv[])
utf8_argc = 1;
mode = MODE_DEFAULT;
lock_options = 0;
for (i = 1; i < wide_argc; i++) {
if (wcscmp(wide_argv[i], L"--lock-options") == 0)
lock_options = 1;
if (wcscmp(wide_argv[i], L"-s") == 0 || wcscmp(wide_argv[i], L"--spin-down-on-error") == 0) {
mode = MODE_SPINDOWN;
} else {
@ -264,6 +269,11 @@ int main(int argc, char* argv[])
utf8_argv[utf8_argc] = 0;
cmd_buffer[pos] = 0;
if (mode == MODE_SPINDOWN && lock_options) {
fprintf(stderr, "The --spin-down-on-error option cannot be used with --lock-options.\n");
exit(EXIT_FAILURE);
}
LocalFree(wide_argv);
if (mode == MODE_DEFAULT) {
@ -370,12 +380,17 @@ static void forward_signal(int sig)
int main(int argc, char* argv[])
{
int mode;
int lock_options;
int i, j;
int ret;
mode = MODE_DEFAULT;
lock_options = 0;
j = 1;
for (i = 1; i < argc; ++i) {
if (strcmp(argv[i], "--lock-options") == 0)
lock_options = 1;
if (strcmp(argv[i], "-s") == 0 || strcmp(argv[i], "--spin-down-on-error") == 0) {
mode = MODE_SPINDOWN;
} else {
@ -386,6 +401,11 @@ int main(int argc, char* argv[])
argc = j;
argv[argc] = 0;
if (mode == MODE_SPINDOWN && lock_options) {
fprintf(stderr, "The --spin-down-on-error option cannot be used with --lock-options.\n");
exit(EXIT_FAILURE);
}
if (mode == MODE_DEFAULT) {
ret = snapraid_main(argc, argv);
} else {