mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
synced 2024-11-15 08:14:21 +08:00
389c959d6d
This patch introduces a new parser helper, parse_u64_with_suffix(), which has a better error handling, following all the parse_*() helpers to return non-zero value for errors. This new helper is going to replace parse_size_from_string(), which would directly call exit(1) to stop the whole program. Furthermore most callers of parse_size_from_string() are expecting exit(1) for error, so that they can skip the error handling. For those call sites, introduce a wrapper, arg_strtou64_with_suffix(), to do that. The only disadvantage is a little less detailed error report for why the parse failed, but for most cases the generic error string should be enough. Signed-off-by: Qu Wenruo <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
89 lines
2.1 KiB
C
89 lines
2.1 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public
|
|
* License v2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public
|
|
* License along with this program; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 021110-1307, USA.
|
|
*/
|
|
|
|
#include "kerncompat.h"
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <limits.h>
|
|
#include "common/string-utils.h"
|
|
#include "common/messages.h"
|
|
#include "common/parse-utils.h"
|
|
|
|
int string_is_numerical(const char *str)
|
|
{
|
|
if (!str)
|
|
return 0;
|
|
if (!(*str >= '0' && *str <= '9'))
|
|
return 0;
|
|
while (*str >= '0' && *str <= '9')
|
|
str++;
|
|
if (*str != '\0')
|
|
return 0;
|
|
return 1;
|
|
}
|
|
|
|
int string_has_prefix(const char *str, const char *prefix)
|
|
{
|
|
for (; ; str++, prefix++)
|
|
if (!*prefix)
|
|
return 0;
|
|
else if (*str != *prefix)
|
|
return (unsigned char)*prefix - (unsigned char)*str;
|
|
}
|
|
|
|
/*
|
|
* This function should be only used when parsing command arg, it won't return
|
|
* error to its caller and rather exit directly just like usage().
|
|
*/
|
|
u64 arg_strtou64(const char *str)
|
|
{
|
|
u64 value;
|
|
int ret;
|
|
|
|
ret = parse_u64(str, &value);
|
|
if (ret == -ERANGE) {
|
|
error("%s is too large", str);
|
|
exit(1);
|
|
} else if (ret == -EINVAL) {
|
|
if (str[0] == '-')
|
|
error("%s: negative value is invalid", str);
|
|
else
|
|
error("%s is not a valid numeric value", str);
|
|
exit(1);
|
|
}
|
|
return value;
|
|
}
|
|
|
|
u64 arg_strtou64_with_suffix(const char *str)
|
|
{
|
|
u64 value;
|
|
int ret;
|
|
|
|
ret = parse_u64_with_suffix(str, &value);
|
|
if (ret == -ERANGE) {
|
|
error("%s is too large", str);
|
|
exit(1);
|
|
} else if (ret == -EINVAL) {
|
|
error("%s is not a valid numeric value with supported size suffixes", str);
|
|
exit(1);
|
|
} else if (ret < 0) {
|
|
errno = -ret;
|
|
error("failed to parse string '%s': %m", str);
|
|
exit(1);
|
|
}
|
|
return value;
|
|
}
|