diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-07-09 00:37:54 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-07-09 00:37:54 +0000 |
| commit | 6d7c617fed66555616f380773c3e1495c9d77cb6 (patch) | |
| tree | fab2c5c2bb67e79e96a40272b8b87204c243d731 | |
| parent | 0ed1599c556e48c6d71e2d17e3e36e879e918ff3 (diff) | |
-Wall
| -rw-r--r-- | bin/ls/ls.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 392f638631b..1c75f2a31db 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ls.c,v 1.14 2000/07/19 19:27:36 mickey Exp $ */ +/* $OpenBSD: ls.c,v 1.15 2001/07/09 00:37:53 deraadt 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.14 2000/07/19 19:27:36 mickey Exp $"; +static char rcsid[] = "$OpenBSD: ls.c,v 1.15 2001/07/09 00:37:53 deraadt Exp $"; #endif #endif /* not lint */ @@ -577,13 +577,14 @@ mastercmp(a, b) if (b_info == FTS_ERR) return (0); - if (a_info == FTS_NS || b_info == FTS_NS) + if (a_info == FTS_NS || b_info == FTS_NS) { if (b_info != FTS_NS) return (1); else if (a_info != FTS_NS) return (-1); else return (namecmp(*a, *b)); + } if (a_info != b_info && (*a)->fts_level == FTS_ROOTLEVEL && !f_listdir) { |