From b4f7193e80f4381dd023511863002bb54b4cc094 Mon Sep 17 00:00:00 2001
From: joe <joe@FreeBSD.org>
Date: Fri, 28 Dec 2001 19:26:06 +0000
Subject: Mop up some warnings.

---
 bin/ls/extern.h | 2 +-
 bin/ls/lomac.c  | 1 +
 bin/ls/ls.c     | 2 +-
 bin/ls/print.c  | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index 45b908d..f758a23 100644
--- a/bin/ls/extern.h
+++ b/bin/ls/extern.h
@@ -51,7 +51,7 @@ int	 len_octal __P((const char *, int));
 int	 prn_octal __P((const char *));
 int	 prn_printable __P((const char *));
 #ifdef COLORLS
-void	 parsecolors __P((char *cs));
+void	 parsecolors __P((const char *cs));
 void     colorquit __P((int));
 
 extern  char    *ansi_fgcol;
diff --git a/bin/ls/lomac.c b/bin/ls/lomac.c
index 8dbd76c..b92a08e 100644
--- a/bin/ls/lomac.c
+++ b/bin/ls/lomac.c
@@ -49,6 +49,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include "lomac.h"
 
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index b2848c2..7791d20 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -585,7 +585,7 @@ display(p, list)
 		if (cur->fts_namelen > maxlen)
 			maxlen = cur->fts_namelen;
 		if (f_octal || f_octal_escape) {
-		        int t = len_octal(cur->fts_name, cur->fts_namelen);
+		        u_long t = len_octal(cur->fts_name, cur->fts_namelen);
 			if (t > maxlen) maxlen = t;
 		}
 		if (needstats) {
diff --git a/bin/ls/print.c b/bin/ls/print.c
index f0fb670..af1b275 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -94,7 +94,7 @@ typedef enum Colors {
 	C_NUMCOLORS	/* just a place-holder */
 } Colors;
 
-char *defcolors = "exfxcxdxbxegedabagacad";
+const char *defcolors = "exfxcxdxbxegedabagacad";
 
 /* colors for file types */
 static struct {
@@ -468,7 +468,7 @@ colortype(mode)
 
 void
 parsecolors(cs)
-	char	*cs;
+	const char *cs;
 {
 	int	i;
 	int	j;
-- 
cgit v1.1