Add feature for usr.sbin/newsyslog.c: accept human unit suffix for si…

…ze fileds in configuration file.

Use `expand_number(3)` function instead of parsing manually.

usr.sbin/newsyslog/Makefile

@@ -6,7 +6,7 @@ CONFS=	newsyslog.conf
 PROG=	newsyslog
 MAN=	newsyslog.8 newsyslog.conf.5
 SRCS=	newsyslog.c ptimes.c
-LIBADD=	sbuf
+LIBADD=	sbuf util
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

usr.sbin/newsyslog/newsyslog.c

@@ -77,6 +77,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <libgen.h>
+#include <libutil.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
@@ -1335,8 +1336,21 @@ parse_file(FILE *cf, struct cflist *work_p, struct cflist *glob_p,
 			badline("malformed line (missing fields):\n%s",
 			    errline);
 		*parse = '\0';
-		if (isdigitch(*q))
-			working->trsize = atoi(q);
+		if (isdigitch(*q)) {
+			size_t last_digit = q[strlen(q) - 1];
+			if ('0' <= last_digit && last_digit <= '9')
+				working->trsize = atoi(q);
+			else {
+				uint64_t trsize = 0;
+				if (expand_number(q, &trsize) == 0)
+					working->trsize = trsize / 1024;
+				else {
+					working->trsize = -1;
+					warnx("Invalid value of '%s' for 'size' in line:\n%s",
+						q, errline);
+				}
+			}
+		}
 		else if (strcmp(q, "*") == 0)
 			working->trsize = -1;
 		else {