aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2018-12-30 20:24:59 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2018-12-31 15:18:45 +0100
commitaad76968cd5934ee17f36cd8e817e86ae952b533 (patch)
tree40eefffb52e8ed3c75747457980630facef783dd /libbb
parent8b710ef000c383f3476245b27bacf034532d9786 (diff)
downloadbusybox-w32-aad76968cd5934ee17f36cd8e817e86ae952b533.tar.gz
busybox-w32-aad76968cd5934ee17f36cd8e817e86ae952b533.tar.bz2
busybox-w32-aad76968cd5934ee17f36cd8e817e86ae952b533.zip
pmap: make 32-bit version work better on 64-bit kernels
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/procps.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libbb/procps.c b/libbb/procps.c
index 9d8a921df..af3ad86ff 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -120,11 +120,11 @@ void FAST_FUNC free_procps_scan(procps_status_t* sp)
120} 120}
121 121
122#if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP 122#if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP
123static unsigned long fast_strtoul_16(char **endptr) 123static unsigned long long fast_strtoull_16(char **endptr)
124{ 124{
125 unsigned char c; 125 unsigned char c;
126 char *str = *endptr; 126 char *str = *endptr;
127 unsigned long n = 0; 127 unsigned long long n = 0;
128 128
129 /* Need to stop on both ' ' and '\n' */ 129 /* Need to stop on both ' ' and '\n' */
130 while ((c = *str++) > ' ') { 130 while ((c = *str++) > ' ') {
@@ -238,8 +238,8 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
238 238
239 *tp = ' '; 239 *tp = ' ';
240 tp = buf; 240 tp = buf;
241 currec.smap_start = fast_strtoul_16(&tp); 241 currec.smap_start = fast_strtoull_16(&tp);
242 currec.smap_size = (fast_strtoul_16(&tp) - currec.smap_start) >> 10; 242 currec.smap_size = (fast_strtoull_16(&tp) - currec.smap_start) >> 10;
243 243
244 strncpy(currec.smap_mode, tp, sizeof(currec.smap_mode)-1); 244 strncpy(currec.smap_mode, tp, sizeof(currec.smap_mode)-1);
245 245