mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-04 23:35:36 -08:00
Code

Always print the directory name in -R mode; matches historical behavior.

Browse Source 
Previously, our ls would only print the directory name when listing
more than one directory, which is the correct behavior for non-recursive
ls but not for -R mode.  OK deraadt@
This commit is contained in:
millert 2020-07-06 00:55:05 +00:00
parent b352e5558a
commit b3b446690c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/ls/ls.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ls.c,v 1.52 2020/07/06 00:51:51 millert Exp $ */
/* $OpenBSD: ls.c,v 1.53 2020/07/06 00:55:05 millert Exp $ */
/* $NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $ */
/*
@ -381,7 +381,7 @@ traverse(int argc, char *argv[], int options)
*/
if (output)
(void)printf("\n%s:\n", p->fts_path);
else if (argc > 1) {
else if (f_recursive || argc > 1) {
(void)printf("%s:\n", p->fts_path);
output = 1;
}