From e61b6106c66d125e1558b78333799c927f77be2d Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Wed, 8 Aug 2001 10:02:59 +0000
Subject: [PATCH] make -a and -A do the same as in ls(1)

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10445 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/ftpd/ls.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/appl/ftp/ftpd/ls.c b/appl/ftp/ftpd/ls.c
index 2f7841185..1ab551483 100644
--- a/appl/ftp/ftpd/ls.c
+++ b/appl/ftp/ftpd/ls.c
@@ -107,6 +107,7 @@ free_fileinfo(struct fileinfo *f)
 #define LS_DISP_LONG	(1 << 8)
 #define LS_DISP_COLUMN	(2 << 8)
 #define LS_DISP_CROSS	(3 << 8)
+#define LS_IGNORE_DOTDIR (1 << 10)
 
 #ifndef S_ISTXT
 #define S_ISTXT S_ISVTX
@@ -630,12 +631,13 @@ list_dir(FILE *out, const char *directory, int flags)
 	void *tmp;
 
 	if(ent->d_name[0] == '.') {
+	    if (ent->d_name[1] == 0 && flags & LS_IGNORE_DOTDIR) /* Ignore . */
+	        continue;
+	    if (ent->d_name[1] == '.' && ent->d_name[2] == 0
+		&& flags & LS_IGNORE_DOTDIR) /* Ignore .. */
+	        continue;
 	    if (flags & LS_IGNORE_DOT)
 	        continue;
-	    if (ent->d_name[1] == 0) /* Ignore . */
-	        continue;
-	    if (ent->d_name[1] == '.' && ent->d_name[2] == 0) /* Ignore .. */
-	        continue;
 	}
 	tmp = realloc(files, (n_files + 1) * sizeof(*files));
 	if (tmp == NULL) {
@@ -661,7 +663,7 @@ list_dir(FILE *out, const char *directory, int flags)
 void
 builtin_ls(FILE *out, const char *file)
 {
-    int flags = LS_SORT_NAME | LS_IGNORE_DOT | LS_DISP_LONG;
+    int flags = LS_SORT_NAME | LS_IGNORE_DOT | LS_IGNORE_DOTDIR | LS_DISP_LONG;
 
     if(*file == '-') {
 	const char *p;
@@ -671,6 +673,8 @@ builtin_ls(FILE *out, const char *file)
 		flags = (flags & ~LS_DISP_MODE);
 		break;
 	    case 'a':
+		flags &= ~(LS_IGNORE_DOT | LS_IGNORE_DOTDIR);
+		break;
 	    case 'A':
 		flags &= ~LS_IGNORE_DOT;
 		break;