From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net, jeff@garzik.org
Cc: netdev@vger.kernel.org, gospo@redhat.com,
Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [ethtool PATCH] ethtool: Can't parse ints with stroul()
Date: Wed, 23 Dec 2009 23:22:08 -0800 [thread overview]
Message-ID: <20091224072208.19670.30391.stgit@localhost.localdomain> (raw)
From: PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
A recent change to how int's were being parsed from the command
line had them being read in with an unsigned int string operator.
This didn't allow signed numbers from being read in correctly.
This patch adds a get_uint() routine, and fixes the get_int()
routine to read in signed values.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
ethtool.c | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ethtool.c b/ethtool.c
index 4b750a4..10ff1f1 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -324,6 +324,7 @@ typedef enum {
CMDL_NONE,
CMDL_BOOL,
CMDL_INT,
+ CMDL_UINT,
CMDL_STR,
} cmdline_type_t;
@@ -404,18 +405,32 @@ static struct cmdline_info cmdline_coalesce[] = {
static int get_int(char *str, int base)
{
- unsigned long v;
+ long v;
char *endp;
if (!str)
show_usage(1);
errno = 0;
- v = strtoul(str, &endp, base);
+ v = strtol(str, &endp, base);
if ( errno || *endp || v > INT_MAX)
show_usage(1);
return (int)v;
}
+static int get_uint(char *str, int base)
+{
+ unsigned long v;
+ char *endp;
+
+ if (!str)
+ show_usage(1);
+ errno = 0;
+ v = strtoul(str, &endp, base);
+ if ( errno || *endp || v > UINT_MAX)
+ show_usage(1);
+ return v;
+}
+
static void parse_generic_cmdline(int argc, char **argp,
int first_arg, int *changed,
struct cmdline_info *info,
@@ -447,6 +462,10 @@ static void parse_generic_cmdline(int argc, char **argp,
*p = get_int(argp[i],0);
break;
}
+ case CMDL_UINT: {
+ *p = get_uint(argp[i],0);
+ break;
+ }
case CMDL_STR: {
char **s = info[idx].wanted_val;
*s = strdup(argp[i]);
next reply other threads:[~2009-12-24 7:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-24 7:22 Jeff Kirsher [this message]
2009-12-24 8:29 ` [ethtool PATCH] ethtool: Can't parse ints with stroul() Jeff Garzik
-- strict thread matches above, loose matches on Subject: below --
2009-12-08 17:32 Jeff Kirsher
2009-12-10 1:12 ` Jeff Kirsher
2009-12-23 21:52 ` Jeff Garzik
2009-12-23 21:58 ` Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091224072208.19670.30391.stgit@localhost.localdomain \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=jeff@garzik.org \
--cc=netdev@vger.kernel.org \
--cc=peter.p.waskiewicz.jr@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox