 @@ -1,14 +1,14 @@
-.\"	$NetBSD: ls.1,v 1.72 2012/11/20 12:37:29 abs Exp $
+.\"	$NetBSD: ls.1,v 1.73 2014/02/20 18:56:36 christos Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Institute of Electrical and Electronics Engineers, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 @@ -22,35 +22,35 @@
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
 .\"
-.Dd November 20, 2012
+.Dd February 20, 2014
 .Dt LS 1
 .Os
 .Sh NAME
 .Nm ls
 .Nd list directory contents
 .Sh SYNOPSIS
 .Nm
-.Op Fl 1AaBbCcdFfghikLlMmnopqRrSsTtuWwx
+.Op Fl 1AaBbCcdFfghikLlMmnOoPpqRrSsTtuWwx
 .Op Ar
 .Sh DESCRIPTION
 For each
 .Ar file
 operand that names a file of a type other than
 directory,
 .Nm
 displays its name as well as any requested,
 associated information.
 For each
 .Ar file
 operand that names a file of type directory,
 .Nm
 @@ -173,36 +173,40 @@ commas (or a locale appropriate separato
 output.
 Overrides
 .Fl h ;
 does not override
 .Fl k .
 .It Fl m
 Stream output format; list files across the page, separated by commas.
 .It Fl n
 The same as
 .Fl l ,
 except that
 the owner and group IDs are displayed numerically rather than converting
 to a owner or group name.
 .It Fl O
 Output only leaf files (not directories), eliding other ls output.
 .It Fl o
 Include the file flags in a long
 .Pq Fl l
 output.
 If no file flags are set,
 .Dq -
 is displayed.
 (See
 .Xr chflags 1
 for a list of possible flags and their meanings.)
 .It Fl P
 Print the full pathname for each file.
 .It Fl p
 Display a slash
 .Pq Sq \&/
 immediately after each pathname that is a directory.
 .It Fl q
 Force printing of non-printable characters in file names as
 the character
 .Sq \&? ;
 this is the default when output is to a terminal.
 .It Fl R
 Recursively list subdirectories encountered.
 See also
 .Fl d .

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ls.c,v 1.70 2012/11/20 12:37:29 abs Exp $	*/
+/*	$NetBSD: ls.c,v 1.71 2014/02/20 18:56:36 christos Exp $	*/
 /*
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Michael Fischbein.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -32,27 +32,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)ls.c	8.7 (Berkeley) 8/5/94";
 #else
-__RCSID("$NetBSD: ls.c,v 1.70 2012/11/20 12:37:29 abs Exp $");
+__RCSID("$NetBSD: ls.c,v 1.71 2014/02/20 18:56:36 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <dirent.h>
 #include <err.h>
 #include <errno.h>
 #include <fts.h>
 #include <locale.h>
 @@ -101,26 +101,28 @@ int f_nosort;			/* don't sort output */
 int f_numericonly;		/* don't convert uid/gid to name */
 int f_octal;			/* print octal escapes for nongraphic characters */
 int f_octal_escape;		/* like f_octal but use C escapes if possible */
 int f_recursive;		/* ls subdirectories also */
 int f_reversesort;		/* reverse whatever sort is used */
 int f_sectime;			/* print the real time for all files */
 int f_singlecol;		/* use single column output */
 int f_size;			/* list size in short listing */
 int f_statustime;		/* use time of last mode change */
 int f_stream;			/* stream format */
 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 f_fullpath;			/* print full pathname, not filename */
 int f_leafonly;			/* when recursing, print leaf names only */
 __dead static void
 usage(void)
+{
 	(void)fprintf(stderr,
 	    "usage: %s [-1AaBbCcdFfghikLlMmnopqRrSsTtuWwx] [file ...]\n",
 	    getprogname());
 	exit(EXIT_FAILURE);
 	/* NOTREACHED */
+}
 int
 @@ -139,27 +141,27 @@ ls_main(int argc, char *argv[])
 	if (isatty(STDOUT_FILENO)) {
 		if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) == 0 &&
 		    win.ws_col > 0)
 			termwidth = win.ws_col;
 		f_column = f_nonprint = 1;
 	} else
 		f_singlecol = 1;
 	/* Root is -A automatically. */
 	if (!getuid())
 		f_listdot = 1;
 	fts_options = FTS_PHYSICAL;
