Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

libzutil: zfs_isnumber(): return false if input empty 

zpool list, which is the only user, would mistakenly try to parse the
empty string as the interval in this case:

  $ zpool list "a"
  cannot open 'a': no such pool
  $ zpool list ""
  interval cannot be zero
  usage: <usage string follows>
which is now symmetric with zpool get:
  $ zpool list ""
  cannot open '': name must begin with a letter

Avoid breaking the  "interval cannot be zero" string.
There simply isn't a need for this, and it's user-facing.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #11841 
Closes #11843
This commit is contained in:
наб 2021-04-06 21:25:53 +02:00 committed by GitHub
parent ec580225d2
commit 61b50107a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/zpool/zpool_main.c
View File

@ -4965,8 +4965,8 @@ get_interval_count(int *argcp, char **argv, float *iv,
if (*end == '\0' && errno == 0) { if (*end == '\0' && errno == 0) {
if (interval == 0) { if (interval == 0) {
(void) fprintf(stderr, gettext("interval " (void) fprintf(stderr, gettext(
"cannot be zero\n")); "interval cannot be zero\n"));
usage(B_FALSE); usage(B_FALSE);
} }
/* /*
@ -4996,8 +4996,8 @@ get_interval_count(int *argcp, char **argv, float *iv,
if (*end == '\0' && errno == 0) { if (*end == '\0' && errno == 0) {
if (interval == 0) { if (interval == 0) {
(void) fprintf(stderr, gettext("interval " (void) fprintf(stderr, gettext(
"cannot be zero\n")); "interval cannot be zero\n"));
usage(B_FALSE); usage(B_FALSE);
} }

3
lib/libzutil/zutil_nicenum.c
View File

@ -35,6 +35,9 @@
boolean_t boolean_t
zfs_isnumber(const char *str) zfs_isnumber(const char *str)
{ {
if (!*str)
return (B_FALSE);
for (; *str; str++) for (; *str; str++)
if (!(isdigit(*str) || (*str == '.'))) if (!(isdigit(*str) || (*str == '.')))
return (B_FALSE); return (B_FALSE);