mirror of
git://git.yoctoproject.org/poky
synced 2026-10-01 20:01:09 +00:00
cfcbc502a7
Backport patch from the upstream https://github.com/shadow-maint/shadow/commit/ 1d5a926cc2d6078d23a96222b1ef3e558724dad1 (From OE-Core rev: dd9e2dedb9ab41f509bae26f12704cbee1eb765d) Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
49 lines
1.1 KiB
Diff
49 lines
1.1 KiB
Diff
From 1d5a926cc2d6078d23a96222b1ef3e558724dad1 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Krahmer <krahmer@suse.com>
|
|
Date: Wed, 3 Aug 2016 11:51:07 -0500
|
|
Subject: [PATCH] Simplify getulong
|
|
|
|
Use strtoul to read an unsigned long, rather than reading
|
|
a signed long long and casting it.
|
|
|
|
https://bugzilla.suse.com/show_bug.cgi?id=979282
|
|
|
|
Upstream-Status: Backport
|
|
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
|
|
---
|
|
lib/getulong.c | 9 +++------
|
|
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/lib/getulong.c b/lib/getulong.c
|
|
index 61579ca..08d2c1a 100644
|
|
--- a/lib/getulong.c
|
|
+++ b/lib/getulong.c
|
|
@@ -44,22 +44,19 @@
|
|
*/
|
|
int getulong (const char *numstr, /*@out@*/unsigned long int *result)
|
|
{
|
|
- long long int val;
|
|
+ unsigned long int val;
|
|
char *endptr;
|
|
|
|
errno = 0;
|
|
- val = strtoll (numstr, &endptr, 0);
|
|
+ val = strtoul (numstr, &endptr, 0);
|
|
if ( ('\0' == *numstr)
|
|
|| ('\0' != *endptr)
|
|
|| (ERANGE == errno)
|
|
- /*@+ignoresigns@*/
|
|
- || (val != (unsigned long int)val)
|
|
- /*@=ignoresigns@*/
|
|
) {
|
|
return 0;
|
|
}
|
|
|
|
- *result = (unsigned long int)val;
|
|
+ *result = val;
|
|
return 1;
|
|
}
|
|
|
|
--
|
|
1.9.1
|