-	while ((ch = getopt(argc, argv, "1ABCFLMRSTWabcdfghiklmnopqrstuwx")) != -1) {
+	while ((ch = getopt(argc, argv, "1ABCFLMOPRSTWabcdfghiklmnopqrstuwx")) != -1) {
 		switch (ch) {
 		/*
 		 * The -1, -C, -l, -m and -x options all override each other so
 		 * shell aliasing works correctly.
 		 */
 		case '1':
 			f_singlecol = 1;
 			f_column = f_columnacross = f_longform = f_stream = 0;
 			break;
 		case 'C':
 			f_column = 1;
 			f_columnacross = f_longform = f_singlecol = f_stream =
 ;
 @@ -243,29 +245,35 @@ ls_main(int argc, char *argv[])
 			f_humanize = 1;
 			kflag = 0;
 			f_commas = 0;
 			break;
 		case 'M':
 			f_humanize = 0;
 			f_commas = 1;
 			break;
 		case 'n':
 			f_numericonly = 1;
 			f_longform = 1;
 			f_column = f_columnacross = f_singlecol = f_stream = 0;
 			break;
 		case 'O':
 			f_leafonly = 1;
 			break;
 		case 'o':
 			f_flags = 1;
 			break;
 		case 'P':
 			f_fullpath = 1;
 			break;
 		case 'p':
 			f_typedir = 1;
 			break;
 		/* The -q option turns off the -B, -b and -w options. */
 		case 'q':
 			f_nonprint = 1;
 			f_octal = 0;
 			f_octal_escape = 0;
 			break;
 		case 'r':
 			f_reversesort = 1;
 			break;
 		case 'S':
 @@ -436,31 +444,33 @@ traverse(int argc, char *argv[], int opt
 			warnx("%s: %s", p->fts_name, strerror(p->fts_errno));
 			rval = EXIT_FAILURE;
 			break;
 		case FTS_D:
 			if (p->fts_level != FTS_ROOTLEVEL &&
 			    p->fts_name[0] == '.' && !f_listdot)
 				break;
 			/*
 			 * If already output something, put out a newline as
 			 * a separator.  If multiple arguments, precede each
 			 * directory with its name.
 			 */
-			if (output)
+			if (!f_leafonly) {
-				(void)printf("\n%s:\n", p->fts_path);
+				if (output)
-			else if (argc > 1) {
+					(void)printf("\n%s:\n", p->fts_path);
-				(void)printf("%s:\n", p->fts_path);
+				else if (argc > 1) {
-				output = 1;
+					(void)printf("%s:\n", p->fts_path);
 					output = 1;
+				}
+			}
 			chp = fts_children(ftsp, ch_options);
 			display(p, chp);
 			if (!f_recursive && chp != NULL)
 				(void)fts_set(ftsp, p, FTS_SKIP);
 			break;
+		}
 	error = errno;
 	(void)fts_close(ftsp);
 	errno = error;
 	if (errno)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ls.h,v 1.18 2011/03/15 03:52:38 erh Exp $	*/
+/*	$NetBSD: ls.h,v 1.19 2014/02/20 18:56:36 christos Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Michael Fischbein.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -43,26 +43,28 @@ extern int f_flags;		/* show flags assoc
 extern int f_grouponly;		/* long listing without owner */
 extern int f_humanize;		/* humanize size field */
 extern int f_commas;        /* separate size field with commas */
 extern int f_inode;		/* print inode */
 extern int f_longform;		/* long listing format */
 extern int f_octal;		/* print octal escapes for nongraphic characters */
 extern int f_octal_escape;	/* like f_octal but use C escapes if possible */
 extern int f_sectime;		/* print the real time for all files */
 extern int f_size;		/* list size in short listing */
 extern int f_statustime;	/* use time of last mode change */
 extern int f_type;		/* add type character for non-regular files */
 extern int f_typedir;		/* add type character for directories */
 extern int f_nonprint;		/* show unprintables as ? */
 extern int f_fullpath;		/* print full pathname, not filename */
 extern int f_leafonly;		/* when recursing, print leaf names only */
 typedef struct {
 	FTSENT *list;
 	u_int64_t btotal;
 	u_int64_t stotal;
 	int entries;
 	unsigned int maxlen;
 	int s_block;
 	int s_flags;
 	int s_group;
 	int s_inode;
 	int s_nlink;
 	int s_size;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: print.c,v 1.52 2013/05/02 22:43:55 zafer Exp $	*/
+/*	$NetBSD: print.c,v 1.53 2014/02/20 18:56:36 christos Exp $	*/
 /*
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Michael Fischbein.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)print.c	8.5 (Berkeley) 7/28/94";
 #else
-__RCSID("$NetBSD: print.c,v 1.52 2013/05/02 22:43:55 zafer Exp $");
+__RCSID("$NetBSD: print.c,v 1.53 2014/02/20 18:56:36 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <err.h>
 #include <errno.h>
 #include <fts.h>
 #include <grp.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 @@ -62,50 +62,84 @@ __RCSID("$NetBSD: print.c,v 1.52 2013/05
 extern int termwidth;
 static int	printaname(FTSENT *, int, int);
 static void	printlink(FTSENT *);
 static void	printtime(time_t);
 static void	printtotal(DISPLAY *dp);
 static int	printtype(u_int);
 static time_t	now;
 #define	IS_NOPRINT(p)	((p)->fts_number == NO_PRINT)
 static int
 safe_printpath(const FTSENT *p) {
 	int chcnt;
 	if (f_fullpath) {
 		chcnt = safe_print(p->fts_path);
 		chcnt += safe_print("/");
 	} else
 		chcnt = 0;
 	return chcnt + safe_print(p->fts_name);
+}
 static int
 printescapedpath(const FTSENT *p) {
 	int chcnt;
 	if (f_fullpath) {
 		chcnt = printescaped(p->fts_path);
 		chcnt += printescaped("/");
 	} else
 		chcnt = 0;
 	return chcnt + printescaped(p->fts_name);
+}
 static int
 printpath(const FTSENT *p) {
 	if (f_fullpath)
 		return printf("%s/%s", p->fts_path, p->fts_name);
 	else
 		return printf("%s", p->fts_path);
+}
 void
 printscol(DISPLAY *dp)
+{
 	FTSENT *p;
 	for (p = dp->list; p; p = p->fts_link) {
 		if (IS_NOPRINT(p))
 			continue;
 		(void)printaname(p, dp->s_inode, dp->s_block);
 		(void)putchar('\n');
+	}
+}
 void
 printlong(DISPLAY *dp)
+{
 	struct stat *sp;
 	FTSENT *p;
 	NAMES *np;
 	char buf[20], szbuf[5];
 	now = time(NULL);
-	printtotal(dp);		/* "total: %u\n" */
+	if (!f_leafonly)
 		printtotal(dp);		/* "total: %u\n" */
 	for (p = dp->list; p; p = p->fts_link) {
 		if (IS_NOPRINT(p))
 			continue;
 		sp = p->fts_statp;
 		if (f_inode)
 			(void)printf("%*lu ", dp->s_inode,
 			    (unsigned long)sp->st_ino);
 		if (f_size) {
 			if (f_humanize) {
 				if ((humanize_number(szbuf, sizeof(szbuf),
 				    sp->st_blocks * S_BLKSIZE,
 				    "", HN_AUTOSCALE,
 @@ -141,31 +175,31 @@ printlong(DISPLAY *dp)
 				(void)printf("%*s ", dp->s_size, szbuf);
 			} else {
 				(void)printf(f_commas ? "%'*llu " : "%*llu ",
 				    dp->s_size, (unsigned long long)
 				    sp->st_size);
+			}
 		if (f_accesstime)
 			printtime(sp->st_atime);
 		else if (f_statustime)
 			printtime(sp->st_ctime);
 		else
 			printtime(sp->st_mtime);
 		if (f_octal || f_octal_escape)
-			(void)safe_print(p->fts_name);
+			(void)safe_printpath(p);
 		else if (f_nonprint)
-			(void)printescaped(p->fts_name);
+			(void)printescapedpath(p);
 		else
-			(void)printf("%s", p->fts_name);
+			(void)printpath(p);
 		if (f_type || (f_typedir && S_ISDIR(sp->st_mode)))
 			(void)printtype(sp->st_mode);
 		if (S_ISLNK(sp->st_mode))
 			printlink(p);
 		(void)putchar('\n');
+	}
+}
 void
 printcol(DISPLAY *dp)
+{
 	static FTSENT **array;
 @@ -336,31 +370,31 @@ printaname(FTSENT *p, int inodefield, in
 		if (f_humanize) {
 			if ((humanize_number(szbuf, sizeof(szbuf), sp->st_size,
 			    "", HN_AUTOSCALE,
 			    (HN_DECIMAL | HN_B | HN_NOSPACE))) == -1)
 				err(1, "humanize_number");
 			chcnt += printf("%*s ", sizefield, szbuf);
 		} else {
 			chcnt += printf(f_commas ? "%'*llu " : "%*llu ",
 			    sizefield, (unsigned long long)
 			    howmany(sp->st_blocks, blocksize));
+		}
+	}
 	if (f_octal || f_octal_escape)
-		chcnt += safe_print(p->fts_name);
+		chcnt += safe_printpath(p);
 	else if (f_nonprint)
-		chcnt += printescaped(p->fts_name);
+		chcnt += printescapedpath(p);
 	else
-		chcnt += printf("%s", p->fts_name);
+		chcnt += printpath(p);
 	if (f_type || (f_typedir && S_ISDIR(sp->st_mode)))
 		chcnt += printtype(sp->st_mode);
 	return (chcnt);
+}
 static void
 printtime(time_t ftime)
+{
 	int i;
 	const char *longstring;
 	if ((longstring = ctime(&ftime)) == NULL) {
 			   /* 012345678901234567890123 */