5 files changed, 16 insertions, 16 deletions

diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 8496dd9cdf58..1ab70dc78a17 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -3,7 +3,6 @@
 
 
 PROG=	ls
-SRCS=	cmp.c setflags.c ls.c print.c util.c
-.PATH:	${.CURDIR}/../../lib/libc/gen
+SRCS=	cmp.c ls.c print.c util.c
 
 .include <bsd.prog.mk>
diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index fd26b372c5f7..f17607394d3e 100644
--- a/bin/ls/extern.h
+++ b/bin/ls/extern.h
@@ -43,7 +43,6 @@ int	 revnamecmp __P((const FTSENT *, const FTSENT *));
 int	 statcmp __P((const FTSENT *, const FTSENT *));
 int	 revstatcmp __P((const FTSENT *, const FTSENT *));
 
-char	*flags_to_string __P((u_long, char *));
 void	 prcopy __P((char *, char *, int));
 void	 printcol __P((DISPLAY *));
 void	 printlong __P((DISPLAY *));
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 754236b9450f..5a637f5f848f 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -74,8 +74,6 @@ static const char rcsid[] =
  */
 #define	STRBUF_SIZEOF(t)	(1 + CHAR_BIT * sizeof(t) / 3 + 1)
 
-char *getflags __P((u_long, char *));
-
 static void	 display __P((FTSENT *, FTSENT *));
 static u_quad_t	 makenines __P((u_long));
 static int	 mastercmp __P((const FTSENT **, const FTSENT **));
@@ -545,7 +543,13 @@ display(p, list)
 				if ((glen = strlen(group)) > maxgroup)
 					maxgroup = glen;
 				if (f_flags) {
-					flags = getflags(sp->st_flags, "-");
+					flags = fflagstostr(sp->st_flags);
+					if (flags != NULL && *flags == '\0') {
+						free(flags);
+						flags = strdup("-");
+					}
+					if (flags == NULL)
+						err(1, NULL);
 					if ((flen = strlen(flags)) > maxflags)
 						maxflags = flen;
 				} else
@@ -567,6 +571,7 @@ display(p, list)
 				if (f_flags) {
 					np->flags = &np->data[ulen + glen + 2];
 				  	(void)strcpy(np->flags, flags);
+					free(flags);
 				}
 				cur->fts_pointer = np;
 			}
diff --git a/bin/rm/Makefile b/bin/rm/Makefile
index 2bbcdf89effc..7b85cdf90fc0 100644
--- a/bin/rm/Makefile
+++ b/bin/rm/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PROG=	rm
-SRCS=	rm.c setflags.c
+SRCS=	rm.c
 
 LINKS=	${BINDIR}/rm ${BINDIR}/unlink
 MLINKS=	rm.1 unlink.1
-.PATH:	${.CURDIR}/../../lib/libc/gen
 
 .include <bsd.prog.mk>
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 3c9071f45fb1..29c6aa7dfa56 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -61,8 +61,6 @@ static const char rcsid[] =
 #include <sysexits.h>
 #include <unistd.h>
 
-char	*getflags __P((u_long, char *));
-
 int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok;
 uid_t uid;
 
@@ -424,7 +422,7 @@ check(path, name, sp)
 	struct stat *sp;
 {
 	int ch, first;
-	char modep[15], flagsp[128];
+	char modep[15], *flagsp;
 
 	/* Check -i first. */
 	if (iflag)
@@ -442,15 +440,15 @@ check(path, name, sp)
 		    (!(sp->st_flags & (UF_APPEND|UF_IMMUTABLE)) || !uid)))
 			return (1);
 		strmode(sp->st_mode, modep);
-		strcpy(flagsp, getflags(sp->st_flags, NULL));
-		if (*flagsp)
-			strcat(flagsp, " ");
-		(void)fprintf(stderr, "override %s%s%s/%s %sfor %s? ",
+		if ((flagsp = fflagstostr(sp->st_flags)) == NULL)
+			err(1, NULL);
+		(void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ",
 		    modep + 1, modep[9] == ' ' ? "" : " ",
 		    user_from_uid(sp->st_uid, 0),
 		    group_from_gid(sp->st_gid, 0),
-		    *flagsp ? flagsp : "",
+		    *flagsp ? flagsp : "", *flagsp ? " " : "", 
 		    path);
+		free(flagsp);
 	}
 	(void)fflush(stderr);