Add a -I option to disable the automatic -A flag for the super-user.
PR: bin/86710 Submitted by: Marcus Alves Grando MFC after: 3 days
This commit is contained in:
parent
6fe8148234
commit
7b7d153b21
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=152256
10
bin/ls/ls.1
10
bin/ls/ls.1
@ -40,7 +40,7 @@
|
||||
.Nd list directory contents
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Op Fl ABCFGHLPRSTWZabcdfghiklmnopqrstuwx1
|
||||
.Op Fl ABCFGHILPRSTWZabcdfghiklmnopqrstuwx1
|
||||
.Op Ar
|
||||
.Sh DESCRIPTION
|
||||
For each operand that names a
|
||||
@ -73,6 +73,8 @@ List all entries except for
|
||||
and
|
||||
.Pa .. .
|
||||
Always set for the super-user.
|
||||
.Fl I
|
||||
cancel this option.
|
||||
.It Fl B
|
||||
Force printing of non-printable characters (as defined by
|
||||
.Xr ctype 3
|
||||
@ -117,6 +119,12 @@ none of the
|
||||
or
|
||||
.Fl l
|
||||
options are specified.
|
||||
.It Fl I
|
||||
This option cancels the
|
||||
.Fl A
|
||||
option. Usually used by super-user when
|
||||
.Fl A
|
||||
is not necessary.
|
||||
.It Fl L
|
||||
If argument is a symbolic link, list the file or directory the link references
|
||||
rather than the link itself.
|
||||
|
24
bin/ls/ls.c
24
bin/ls/ls.c
@ -110,6 +110,8 @@ int termwidth = 80; /* default terminal width */
|
||||
static int f_kblocks; /* print size in kilobytes */
|
||||
static int f_listdir; /* list actual directory, not contents */
|
||||
static int f_listdot; /* list files beginning with . */
|
||||
static int f_nolistdot; /* don't list files beginning with . */
|
||||
static int f_forcelistdot; /* force list files beginning with . */
|
||||
int f_longform; /* long listing format */
|
||||
int f_nonprint; /* show unprintables as ? */
|
||||
static int f_nosort; /* don't sort output */
|
||||
@ -175,13 +177,9 @@ main(int argc, char *argv[])
|
||||
termwidth = atoi(p);
|
||||
}
|
||||
|
||||
/* Root is -A automatically. */
|
||||
if (!getuid())
|
||||
f_listdot = 1;
|
||||
|
||||
fts_options = FTS_PHYSICAL;
|
||||
while ((ch = getopt(argc, argv,
|
||||
"1ABCFGHLPRSTWZabcdfghiklmnopqrstuwx")) != -1) {
|
||||
"1ABCFGHILPRSTWZabcdfghiklmnopqrstuwx")) != -1) {
|
||||
switch (ch) {
|
||||
/*
|
||||
* The -1, -C, -x and -l options all override each other so
|
||||
@ -243,10 +241,14 @@ main(int argc, char *argv[])
|
||||
break;
|
||||
case 'a':
|
||||
fts_options |= FTS_SEEDOT;
|
||||
/* FALLTHROUGH */
|
||||
f_forcelistdot = 1;
|
||||
break;
|
||||
case 'A':
|
||||
f_listdot = 1;
|
||||
break;
|
||||
case 'I':
|
||||
f_nolistdot = 1;
|
||||
break;
|
||||
/* The -d option turns off the -R option. */
|
||||
case 'd':
|
||||
f_listdir = 1;
|
||||
@ -326,6 +328,10 @@ main(int argc, char *argv[])
|
||||
argc -= optind;
|
||||
argv += optind;
|
||||
|
||||
/* Root is -A automatically. */
|
||||
if (!getuid() && !f_nolistdot)
|
||||
f_listdot = 1;
|
||||
|
||||
/* Enabling of colours is conditional on the environment. */
|
||||
if (getenv("CLICOLOR") &&
|
||||
(isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE")))
|
||||
@ -490,7 +496,8 @@ traverse(int argc, char *argv[], int options)
|
||||
break;
|
||||
case FTS_D:
|
||||
if (p->fts_level != FTS_ROOTLEVEL &&
|
||||
p->fts_name[0] == '.' && !f_listdot)
|
||||
p->fts_name[0] == '.' && ((!f_listdot ||
|
||||
f_nolistdot) && !f_forcelistdot))
|
||||
break;
|
||||
|
||||
/*
|
||||
@ -650,7 +657,8 @@ display(const FTSENT *p, FTSENT *list, int options)
|
||||
}
|
||||
} else {
|
||||
/* Only display dot file if -a/-A set. */
|
||||
if (cur->fts_name[0] == '.' && !f_listdot) {
|
||||
if (cur->fts_name[0] == '.' && ((!f_listdot ||
|
||||
f_nolistdot) && !f_forcelistdot)) {
|
||||
cur->fts_number = NO_PRINT;
|
||||
continue;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user