diff options
| author | joe <joe@FreeBSD.org> | 2000-06-17 14:19:33 +0000 |
|---|---|---|
| committer | joe <joe@FreeBSD.org> | 2000-06-17 14:19:33 +0000 |
| commit | 8de98cc2fa7b119cc8deb33c61c9496d25825b49 (patch) | |
| tree | 33363d4028bb162e624a3a2c5257ab020378f6e0 /bin/ls | |
| parent | 3e8b2c512359fd536c5f66fbd9e265064d461886 (diff) | |
| download | FreeBSD-src-8de98cc2fa7b119cc8deb33c61c9496d25825b49.zip FreeBSD-src-8de98cc2fa7b119cc8deb33c61c9496d25825b49.tar.gz | |
Switch over to using the new fflagstostr and strtofflags library calls.
Diffstat (limited to 'bin/ls')
| -rw-r--r-- | bin/ls/Makefile | 3 | ||||
| -rw-r--r-- | bin/ls/extern.h | 1 | ||||
| -rw-r--r-- | bin/ls/ls.c | 11 |
3 files changed, 9 insertions, 6 deletions
diff --git a/bin/ls/Makefile b/bin/ls/Makefile index 86b91b4..96dffe1 100644 --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -3,8 +3,7 @@ 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 .if !defined(RELEASE_BUILD_FIXIT) CFLAGS+= -DCOLORLS diff --git a/bin/ls/extern.h b/bin/ls/extern.h index 9ba00ee..4b27be6 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 0bf1666..69b8d77 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -78,8 +78,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 **)); @@ -605,7 +603,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 @@ -627,6 +631,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; } |
