Skip to content

drivers/main: warn on unrecognised parameters #3258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
systemcrash wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −12
Draft

drivers/main: warn on unrecognised parameters #3258

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions drivers/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,12 +405,11 @@ void storeval(const char *var, char *val)
tmp = tmp->next;
}

/* try to help them out */
printf("\nFatal error: '%s' is not a valid %s for this driver.\n", var,
val ? "variable name" : "flag");
printf("\n");
printf("Look in the man page or call this driver with -h for a list of\n");
printf("valid variable names and flags.\n");
/* log a warning for unrecognized parameter and continue */
upslogx(LOG_WARNING, "Ignoring unrecognized %s '%s' for this driver.\n"
"Consult the man page or call this driver with -h for a list of valid %s.",
val ? "variable name" : "flag", var,
val ? "variable names" : "flags");

/* FIXME: find a way to separate this logic from main.c */
for (pprogname = prognames; *pprogname != NULL; pprogname++) {
Expand All @@ -436,17 +435,18 @@ void storeval(const char *var, char *val)
|| !strcmp(var, "langid_fix")
|| !strcmp(var, "noscanlangid")
) {
printf("\nNOTE: for driver '%s', options like '%s' are only available\n"
"if it was built with USB support. If you are running a custom build of NUT,\n"
"please check results of the `configure` checks, and consider an explicit\n"
"`--with-usb` option. Also make sure that both libusb library and headers\n"
"are installed in your build environment.\n\n", progname, var);
upslogx(LOG_INFO, "NOTE: for driver '%s', options like '%s' are only available "
"if it was built with USB support. If you are running a custom build of NUT, "
"please check results of the `configure` checks, and consider an explicit "
"`--with-usb` option. Also make sure that both libusb library and headers "
"are installed in your build environment.", progname, var);
break;
}
}
}

exit(EXIT_SUCCESS);
/* simply return and continue, parameter is ignored */
return;
}

/* retrieve the value of variable <var> if possible */
Expand Down
Loading