projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openvt,getty,vfork_daemon_rexec,mount: tighten up fd cleanup code
[oweals/busybox.git]
/
libbb
/
xatonum.c
diff --git
a/libbb/xatonum.c
b/libbb/xatonum.c
index 910667c14ffa3dd5c083ed45ec698e114f07d097..dec3c2dc4aa5ce85373942baf2b000ad7b9f0c7c 100644
(file)
--- a/
libbb/xatonum.c
+++ b/
libbb/xatonum.c
@@
-19,15
+19,6
@@
#define XSTR_TYPE_MIN LLONG_MIN
#define XSTR_STRTOU strtoull
#include "xatonum_template.c"
#define XSTR_TYPE_MIN LLONG_MIN
#define XSTR_STRTOU strtoull
#include "xatonum_template.c"
-#undef type
-#undef xstrtou
-#undef xstrto
-#undef xatou
-#undef xato
-#undef XSTR_UTYPE_MAX
-#undef XSTR_TYPE_MAX
-#undef XSTR_TYPE_MIN
-#undef XSTR_STRTOU
#if ULONG_MAX != ULLONG_MAX
#define type long
#if ULONG_MAX != ULLONG_MAX
#define type long
@@
-40,18
+31,19
@@
#define XSTR_TYPE_MIN LONG_MIN
#define XSTR_STRTOU strtoul
#include "xatonum_template.c"
#define XSTR_TYPE_MIN LONG_MIN
#define XSTR_STRTOU strtoul
#include "xatonum_template.c"
-#undef type
-#undef xstrtou
-#undef xstrto
-#undef xatou
-#undef xato
-#undef XSTR_UTYPE_MAX
-#undef XSTR_TYPE_MAX
-#undef XSTR_TYPE_MIN
-#undef XSTR_STRTOU
#endif
#if UINT_MAX != ULONG_MAX
#endif
#if UINT_MAX != ULONG_MAX
+static ATTRIBUTE_ALWAYS_INLINE
+unsigned bb_strtoui(const char *str, char **end, int b)
+{
+ unsigned long v = strtoul(str, end, b);
+ if (v > UINT_MAX) {
+ errno = ERANGE;
+ return UINT_MAX;
+ }
+ return v;
+}
#define type int
#define xstrtou(rest) xstrtou##rest
#define xstrto(rest) xstrtoi##rest
#define type int
#define xstrtou(rest) xstrtou##rest
#define xstrto(rest) xstrtoi##rest
@@
-60,32
+52,19
@@
#define XSTR_UTYPE_MAX UINT_MAX
#define XSTR_TYPE_MAX INT_MAX
#define XSTR_TYPE_MIN INT_MIN
#define XSTR_UTYPE_MAX UINT_MAX
#define XSTR_TYPE_MAX INT_MAX
#define XSTR_TYPE_MIN INT_MIN
-#define XSTR_STRTOU strtoul
+/* libc has no strtoui, so we need to create/use our own */
+#define XSTR_STRTOU bb_strtoui
#include "xatonum_template.c"
#include "xatonum_template.c"
-#undef type
-#undef xstrtou
-#undef xstrto
-#undef xatou
-#undef xato
-#undef XSTR_UTYPE_MAX
-#undef XSTR_TYPE_MAX
-#undef XSTR_TYPE_MIN
-#undef XSTR_STRTOU
#endif
/* A few special cases */
int xatoi_u(const char *numstr)
{
#endif
/* A few special cases */
int xatoi_u(const char *numstr)
{
- return xatoul_range(numstr, 0, INT_MAX);
-}
-
-uint32_t xatou32(const char *numstr)
-{
- return xatoul_range(numstr, 0, 0xffffffff);
+ return xatou_range(numstr, 0, INT_MAX);
}
uint16_t xatou16(const char *numstr)
{
}
uint16_t xatou16(const char *numstr)
{
- return xatou
l
_range(numstr, 0, 0xffff);
+ return xatou_range(numstr, 0, 0xffff);
}
}