diff options
| -rw-r--r-- | bin/ls/Makefile | 4 | ||||
| -rw-r--r-- | bin/ls/extern.h | 3 | ||||
| -rw-r--r-- | bin/ls/ls.c | 11 | ||||
| -rw-r--r-- | libexec/ftpd/Makefile | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/bin/ls/Makefile b/bin/ls/Makefile index c0e1ac9ef4e..09fa966184d 100644 --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.5 1999/02/23 23:54:16 art Exp $ +# $OpenBSD: Makefile,v 1.6 2000/07/19 19:27:35 mickey Exp $ PROG= ls -SRCS= cmp.c stat_flags.c ls.c main.c print.c util.c +SRCS= cmp.c ls.c main.c print.c util.c .include <bsd.prog.mk> diff --git a/bin/ls/extern.h b/bin/ls/extern.h index 2aaddae1dd4..3e7764be8fe 100644 --- a/bin/ls/extern.h +++ b/bin/ls/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.5 1999/11/26 23:02:54 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.6 2000/07/19 19:27:36 mickey Exp $ */ /* $NetBSD: extern.h,v 1.5 1995/03/21 09:06:24 cgd Exp $ */ /*- @@ -47,7 +47,6 @@ int revstatcmp __P((const FTSENT *, const FTSENT *)); int sizecmp __P((const FTSENT *, const FTSENT *)); int revsizecmp __P((const FTSENT *, const FTSENT *)); -char *flags_to_string __P((u_int, char *)); int putname __P((char *)); void printcol __P((DISPLAY *)); void printacol __P((DISPLAY *)); diff --git a/bin/ls/ls.c b/bin/ls/ls.c index f44230a3e00..392f638631b 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ls.c,v 1.13 1999/05/01 23:54:47 deraadt Exp $ */ +/* $OpenBSD: ls.c,v 1.14 2000/07/19 19:27:36 mickey Exp $ */ /* $NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ls.c 8.7 (Berkeley) 8/5/94"; #else -static char rcsid[] = "$OpenBSD: ls.c,v 1.13 1999/05/01 23:54:47 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ls.c,v 1.14 2000/07/19 19:27:36 mickey Exp $"; #endif #endif /* not lint */ @@ -495,8 +495,9 @@ display(p, list) if ((glen = strlen(group)) > maxgroup) maxgroup = glen; if (f_flags) { - flags = - flags_to_string(sp->st_flags, "-"); + flags = fflagstostr(sp->st_flags); + if (*flags == '\0') + flags = "-"; if ((flen = strlen(flags)) > maxflags) maxflags = flen; } else @@ -518,6 +519,8 @@ display(p, list) if (f_flags) { np->flags = &np->data[ulen + glen + 2]; (void)strcpy(np->flags, flags); + if (*flags != '-') + free(flags); } cur->fts_pointer = np; } diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index ceebf9e06fa..138909dd3d1 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2000/03/01 17:27:28 deraadt Exp $ +# $OpenBSD: Makefile,v 1.17 2000/07/19 19:28:02 mickey Exp $ # $NetBSD: Makefile,v 1.13 1996/02/16 02:07:41 cgd Exp $ # @(#)Makefile 8.2 (Berkeley) 4/4/94 @@ -14,7 +14,7 @@ CLEANFILES+=ftpcmd.c y.tab.h LSDIR = ${.CURDIR}/../../bin/ls .PATH: ${LSDIR} -SRCS += ls.c cmp.c print.c stat_flags.c util.c +SRCS += ls.c cmp.c print.c util.c CFLAGS += -I${LSDIR} # not really used |