Skip to content

Fix --timeout to accept s/ms suffix for user convenience #472

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

Closed
a2Fsa2k wants to merge 1 commit into from
+20 −2
Closed

Fix --timeout to accept s/ms suffix for user convenience #472

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
22 changes: 20 additions & 2 deletions src/fping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,10 +661,28 @@ int main(int argc, char **argv)
#endif
break;

case 't':
opt_timeout = strtod_strict(optparse_state.optarg) * 1000000;
case 't': {
size_t len = strlen(optparse_state.optarg);
char *arg = strdup(optparse_state.optarg);
if (!arg) {
fprintf(stderr, "%s: out of memory\n", prog);
exit(1);
}
/* Strip trailing 's' or 'ms' suffix for user convenience;
* opt_timeout is in nanoseconds. */
if (len > 2 && strcmp(arg + len - 2, "ms") == 0) {
arg[len - 2] = '\0';
opt_timeout = strtod_strict(arg) * 1000000;
} else if (len > 0 && arg[len - 1] == 's') {
arg[len - 1] = '\0';
opt_timeout = strtod_strict(arg) * 1000000000;
} else {
opt_timeout = strtod_strict(arg) * 1000000;
}
Comment thread
a2Fsa2k marked this conversation as resolved.
free(arg);
opt_timeout_on = 1;
break;
}

case 'r':
opt_retry = (unsigned int)strtoul_strict(optparse_state.optarg, 10);
Expand Down