mirrors/pv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Permit decimals with suffix for --size, --rate-limit, --buffer-size, and --error-skip-block (#35); and document the types of numbers allowed in the manual.

Browse Source
This commit is contained in:
Andrew Wood
2024-12-10 22:09:32 +00:00
parent 73bc1ab139
commit 1d76c0bc64
14 changed files with 198 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/options.c
+20 -9
View File
@@ -405,24 +405,34 @@ opts_t opts_parse(unsigned int argc, char **argv)
break;
/* falls through */
/*@fallthrough@ */
case 'L':
/*@fallthrough@ */
case 'B':
/*@fallthrough@ */
case 'Z':
if (!pv_getnum_check(optarg, PV_NUMTYPE_ANY_WITH_SUFFIX)) {
/*@-mustfreefresh@ *//* see above */
fprintf(stderr, "%s: -%c: %s: %s\n", opts->program_name, c, optarg,
_("numeric value not understood"));
opts_free(opts);
return NULL;
/*@+mustfreefresh@ */
}
break;
case 'A':
/*@fallthrough@ */
case 'w':
/*@fallthrough@ */
case 'H':
/*@fallthrough@ */
case 'L':
/*@fallthrough@ */
case 'B':
/*@fallthrough@ */
case 'R':
/*@fallthrough@ */
case 'm':
/*@fallthrough@ */
case 'Z':
if (!pv_getnum_check(optarg, PV_NUMTYPE_INTEGER)) {
if (!pv_getnum_check(optarg, PV_NUMTYPE_BARE_INTEGER)) {
/*@-mustfreefresh@ *//* see above */
fprintf(stderr, "%s: -%c: %s\n", opts->program_name, c, _("integer argument expected"));
fprintf(stderr, "%s: -%c: %s: %s\n", opts->program_name, c, optarg,
_("integer argument expected"));
opts_free(opts);
return NULL;
/*@+mustfreefresh@ */
@@ -431,9 +441,10 @@ opts_t opts_parse(unsigned int argc, char **argv)
case 'i':
/*@fallthrough@ */
case 'D':
if (!pv_getnum_check(optarg, PV_NUMTYPE_DOUBLE)) {
if (!pv_getnum_check(optarg, PV_NUMTYPE_BARE_DOUBLE)) {
/*@-mustfreefresh@ *//* see above */
fprintf(stderr, "%s: -%c: %s\n", opts->program_name, c, _("numeric argument expected"));
fprintf(stderr, "%s: -%c: %s: %s\n", opts->program_name, c, optarg,
_("numeric argument expected"));
opts_free(opts);
return NULL;
/*@+mustfreefresh@ */