[PATCH 1/1] fs/ncpfs/getopt.c: replace simple_strtoul by kstrtoul

[PATCH 1/1] fs/ncpfs/getopt.c: replace simple_strtoul by kstrtoul

[Fabian Frederick]

Remove obsolete simple_strtoul in ncp_getopt

This is untested.

Cc: Petr Vandrovec <petr@vandrovec.name>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 fs/ncpfs/getopt.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/fs/ncpfs/getopt.c b/fs/ncpfs/getopt.c
index 03ffde1..344889c 100644
--- a/fs/ncpfs/getopt.c
+++ b/fs/ncpfs/getopt.c
@@ -53,15 +53,14 @@ int ncp_getopt(const char *caller, char **options, const struct ncp_option *opts
 				return -EINVAL;
 			}
 			if (opts->has_arg & OPT_INT) {
-				char* v;
+				int rc = kstrtoul(val, 0, value);
 
-				*value = simple_strtoul(val, &v, 0);
-				if (!*v) {
-					return opts->val;
+				if (rc) {
+					pr_info("%s: invalid numeric value in %s=%s\n",
+						caller, token, val);
+					return rc;
 				}
-				pr_info("%s: invalid numeric value in %s=%s\n",
-					caller, token, val);
-				return -EDOM;
+				return opts->val;
 			}
 			if (opts->has_arg & OPT_STRING) {
 				return opts->val;
-- 
1.9.1

Re: [PATCH 1/1] fs/ncpfs/getopt.c: replace simple_strtoul by kstrtoul

[Andrew Morton]

On Fri, 23 May 2014 22:26:11 +0200 Fabian Frederick <fabf@skynet.be> wrote:

> Remove obsolete simple_strtoul in ncp_getopt

Looks good to me.

> 
> --- a/fs/ncpfs/getopt.c
> +++ b/fs/ncpfs/getopt.c
> @@ -53,15 +53,14 @@ int ncp_getopt(const char *caller, char **options, const struct ncp_option *opts
>  				return -EINVAL;
>  			}
>  			if (opts->has_arg & OPT_INT) {
> -				char* v;
> +				int rc = kstrtoul(val, 0, value);
>  
> -				*value = simple_strtoul(val, &v, 0);
> -				if (!*v) {
> -					return opts->val;
> +				if (rc) {
> +					pr_info("%s: invalid numeric value in %s=%s\n",
> +						caller, token, val);
> +					return rc;

Because kstrtoul("42foo", ...) returns -EINVAL rather than 42.  This
behaviour isn't obvious - I had to dive into the implementation to work
it out.  We forgot to document what kstrtoul() considers a "parsing
error".


>  				}
> -				pr_info("%s: invalid numeric value in %s=%s\n",
> -					caller, token, val);
> -				return -EDOM;
> +				return opts->val;
>  			}
>  			if (opts->has_arg & OPT_STRING) {
>  				return opts->val;
> -- 
> 1.9.1