github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-01-14 06:10:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use strtol() instead of selfmade function

Browse Source 
* src/init.c (cmd_number): Use strtol() instead of selfmade function
* bootstrap.conf: Add strtol gnulib module
This commit is contained in:
Tim Rühsen 2018-04-15 19:00:32 +02:00
parent 55da9f71f0
commit 79385a29fd
2 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bootstrap.conf
View File

@ -102,6 +102,7 @@ strerror_r-posix
strpbrk
strptime
strtok_r
strtol
strtoll
symlink
sys_types

55
src/init.c
View File

@ -1083,13 +1083,16 @@ cmd_check_cert (const char *com, const char *val, void *place)
static bool
cmd_number (const char *com, const char *val, void *place)
{
if (!simple_atoi (val, val + strlen (val), place)
|| *(int *) place < 0)
long l = strtol(val, NULL, 10);
if (((l == LONG_MIN || l == LONG_MAX) && errno == ERANGE)
|| l < 0 || l > INT_MAX)
{
fprintf (stderr, _("%s: %s: Invalid number %s.\n"),
exec_name, com, quote (val));
return false;
}
*(int *) place = (int) l;
return true;
}
@ -1787,54 +1790,6 @@ cmd_spec_verbose (const char *com, const char *val, void *place_ignored _GL_UNUS
/* Miscellaneous useful routines. */
/* A very simple atoi clone, more useful than atoi because it works on
delimited strings, and has error reportage. Returns true on success,
false on failure. If successful, stores result to *DEST. */
static bool
simple_atoi (const char *beg, const char *end, int *dest)
{
int result = 0;
bool negative = false;
const char *p = beg;
while (p < end && c_isspace (*p))
++p;
if (p < end && (*p == '-' || *p == '+'))
{
negative = (*p == '-');
++p;
}
if (p == end)
return false;
/* Read negative numbers in a separate loop because the most
negative integer cannot be represented as a positive number. */
if (!negative)
for (; p < end && c_isdigit (*p); p++)
{
int next = (10 * result) + (*p - '0');
if (next < result)
return false; /* overflow */
result = next;
}
else
for (; p < end && c_isdigit (*p); p++)
{
int next = (10 * result) - (*p - '0');
if (next > result)
return false; /* underflow */
result = next;
}
if (p != end)
return false;
*dest = result;
return true;
}
/* Trivial atof, with error reporting. Handles "<digits>[.<digits>]",
doesn't handle exponential notation. Returns true on success,
false on failure. In case of success, stores its result to