[Midnightbsd-cvs] src [10505] trunk/lib/libutil: more cleanup
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Jun 6 21:55:52 EDT 2018
Revision: 10505
http://svnweb.midnightbsd.org/src/?rev=10505
Author: laffer1
Date: 2018-06-06 21:55:52 -0400 (Wed, 06 Jun 2018)
Log Message:
-----------
more cleanup
Modified Paths:
--------------
trunk/lib/libutil/Makefile
trunk/lib/libutil/humanize_number.c
trunk/lib/libutil/kinfo_getallproc.c
trunk/lib/libutil/kinfo_getfile.c
trunk/lib/libutil/kinfo_getproc.c
Modified: trunk/lib/libutil/Makefile
===================================================================
--- trunk/lib/libutil/Makefile 2018-06-07 01:46:38 UTC (rev 10504)
+++ trunk/lib/libutil/Makefile 2018-06-07 01:55:52 UTC (rev 10505)
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $MidnightBSD: src/lib/libutil/Makefile,v 1.9 2011/10/22 18:52:17 laffer1 Exp $
+# $MidnightBSD$
SHLIBDIR?= /lib
@@ -7,9 +7,10 @@
LIB= util
SHLIB_MAJOR= 9
-SRCS= _secure_path.c expand_number.c flopen.c efun.c fparseln.c gr_util.c \
+SRCS= _secure_path.c auth.c expand_number.c flopen.c efun.c fparseln.c gr_util.c \
hexdump.c humanize_number.c kinfo_getfile.c kinfo_getfile.c \
- kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c kld.c \
+ kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c \
+ kinfo_getvmobject.c kld.c \
login_auth.c login_cap.c \
login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \
pidfile.c property.c pty.c pw_util.c quotafile.c realhostname.c \
@@ -22,20 +23,17 @@
CFLAGS+= -DINET6
.endif
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libc/gen/
-MAN+= kld.3 login_auth.3 login_tty.3 pty.3 \
- login_cap.3 login_class.3 login_times.3 login_ok.3 \
- _secure_path.3 uucplock.3 property.3 realhostname.3 \
- realhostname_sa.3 trimdomain.3 fparseln.3 humanize_number.3 \
- pidfile.3 efun.3 flopen.3 expand_number.3 hexdump.3 \
- kinfo_getfile.3 kinfo_getallproc.3 kinfo_getproc.3 \
- kinfo_getvmmap.3 quotafile.3
+MAN+= expand_number.3 efun.3 flopen.3 fparseln.3 hexdump.3 \
+ humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \
+ kinfo_getproc.3 kinfo_getvmmap.3 kinfo_getvmobject.3 kld.3 \
+ login_auth.3 login_cap.3 \
+ login_class.3 login_ok.3 login_times.3 login_tty.3 pidfile.3 \
+ property.3 pty.3 quotafile.3 realhostname.3 realhostname_sa.3 \
+ _secure_path.3 trimdomain.3 uucplock.3 pw_util.3
MAN+= login.conf.5
-MLINKS+= kld.3 kld_isloaded.3 kld.3 kld_load.3
-MLINKS+= property.3 properties_read.3 property.3 properties_free.3
-MLINKS+= property.3 property_find.3 property.3 property_count.3
-MLINKS+= pty.3 openpty.3 pty.3 forkpty.3
+MLINKS+=kld.3 kld_isloaded.3 kld.3 kld_load.3
MLINKS+=login_cap.3 login_getclassbyname.3 login_cap.3 login_close.3 \
login_cap.3 login_getclass.3 login_cap.3 login_getuserclass.3 \
login_cap.3 login_getcapstr.3 login_cap.3 login_getcaplist.3 \
@@ -51,6 +49,9 @@
MLINKS+=login_ok.3 auth_ttyok.3 login_ok.3 auth_hostok.3 \
login_ok.3 auth_timeok.3
MLINKS+=login_auth.3 auth_checknologin.3 login_auth.3 auth_cat.3
+MLINKS+=property.3 properties_read.3 property.3 properties_free.3
+MLINKS+=property.3 property_find.3 property.3 property_count.3
+MLINKS+=pty.3 openpty.3 pty.3 forkpty.3
MLINKS+=uucplock.3 uu_lock.3 uucplock.3 uu_lock_txfr.3 \
uucplock.3 uu_unlock.3 uucplock.3 uu_lockerr.3
MLINKS+=pidfile.3 pidfile_open.3 \
@@ -76,4 +77,8 @@
quotafile.3 quota_write_usage.3 \
quotafile.3 quota_close.3
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.lib.mk>
Modified: trunk/lib/libutil/humanize_number.c
===================================================================
--- trunk/lib/libutil/humanize_number.c 2018-06-07 01:46:38 UTC (rev 10504)
+++ trunk/lib/libutil/humanize_number.c 2018-06-07 01:55:52 UTC (rev 10505)
@@ -2,6 +2,7 @@
/*
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
+ * Copyright 2013 John-Mark Gurney <jmg at FreeBSD.org>
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -42,7 +43,7 @@
#include <locale.h>
#include <libutil.h>
-static const int maxscale = 7;
+static const int maxscale = 6;
int
humanize_number(char *buf, size_t len, int64_t quotient,
@@ -50,15 +51,26 @@
{
const char *prefixes, *sep;
int i, r, remainder, s1, s2, sign;
+ int divisordeccut;
int64_t divisor, max;
size_t baselen;
- assert(buf != NULL);
- assert(suffix != NULL);
- assert(scale >= 0);
- assert(scale < maxscale || (((scale & (HN_AUTOSCALE | HN_GETSCALE)) != 0)));
- assert(!((flags & HN_DIVISOR_1000) && (flags & HN_IEC_PREFIXES)));
+ /* Since so many callers don't check -1, NUL terminate the buffer */
+ if (len > 0)
+ buf[0] = '\0';
+ /* validate args */
+ if (buf == NULL || suffix == NULL)
+ return (-1);
+ if (scale < 0)
+ return (-1);
+ else if (scale > maxscale &&
+ ((scale & ~(HN_AUTOSCALE|HN_GETSCALE)) != 0))
+ return (-1);
+ if ((flags & HN_DIVISOR_1000) && (flags & HN_IEC_PREFIXES))
+ return (-1);
+
+ /* setup parameters */
remainder = 0;
if (flags & HN_IEC_PREFIXES) {
@@ -73,6 +85,7 @@
* an assertion earlier).
*/
divisor = 1024;
+ divisordeccut = 973; /* ceil(.95 * 1024) */
if (flags & HN_B)
prefixes = "B\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
else
@@ -79,28 +92,25 @@
prefixes = "\0\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
} else {
baselen = 1;
- if (flags & HN_DIVISOR_1000)
+ if (flags & HN_DIVISOR_1000) {
divisor = 1000;
- else
+ divisordeccut = 950;
+ if (flags & HN_B)
+ prefixes = "B\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
+ else
+ prefixes = "\0\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
+ } else {
divisor = 1024;
-
- if (flags & HN_B)
- prefixes = "B\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
- else
- prefixes = "\0\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
+ divisordeccut = 973; /* ceil(.95 * 1024) */
+ if (flags & HN_B)
+ prefixes = "B\0\0K\0\0M\0\0G\0\0T\0\0P\0\0E";
+ else
+ prefixes = "\0\0\0K\0\0M\0\0G\0\0T\0\0P\0\0E";
+ }
}
#define SCALE2PREFIX(scale) (&prefixes[(scale) * 3])
- if (scale < 0 || (scale >= maxscale &&
- (scale & (HN_AUTOSCALE | HN_GETSCALE)) == 0))
- return (-1);
-
- if (buf == NULL || suffix == NULL)
- return (-1);
-
- if (len > 0)
- buf[0] = '\0';
if (quotient < 0) {
sign = -1;
quotient = -quotient;
@@ -132,8 +142,8 @@
* divide once more.
*/
for (i = 0;
- (quotient >= max || (quotient == max - 1 && remainder >= 950)) &&
- i < maxscale; i++) {
+ (quotient >= max || (quotient == max - 1 &&
+ remainder >= divisordeccut)) && i < maxscale; i++) {
remainder = quotient % divisor;
quotient /= divisor;
}
@@ -148,20 +158,22 @@
}
/* If a value <= 9.9 after rounding and ... */
- if (quotient <= 9 && remainder < 950 && i > 0 && flags & HN_DECIMAL) {
- /* baselen + \0 + .N */
- if (len < baselen + 1 + 2)
- return (-1);
- s1 = (int)quotient + ((remainder + 50) / 1000);
- s2 = ((remainder + 50) / 100) % 10;
+ /*
+ * XXX - should we make sure there is enough space for the decimal
+ * place and if not, don't do HN_DECIMAL?
+ */
+ if (((quotient == 9 && remainder < divisordeccut) || quotient < 9) &&
+ i > 0 && flags & HN_DECIMAL) {
+ s1 = (int)quotient + ((remainder * 10 + divisor / 2) /
+ divisor / 10);
+ s2 = ((remainder * 10 + divisor / 2) / divisor) % 10;
r = snprintf(buf, len, "%d%s%d%s%s%s",
sign * s1, localeconv()->decimal_point, s2,
sep, SCALE2PREFIX(i), suffix);
} else
r = snprintf(buf, len, "%" PRId64 "%s%s%s",
- sign * (quotient + (remainder + 50) / 1000),
+ sign * (quotient + (remainder + divisor / 2) / divisor),
sep, SCALE2PREFIX(i), suffix);
return (r);
}
-
Modified: trunk/lib/libutil/kinfo_getallproc.c
===================================================================
--- trunk/lib/libutil/kinfo_getallproc.c 2018-06-07 01:46:38 UTC (rev 10504)
+++ trunk/lib/libutil/kinfo_getallproc.c 2018-06-07 01:55:52 UTC (rev 10505)
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/lib/libutil/kinfo_getallproc.c 312032 2017-01-13 08:39:40Z ngie $
*/
#include <sys/cdefs.h>
@@ -31,8 +31,8 @@
__MBSDID("$MidnightBSD$");
#include <sys/param.h>
+#include <sys/sysctl.h>
#include <sys/user.h>
-#include <sys/sysctl.h>
#include <stdlib.h>
#include <string.h>
@@ -75,7 +75,7 @@
mib[2] = KERN_PROC_PROC;
len = 0;
- if (sysctl(mib, 3, NULL, &len, NULL, 0) < 0)
+ if (sysctl(mib, nitems(mib), NULL, &len, NULL, 0) < 0)
return (NULL);
kipp = malloc(len);
@@ -82,7 +82,7 @@
if (kipp == NULL)
return (NULL);
- if (sysctl(mib, 3, kipp, &len, NULL, 0) < 0)
+ if (sysctl(mib, nitems(mib), kipp, &len, NULL, 0) < 0)
goto bad;
if (len % sizeof(*kipp) != 0)
goto bad;
Modified: trunk/lib/libutil/kinfo_getfile.c
===================================================================
--- trunk/lib/libutil/kinfo_getfile.c 2018-06-07 01:46:38 UTC (rev 10504)
+++ trunk/lib/libutil/kinfo_getfile.c 2018-06-07 01:55:52 UTC (rev 10505)
@@ -1,9 +1,10 @@
+/* $MidnightBSD$ */
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libutil/kinfo_getfile.c 312032 2017-01-13 08:39:40Z ngie $");
#include <sys/param.h>
+#include <sys/sysctl.h>
#include <sys/user.h>
-#include <sys/sysctl.h>
#include <stdlib.h>
#include <string.h>
@@ -26,7 +27,7 @@
mib[2] = KERN_PROC_FILEDESC;
mib[3] = pid;
- error = sysctl(mib, 4, NULL, &len, NULL, 0);
+ error = sysctl(mib, nitems(mib), NULL, &len, NULL, 0);
if (error)
return (NULL);
len = len * 4 / 3;
@@ -33,7 +34,7 @@
buf = malloc(len);
if (buf == NULL)
return (NULL);
- error = sysctl(mib, 4, buf, &len, NULL, 0);
+ error = sysctl(mib, nitems(mib), buf, &len, NULL, 0);
if (error) {
free(buf);
return (NULL);
@@ -44,6 +45,8 @@
eb = buf + len;
while (bp < eb) {
kf = (struct kinfo_file *)(uintptr_t)bp;
+ if (kf->kf_structsize == 0)
+ break;
bp += kf->kf_structsize;
cnt++;
}
@@ -59,6 +62,8 @@
/* Pass 2: unpack */
while (bp < eb) {
kf = (struct kinfo_file *)(uintptr_t)bp;
+ if (kf->kf_structsize == 0)
+ break;
/* Copy/expand into pre-zeroed buffer */
memcpy(kp, kf, kf->kf_structsize);
/* Advance to next packed record */
Modified: trunk/lib/libutil/kinfo_getproc.c
===================================================================
--- trunk/lib/libutil/kinfo_getproc.c 2018-06-07 01:46:38 UTC (rev 10504)
+++ trunk/lib/libutil/kinfo_getproc.c 2018-06-07 01:55:52 UTC (rev 10505)
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/lib/libutil/kinfo_getproc.c 312032 2017-01-13 08:39:40Z ngie $
*/
#include <sys/cdefs.h>
@@ -30,8 +30,8 @@
__MBSDID("$MidnightBSD$");
#include <sys/param.h>
+#include <sys/sysctl.h>
#include <sys/user.h>
-#include <sys/sysctl.h>
#include <stdlib.h>
#include <string.h>
@@ -49,7 +49,7 @@
mib[1] = KERN_PROC;
mib[2] = KERN_PROC_PID;
mib[3] = pid;
- if (sysctl(mib, 4, NULL, &len, NULL, 0) < 0)
+ if (sysctl(mib, nitems(mib), NULL, &len, NULL, 0) < 0)
return (NULL);
kipp = malloc(len);
@@ -56,7 +56,7 @@
if (kipp == NULL)
return (NULL);
- if (sysctl(mib, 4, kipp, &len, NULL, 0) < 0)
+ if (sysctl(mib, nitems(mib), kipp, &len, NULL, 0) < 0)
goto bad;
if (len != sizeof(*kipp))
goto bad;
More information about the Midnightbsd-cvs
mailing list