From 1888d833acac54bc81e87d2052385430472a65f6 Mon Sep 17 00:00:00 2001
From: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
Date: Thu, 23 May 2019 11:22:05 -0500
Subject: bin/ls: make buildable against libbsd

---
 bin/ls/util.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'bin/ls/util.c')

diff --git a/bin/ls/util.c b/bin/ls/util.c
index 61b0fda..e87c56b 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -32,25 +32,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)util.c	8.5 (Berkeley) 4/28/95";
-#else
-__RCSID("$NetBSD: util.c,v 1.34 2011/08/29 14:44:21 joerg Exp $");
-#endif
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <bsd/vis.h>
+
 #include <err.h>
 #include <fts.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <vis.h>
 #include <wchar.h>
 #include <wctype.h>
 
@@ -69,7 +61,7 @@ safe_print(const char *src)
 		flags |= VIS_CSTYLE;
 
 	len = strlen(src);
-	if (len != 0 && SIZE_T_MAX/len <= 4) {
+	if (len != 0 && UINT_MAX/len <= 4) {
 		errx(EXIT_FAILURE, "%s: name too long", src);
 		/* NOTREACHED */
 	}
-- 
cgit v1.2.3-70-g09d2