diff options
Diffstat (limited to 'bin/ls')
| -rw-r--r-- | bin/ls/ls.1 | 11 | ||||
| -rw-r--r-- | bin/ls/ls.c | 18 | ||||
| -rw-r--r-- | bin/ls/print.c | 7 |
3 files changed, 7 insertions, 29 deletions
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index 41fe53bc8af..5f596d682cf 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ls.1,v 1.44 2005/03/24 22:53:15 jmc Exp $ +.\" $OpenBSD: ls.1,v 1.45 2005/06/15 17:47:17 millert Exp $ .\" $NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $ .\" .\" Copyright (c) 1980, 1990, 1991, 1993, 1994 @@ -41,7 +41,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm ls -.Op Fl 1AaCcdFfghikLlmnopqRrSsTtuWx +.Op Fl 1AaCcdFfghikLlmnopqRrSsTtux .Op Ar file ... .Sh DESCRIPTION For each operand that names a @@ -102,9 +102,6 @@ after each that is executable, an at sign .Pq Sq @ after each symbolic link, -a percent sign -.Pq Sq % -after each whiteout, an equal sign .Pq Sq = after each socket, @@ -194,8 +191,6 @@ for sorting .Pq Fl t or printing .Pq Fl l , Fl n . -.It Fl W -Display whiteouts when scanning directories. .It Fl x Multi-column output sorted across the page rather than down the page. .El @@ -302,8 +297,6 @@ symbolic link socket link .It Sy p .Tn FIFO -.It Sy w -whiteout .It Sy \- regular file .El diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 7c54ebfd212..b5b6fe3e958 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ls.c,v 1.23 2005/03/10 00:22:08 jaredy Exp $ */ +/* $OpenBSD: ls.c,v 1.24 2005/06/15 17:47:17 millert Exp $ */ /* $NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $ */ /* @@ -43,7 +43,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.23 2005/03/10 00:22:08 jaredy Exp $"; +static char rcsid[] = "$OpenBSD: ls.c,v 1.24 2005/06/15 17:47:17 millert Exp $"; #endif #endif /* not lint */ @@ -105,7 +105,6 @@ int f_stream; /* stream format */ int f_dirname; /* if precede with directory name */ int f_type; /* add type character for non-regular files */ int f_typedir; /* add type character for directories */ -int f_whiteout; /* show whiteout entries */ int rval; @@ -134,7 +133,7 @@ ls_main(int argc, char *argv[]) f_listdot = 1; fts_options = FTS_PHYSICAL; - while ((ch = getopt(argc, argv, "1ACFLRSTWacdfghiklmnopqrstux")) != -1) { + while ((ch = getopt(argc, argv, "1ACFLRSTacdfghiklmnopqrstux")) != -1) { switch (ch) { /* * The -1, -C and -l, -m and -x options all override each @@ -236,9 +235,6 @@ ls_main(int argc, char *argv[]) case 't': sortkey = BY_TIME; break; - case 'W': - f_whiteout = 1; - break; default: usage(); } @@ -261,14 +257,6 @@ ls_main(int argc, char *argv[]) if (!f_longform && !f_listdir && !f_type) fts_options |= FTS_COMFOLLOW; - /* - * If -W, show whiteout entries - */ -#ifdef FTS_WHITEOUT - if (f_whiteout) - fts_options |= FTS_WHITEOUT; -#endif - /* If -l or -s, figure out block size. */ if (f_longform || f_size) { if (!kflag) diff --git a/bin/ls/print.c b/bin/ls/print.c index 40ca68b4098..44f49df0c6f 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.23 2005/01/10 20:16:15 otto Exp $ */ +/* $OpenBSD: print.c,v 1.24 2005/06/15 17:47:17 millert Exp $ */ /* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */ /* @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.5 (Berkeley) 7/28/94"; #else -static char rcsid[] = "$OpenBSD: print.c,v 1.23 2005/01/10 20:16:15 otto Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.24 2005/06/15 17:47:17 millert Exp $"; #endif #endif /* not lint */ @@ -338,9 +338,6 @@ printtype(u_int mode) case S_IFSOCK: (void)putchar('='); return (1); - case S_IFWHT: - (void)putchar('%'); - return (1); } if (mode & (S_IXUSR | S_IXGRP | S_IXOTH)) { (void)putchar('*'); |