oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

make -a and -A do the same as in ls(1)

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10445 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-08-08 10:02:59 +00:00
parent 7ed1764c7d
commit e61b6106c6
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
appl/ftp/ftpd/ls.c
View File

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