d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make input parsing in Farhenheit actually work.

Browse Source 
Don't clobber *p with '\0' when testing whether it has the value of 'F'.
Just use the semantics of strtof() properly. If it returns p, we know
that it parsed the string until it reached 'C' or 'F'.

The code has not changed since it has been imported (r161951, Sep 3,
2006).

Submitted by:	Alexandre Perrin <kaworu@kaworu.ch>
MFC after:	1 week
This commit is contained in:
Ed Schouten 2009-10-21 18:31:54 +00:00
parent c0d2581bcb
commit a7b5ad271c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=198340
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/sysctl/sysctl.c
View File

@ -68,7 +68,7 @@ static int sysctl_all(int *oid, int len);
static int name2oid(char *, int *);
static void set_T_dev_t(char *, void **, size_t *);
static int set_IK(char *, int *);
static int set_IK(const char *, int *);
static void
usage(void)
@ -452,19 +452,19 @@ set_T_dev_t(char *path, void **val, size_t *size)
}
static int
set_IK(char *str, int *val)
set_IK(const char *str, int *val)
{
float temp;
int len, kelv;
char *p, *endptr;
const char *p;
char *endptr;
if ((len = strlen(str)) == 0)
return (0);
p = &str[len - 1];
if (*p == 'C' || *p == 'F') {
*p = '\0';
temp = strtof(str, &endptr);
if (endptr == str || *endptr != '\0')
if (endptr == str || endptr != p)
return (0);
if (*p == 'F')
temp = (temp - 32) * 5 / 9;