PR/57892: Roberto Branco: Print full pathname in error messages

Fix skipping of directories that begin with a '.' in -R mode.
It is not enough to avoid displaying the contents of the directory,
we need to set FTS_SKIP to avoid descending into any subdirs too.
Otherwise, if a ".foo" directory has a subdirectory "bar", ls will
descend into bar and display its contents. From Todd Miller

branches: 1.76.12;
white space

branches: 1.75.2; 1.75.4;
PR 50997 David Binderman: fix format strings

Apply diff from Igor Sobrado <isd@orion.ciencias.uniovi.es>:

We have written a diff to our ls(1) to recover the traditional behaviour
of -f implying -a. This change does not only accommodates POSIX.1
but also matches traditional UNIX.

OpenBSD commit message:

CVSROOT: /cvs
Module name: src
Changes by: sobrado@cvs.openbsd.org 2014/03/31 14:54:37

Modified files:
bin/ls : ls.1 ls.c

Log message:
restore the traditional behavior of -f implying -a; apparently Keith Bostic
forgot to restore it when the -f flag was put back on 2nd of September 1989,
after being removed on 16th of August as a consequence of issues getting it
working over NFS, so deviation from traditional UNIX behavior in all BSDs
looks like an historical accident; as a side effect, this change accommodates
behavior of this option to IEEE Std 1003.1-2008 (``POSIX.1'').

joint work with jmc@ (who found the inaccuracy in our implementation),
schwarze@ (who provided a detailed tracking of historical facts) and millert@

ok millert@, schwarze@

add u option to getopt again.

Add -X (don't cross mount points when recursing) from tls@

Add -O (only leaf files) and -P (print full path), from tls@

PR/47167
ls.1:
- Sort options in `SYNOPSIS', the option list, and texts within
the man page;
- improve wording;
- improve macro usage;
- use more consistency regarding (locations for) information about
which options override which;
- cross-reference `-d' and `-R';
- simplify description of `-k', removing redundant and unneeded
information;
- sort entry type list (but leave `-a' and `-A' as they are, given
their meaning);
- correct / augment description of `BLOCKSIZE' environment variable
in `ENVIRONMENT' section;
- bump date.

ls.c:
- Sort options in `usage';
- augment comment about when to figure out block size.

branches: 1.69.2; 1.69.8;
Move usage and mark it static+dead

PR#7540, add a -M option to ls which causes sizes (and number of blocks) to be
displayed with comma separators (or a locale specific separator).

Add #include <sys/param.h> for howmany().

fix -Wsign-compare issues

branches: 1.65.6;
Change '-n' so that it implies '-l' rather than requires '-l'.
Brings ls(1) closer to POSIX.1 2004.
Per discussion with Thomas Klausner and Igor Sobrado.

Remove the \n and tabs from the __COPYRIGHT() strings.

branches: 1.63.12;
Complete the move of string_to_flags() and flags_to_string() from the
bin/ls sources to libutil:
o Bump libutil minor version number
o Fix uses to include <util.h> to pick up the function definitions
o Fix most uses of flags_to_string() to release the now-malloc()ed result

Pass lint. From Anon Ymous

PR/34499: mac at S dot culver dot net: ls allocates more memory than needed
Applied patch, thanks!

from zafer: you can have either -k or -h but not both since it does not make
sense.

branches: 1.59.2;
Coverity CID 1755: Add fts_close() in traverse.

Rather than '-h' suppressing '-s' when using '-l', make it display
the blocks used in human readable form, as suggested by Alan Barrett
and Daniel Carosone.

Honor the COLUMNS variable even when producing output not to a terminal,
as long as a specific format (that could use COLUMNS) was requested.
This makes

env COLUMNS=50 ls -C > file

not surprise the user who clearly wanted some specific output in the file.

- Add -h to usage.
- Use set/getprogname(3).

Fix bug with previous change- always initialise d.s_block. Now "ls -1sh"
works.
XXX: ls -sh now always uses 4 chars for the size column width even if it
needs less than that.

KNF - wrap long lines.

implement -h(umanize).

from David P. Reese Jr. in PR bin/23870.

After last weeks addition of the '-b' flag, add '-B' and '-w' flags,
suggested by uwe@, inspired by FreeBSD. The three flags override
each other (and the '-q' flag) and behave as follows:

-B Force printing of non-printable characters in file names as
\xxx, where xxx is the numeric value of the character in octal.

-b As -B, but use C escape codes whenever possible.

-w Force raw printing of non-printable characters. This is the
default when output is not to a terminal.

Implement '-b' option, which, following FreeBSD, Linux and (I think) Solaris
prints octal escapes for nongraphic characters.

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22249, verified by myself.

Pass a NULL to getbsize() for any arguments that aren't needed, and
remove the otherwise unused variables.

If both -g and -l options are present, let -l take precedence over -g,
as requested by several users.

POSIX-2001 is unclear on conflicting option letters as far as the -g
option is concerned; a clarification request will be made.

Addresses PR bin/21519 by Geoff Wing.

Add a FALLTHROUGH to keep lint happy.

make -g behave as it should according to SUSv3 (long listing without
owner).

ok'd by kleink@.

Need to initialise the blocksize variable if the -i option is used
too. The code in display() could possibly be a bit smarter about this
requirement...

Fixes the problem in PR bin/18321 from David Laight and PR bin/18436
from FUKAUMI Naoki.

Use the output blocksize when computing how much room to leave for the
-s option, to suppress unnecessary leading spaces.

convert to new KNF

Do not modify the file name when not printing non-printables, also do
it consistently with the file name and possible symbolic link target.

fixes bin/10385 and bin/10384

branches: 1.41.2;
- Fix a typo that when group_from_gid is failed (though it merely fails
on NetBSD), numeric gid string is used as `user'.
- Don't mix use %u and %d for numeric uid/gid.
- Share temporary buffer.

Since our gcc doesn't warn about NULL format strings anymore, we can
fix the incorrect err(1, "%s", "") et al.
Closes PR bin/7592 by cgd.

Call setlocale(3) to use localization in "ls" as suggested by
Jens A Nilsson in PR bin/8730.

branches: 1.38.2;
Rename ls.c::main() -> ls.c::ls_main(), and add a wrapper in main.c::main().
This allows other programs to link in against ls (e.g, ftpd), without having
to have hacks to deal with multiple main()s.

Yes, I know this is ugly. The clean alternative (move lots of this
into libutil, yada yada yada) isn't fun, and the effort probably isn't
justified...

If an error is encountered, exit with non-zero status.

Based on FreeBSD fix (in 1996!), and fixes PR bin/7514 from
Jorgen Pehrson.

branches: 1.36.2;
Add support for the XCU5 -p option (-F restricted to directories).

Implement 1003.2 -m option (stream output format).

%q -> %ll

include termios.h for struct winsize

Check for NULL value returned by user_from_uid and group_from_gid and DTRT,
rather than crash.

Add some braces to make egcs happy.

Delint.

Delint.

Slight code reduction.

__AUDIT__ cleanup.

* blocks can be 64bit (not u_long), so calculate and display accordingly
* cleanup some other typedamage (int is as good as u_long)
* remove unused variables

Deal with GCC warning.

* implement -x; sort columns across the page rather than down the page
* in printcol(), don't bother building an index to the linked list if
only printing one column with printscol()...
* implement -n; prevent [gu]id->name mapping in long listings.
inspired by openbsd, but does *not* imply -l by itself.
* fix sorting with -d (or mismatched types in general). (from openbsd).
* document -g. (from openbsd).

Automatically resize the major and minor number fields, and DTRT if the size
field is not the same size.

branches: 1.22.2;
Add some casts to printf args to keep the compiler happy on the Alpha.

include <pwd.h> and <grp.h> to bring prototypes into scope.

remove user_from_uid and group_from_gid prototypes.

Fix compiler warnings.
Add WARNS=1

Sort FTS_NS entries by name, just so the order is well-defined.

Partition FTS_NS entries from others, to avoid confusing qsort().
Don't bother to order the FTS_NS entries amongst themselves.

branches: 1.16.4;
Changed so that COLUMNS environment variable will override the value
obtained via the TIOCGWINSIZ ioctl. This is required by POSIX.2, see
section 4.39.5.3.

Sync with 4.4lite2

convert to new RCS id conventions.

Sync with CSRG.

Merge with 4.4-Lite version.

Changed traverse() and display() so that errors are reported when
they are first detected in display(), rather than waiting until later
in traverse().

The old code allowed "Can not read directory" error messages to be
left unreported unless the -R (recurse) option was used.

"yet" on quad_t/off_t things. (not noticed on i386 becuase of endian I guess.)

(1) fixup getbsize() calls
(2) convert to use err(), warn(), and warnx(), as appropriate.

Patches from Thomas Eberhardt <thomas@mathematik.uni-Bremen.de> to allow
sorting by size.

New version from uunet, with -k option readded, and 4.4 ffs--specific stuff
in `#ifdef notyet'.

Add RCS identifiers.

previous patch to ls.c wasn't quite correct. This patch from same author.

first environment variable was trounced in the case of
"ls -l". Patch from <bob@obiwan.uucp> Bob Willcox

changed "Id" to "Header" for rcsids

added rcs ids to all files

branches: 1.1.1;
Initial revision

Fix skipping of directories that begin with a '.' in -R mode.
It is not enough to avoid displaying the contents of the directory,
we need to set FTS_SKIP to avoid descending into any subdirs too.
Otherwise, if a ".foo" directory has a subdirectory "bar", ls will
descend into bar and display its contents. From Todd Miller

branches: 1.76.12;
white space

branches: 1.75.2; 1.75.4;
PR 50997 David Binderman: fix format strings

Apply diff from Igor Sobrado <isd@orion.ciencias.uniovi.es>:

We have written a diff to our ls(1) to recover the traditional behaviour
of -f implying -a. This change does not only accommodates POSIX.1
but also matches traditional UNIX.

OpenBSD commit message:

CVSROOT: /cvs
Module name: src
Changes by: sobrado@cvs.openbsd.org 2014/03/31 14:54:37

Modified files:
bin/ls : ls.1 ls.c

Log message:
restore the traditional behavior of -f implying -a; apparently Keith Bostic
forgot to restore it when the -f flag was put back on 2nd of September 1989,
after being removed on 16th of August as a consequence of issues getting it
working over NFS, so deviation from traditional UNIX behavior in all BSDs
looks like an historical accident; as a side effect, this change accommodates
behavior of this option to IEEE Std 1003.1-2008 (``POSIX.1'').

joint work with jmc@ (who found the inaccuracy in our implementation),
schwarze@ (who provided a detailed tracking of historical facts) and millert@

ok millert@, schwarze@

add u option to getopt again.

Add -X (don't cross mount points when recursing) from tls@

Add -O (only leaf files) and -P (print full path), from tls@

PR/47167
ls.1:
- Sort options in `SYNOPSIS', the option list, and texts within
the man page;
- improve wording;
- improve macro usage;
- use more consistency regarding (locations for) information about
which options override which;
- cross-reference `-d' and `-R';
- simplify description of `-k', removing redundant and unneeded
information;
- sort entry type list (but leave `-a' and `-A' as they are, given
their meaning);
- correct / augment description of `BLOCKSIZE' environment variable
in `ENVIRONMENT' section;
- bump date.

ls.c:
- Sort options in `usage';
- augment comment about when to figure out block size.

branches: 1.69.2; 1.69.8;
Move usage and mark it static+dead

PR#7540, add a -M option to ls which causes sizes (and number of blocks) to be
displayed with comma separators (or a locale specific separator).

Add #include <sys/param.h> for howmany().

fix -Wsign-compare issues

branches: 1.65.6;
Change '-n' so that it implies '-l' rather than requires '-l'.
Brings ls(1) closer to POSIX.1 2004.
Per discussion with Thomas Klausner and Igor Sobrado.

Remove the \n and tabs from the __COPYRIGHT() strings.

branches: 1.63.12;
Complete the move of string_to_flags() and flags_to_string() from the
bin/ls sources to libutil:
o Bump libutil minor version number
o Fix uses to include <util.h> to pick up the function definitions
o Fix most uses of flags_to_string() to release the now-malloc()ed result

Pass lint. From Anon Ymous

PR/34499: mac at S dot culver dot net: ls allocates more memory than needed
Applied patch, thanks!

from zafer: you can have either -k or -h but not both since it does not make
sense.

branches: 1.59.2;
Coverity CID 1755: Add fts_close() in traverse.

Rather than '-h' suppressing '-s' when using '-l', make it display
the blocks used in human readable form, as suggested by Alan Barrett
and Daniel Carosone.

Honor the COLUMNS variable even when producing output not to a terminal,
as long as a specific format (that could use COLUMNS) was requested.
This makes

env COLUMNS=50 ls -C > file

not surprise the user who clearly wanted some specific output in the file.

- Add -h to usage.
- Use set/getprogname(3).

Fix bug with previous change- always initialise d.s_block. Now "ls -1sh"
works.
XXX: ls -sh now always uses 4 chars for the size column width even if it
needs less than that.

KNF - wrap long lines.

implement -h(umanize).

from David P. Reese Jr. in PR bin/23870.

After last weeks addition of the '-b' flag, add '-B' and '-w' flags,
suggested by uwe@, inspired by FreeBSD. The three flags override
each other (and the '-q' flag) and behave as follows:

-B Force printing of non-printable characters in file names as
\xxx, where xxx is the numeric value of the character in octal.

-b As -B, but use C escape codes whenever possible.

-w Force raw printing of non-printable characters. This is the
default when output is not to a terminal.

Implement '-b' option, which, following FreeBSD, Linux and (I think) Solaris
prints octal escapes for nongraphic characters.

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22249, verified by myself.

Pass a NULL to getbsize() for any arguments that aren't needed, and
remove the otherwise unused variables.

If both -g and -l options are present, let -l take precedence over -g,
as requested by several users.

POSIX-2001 is unclear on conflicting option letters as far as the -g
option is concerned; a clarification request will be made.

Addresses PR bin/21519 by Geoff Wing.

Add a FALLTHROUGH to keep lint happy.

make -g behave as it should according to SUSv3 (long listing without
owner).

ok'd by kleink@.

Need to initialise the blocksize variable if the -i option is used
too. The code in display() could possibly be a bit smarter about this
requirement...

Fixes the problem in PR bin/18321 from David Laight and PR bin/18436
from FUKAUMI Naoki.

Use the output blocksize when computing how much room to leave for the
-s option, to suppress unnecessary leading spaces.

convert to new KNF

Do not modify the file name when not printing non-printables, also do
it consistently with the file name and possible symbolic link target.

fixes bin/10385 and bin/10384

branches: 1.41.2;
- Fix a typo that when group_from_gid is failed (though it merely fails
on NetBSD), numeric gid string is used as `user'.
- Don't mix use %u and %d for numeric uid/gid.
- Share temporary buffer.

Since our gcc doesn't warn about NULL format strings anymore, we can
fix the incorrect err(1, "%s", "") et al.
Closes PR bin/7592 by cgd.

Call setlocale(3) to use localization in "ls" as suggested by
Jens A Nilsson in PR bin/8730.

branches: 1.38.2;
Rename ls.c::main() -> ls.c::ls_main(), and add a wrapper in main.c::main().
This allows other programs to link in against ls (e.g, ftpd), without having
to have hacks to deal with multiple main()s.

Yes, I know this is ugly. The clean alternative (move lots of this
into libutil, yada yada yada) isn't fun, and the effort probably isn't
justified...

If an error is encountered, exit with non-zero status.

Based on FreeBSD fix (in 1996!), and fixes PR bin/7514 from
Jorgen Pehrson.

branches: 1.36.2;
Add support for the XCU5 -p option (-F restricted to directories).

Implement 1003.2 -m option (stream output format).

%q -> %ll

include termios.h for struct winsize

Check for NULL value returned by user_from_uid and group_from_gid and DTRT,
rather than crash.

Add some braces to make egcs happy.

Delint.

Delint.

Slight code reduction.

__AUDIT__ cleanup.

* blocks can be 64bit (not u_long), so calculate and display accordingly
* cleanup some other typedamage (int is as good as u_long)
* remove unused variables

Deal with GCC warning.

* implement -x; sort columns across the page rather than down the page
* in printcol(), don't bother building an index to the linked list if
only printing one column with printscol()...
* implement -n; prevent [gu]id->name mapping in long listings.
inspired by openbsd, but does *not* imply -l by itself.
* fix sorting with -d (or mismatched types in general). (from openbsd).
* document -g. (from openbsd).

Automatically resize the major and minor number fields, and DTRT if the size
field is not the same size.

branches: 1.22.2;
Add some casts to printf args to keep the compiler happy on the Alpha.

include <pwd.h> and <grp.h> to bring prototypes into scope.

remove user_from_uid and group_from_gid prototypes.

Fix compiler warnings.
Add WARNS=1

Sort FTS_NS entries by name, just so the order is well-defined.

Partition FTS_NS entries from others, to avoid confusing qsort().
Don't bother to order the FTS_NS entries amongst themselves.

branches: 1.16.4;
Changed so that COLUMNS environment variable will override the value
obtained via the TIOCGWINSIZ ioctl. This is required by POSIX.2, see
section 4.39.5.3.

Sync with 4.4lite2

convert to new RCS id conventions.

Sync with CSRG.

Merge with 4.4-Lite version.

Changed traverse() and display() so that errors are reported when
they are first detected in display(), rather than waiting until later
in traverse().

The old code allowed "Can not read directory" error messages to be
left unreported unless the -R (recurse) option was used.

"yet" on quad_t/off_t things. (not noticed on i386 becuase of endian I guess.)

(1) fixup getbsize() calls
(2) convert to use err(), warn(), and warnx(), as appropriate.

Patches from Thomas Eberhardt <thomas@mathematik.uni-Bremen.de> to allow
sorting by size.

New version from uunet, with -k option readded, and 4.4 ffs--specific stuff
in `#ifdef notyet'.

Add RCS identifiers.

previous patch to ls.c wasn't quite correct. This patch from same author.

first environment variable was trounced in the case of
"ls -l". Patch from <bob@obiwan.uucp> Bob Willcox

changed "Id" to "Header" for rcsids

added rcs ids to all files

branches: 1.1.1;
Initial revision

white space

PR 50997 David Binderman: fix format strings

Apply diff from Igor Sobrado <isd@orion.ciencias.uniovi.es>:

We have written a diff to our ls(1) to recover the traditional behaviour
of -f implying -a. This change does not only accommodates POSIX.1
but also matches traditional UNIX.

OpenBSD commit message:

CVSROOT: /cvs
Module name: src
Changes by: sobrado@cvs.openbsd.org 2014/03/31 14:54:37

Modified files:
bin/ls : ls.1 ls.c

Log message:
restore the traditional behavior of -f implying -a; apparently Keith Bostic
forgot to restore it when the -f flag was put back on 2nd of September 1989,
after being removed on 16th of August as a consequence of issues getting it
working over NFS, so deviation from traditional UNIX behavior in all BSDs
looks like an historical accident; as a side effect, this change accommodates
behavior of this option to IEEE Std 1003.1-2008 (``POSIX.1'').

joint work with jmc@ (who found the inaccuracy in our implementation),
schwarze@ (who provided a detailed tracking of historical facts) and millert@

ok millert@, schwarze@

add u option to getopt again.

Add -X (don't cross mount points when recursing) from tls@

Add -O (only leaf files) and -P (print full path), from tls@

PR/47167
ls.1:
- Sort options in `SYNOPSIS', the option list, and texts within
the man page;
- improve wording;
- improve macro usage;
- use more consistency regarding (locations for) information about
which options override which;
- cross-reference `-d' and `-R';
- simplify description of `-k', removing redundant and unneeded
information;
- sort entry type list (but leave `-a' and `-A' as they are, given
their meaning);
- correct / augment description of `BLOCKSIZE' environment variable
in `ENVIRONMENT' section;
- bump date.

ls.c:
- Sort options in `usage';
- augment comment about when to figure out block size.

branches: 1.69.2; 1.69.8;
Move usage and mark it static+dead

PR#7540, add a -M option to ls which causes sizes (and number of blocks) to be
displayed with comma separators (or a locale specific separator).

Add #include <sys/param.h> for howmany().

fix -Wsign-compare issues

branches: 1.65.6;
Change '-n' so that it implies '-l' rather than requires '-l'.
Brings ls(1) closer to POSIX.1 2004.
Per discussion with Thomas Klausner and Igor Sobrado.

Remove the \n and tabs from the __COPYRIGHT() strings.

branches: 1.63.12;
Complete the move of string_to_flags() and flags_to_string() from the
bin/ls sources to libutil:
o Bump libutil minor version number
o Fix uses to include <util.h> to pick up the function definitions
o Fix most uses of flags_to_string() to release the now-malloc()ed result

Pass lint. From Anon Ymous

PR/34499: mac at S dot culver dot net: ls allocates more memory than needed
Applied patch, thanks!

from zafer: you can have either -k or -h but not both since it does not make
sense.

branches: 1.59.2;
Coverity CID 1755: Add fts_close() in traverse.

Rather than '-h' suppressing '-s' when using '-l', make it display
the blocks used in human readable form, as suggested by Alan Barrett
and Daniel Carosone.

Honor the COLUMNS variable even when producing output not to a terminal,
as long as a specific format (that could use COLUMNS) was requested.
This makes

env COLUMNS=50 ls -C > file

not surprise the user who clearly wanted some specific output in the file.

- Add -h to usage.
- Use set/getprogname(3).

Fix bug with previous change- always initialise d.s_block. Now "ls -1sh"
works.
XXX: ls -sh now always uses 4 chars for the size column width even if it
needs less than that.

KNF - wrap long lines.

implement -h(umanize).

from David P. Reese Jr. in PR bin/23870.

After last weeks addition of the '-b' flag, add '-B' and '-w' flags,
suggested by uwe@, inspired by FreeBSD. The three flags override
each other (and the '-q' flag) and behave as follows:

-B Force printing of non-printable characters in file names as
\xxx, where xxx is the numeric value of the character in octal.

-b As -B, but use C escape codes whenever possible.

-w Force raw printing of non-printable characters. This is the
default when output is not to a terminal.

Implement '-b' option, which, following FreeBSD, Linux and (I think) Solaris
prints octal escapes for nongraphic characters.

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22249, verified by myself.

Pass a NULL to getbsize() for any arguments that aren't needed, and
remove the otherwise unused variables.

If both -g and -l options are present, let -l take precedence over -g,
as requested by several users.

POSIX-2001 is unclear on conflicting option letters as far as the -g
option is concerned; a clarification request will be made.

Addresses PR bin/21519 by Geoff Wing.

Add a FALLTHROUGH to keep lint happy.

make -g behave as it should according to SUSv3 (long listing without
owner).

ok'd by kleink@.

Need to initialise the blocksize variable if the -i option is used
too. The code in display() could possibly be a bit smarter about this
requirement...

Fixes the problem in PR bin/18321 from David Laight and PR bin/18436
from FUKAUMI Naoki.

Use the output blocksize when computing how much room to leave for the
-s option, to suppress unnecessary leading spaces.

convert to new KNF

Do not modify the file name when not printing non-printables, also do
it consistently with the file name and possible symbolic link target.

fixes bin/10385 and bin/10384

branches: 1.41.2;
- Fix a typo that when group_from_gid is failed (though it merely fails
on NetBSD), numeric gid string is used as `user'.
- Don't mix use %u and %d for numeric uid/gid.
- Share temporary buffer.

Since our gcc doesn't warn about NULL format strings anymore, we can
fix the incorrect err(1, "%s", "") et al.
Closes PR bin/7592 by cgd.

Call setlocale(3) to use localization in "ls" as suggested by
Jens A Nilsson in PR bin/8730.

branches: 1.38.2;
Rename ls.c::main() -> ls.c::ls_main(), and add a wrapper in main.c::main().
This allows other programs to link in against ls (e.g, ftpd), without having
to have hacks to deal with multiple main()s.

Yes, I know this is ugly. The clean alternative (move lots of this
into libutil, yada yada yada) isn't fun, and the effort probably isn't
justified...

If an error is encountered, exit with non-zero status.

Based on FreeBSD fix (in 1996!), and fixes PR bin/7514 from
Jorgen Pehrson.

branches: 1.36.2;
Add support for the XCU5 -p option (-F restricted to directories).

Implement 1003.2 -m option (stream output format).

%q -> %ll

include termios.h for struct winsize

Check for NULL value returned by user_from_uid and group_from_gid and DTRT,
rather than crash.

Add some braces to make egcs happy.

Delint.

Delint.

Slight code reduction.

__AUDIT__ cleanup.

* blocks can be 64bit (not u_long), so calculate and display accordingly
* cleanup some other typedamage (int is as good as u_long)
* remove unused variables

Deal with GCC warning.

* implement -x; sort columns across the page rather than down the page
* in printcol(), don't bother building an index to the linked list if
only printing one column with printscol()...
* implement -n; prevent [gu]id->name mapping in long listings.
inspired by openbsd, but does *not* imply -l by itself.
* fix sorting with -d (or mismatched types in general). (from openbsd).
* document -g. (from openbsd).

Automatically resize the major and minor number fields, and DTRT if the size
field is not the same size.

branches: 1.22.2;
Add some casts to printf args to keep the compiler happy on the Alpha.

include <pwd.h> and <grp.h> to bring prototypes into scope.

remove user_from_uid and group_from_gid prototypes.

Fix compiler warnings.
Add WARNS=1

Sort FTS_NS entries by name, just so the order is well-defined.

Partition FTS_NS entries from others, to avoid confusing qsort().
Don't bother to order the FTS_NS entries amongst themselves.

branches: 1.16.4;
Changed so that COLUMNS environment variable will override the value
obtained via the TIOCGWINSIZ ioctl. This is required by POSIX.2, see
section 4.39.5.3.

Sync with 4.4lite2

convert to new RCS id conventions.

Sync with CSRG.

Merge with 4.4-Lite version.

Changed traverse() and display() so that errors are reported when
they are first detected in display(), rather than waiting until later
in traverse().

The old code allowed "Can not read directory" error messages to be
left unreported unless the -R (recurse) option was used.

"yet" on quad_t/off_t things. (not noticed on i386 becuase of endian I guess.)

(1) fixup getbsize() calls
(2) convert to use err(), warn(), and warnx(), as appropriate.

Patches from Thomas Eberhardt <thomas@mathematik.uni-Bremen.de> to allow
sorting by size.

New version from uunet, with -k option readded, and 4.4 ffs--specific stuff
in `#ifdef notyet'.

Add RCS identifiers.

previous patch to ls.c wasn't quite correct. This patch from same author.

first environment variable was trounced in the case of
"ls -l". Patch from <bob@obiwan.uucp> Bob Willcox

changed "Id" to "Header" for rcsids

added rcs ids to all files

branches: 1.1.1;
Initial revision

PR 50997 David Binderman: fix format strings

Apply diff from Igor Sobrado <isd@orion.ciencias.uniovi.es>:

We have written a diff to our ls(1) to recover the traditional behaviour
of -f implying -a. This change does not only accommodates POSIX.1
but also matches traditional UNIX.

OpenBSD commit message:

CVSROOT: /cvs
Module name: src
Changes by: sobrado@cvs.openbsd.org 2014/03/31 14:54:37

Modified files:
bin/ls : ls.1 ls.c

Log message:
restore the traditional behavior of -f implying -a; apparently Keith Bostic
forgot to restore it when the -f flag was put back on 2nd of September 1989,
after being removed on 16th of August as a consequence of issues getting it
working over NFS, so deviation from traditional UNIX behavior in all BSDs
looks like an historical accident; as a side effect, this change accommodates
behavior of this option to IEEE Std 1003.1-2008 (``POSIX.1'').

joint work with jmc@ (who found the inaccuracy in our implementation),
schwarze@ (who provided a detailed tracking of historical facts) and millert@

ok millert@, schwarze@

add u option to getopt again.

Add -X (don't cross mount points when recursing) from tls@

Add -O (only leaf files) and -P (print full path), from tls@

PR/47167
ls.1:
- Sort options in `SYNOPSIS', the option list, and texts within
the man page;
- improve wording;
- improve macro usage;
- use more consistency regarding (locations for) information about
which options override which;
- cross-reference `-d' and `-R';
- simplify description of `-k', removing redundant and unneeded
information;
- sort entry type list (but leave `-a' and `-A' as they are, given
their meaning);
- correct / augment description of `BLOCKSIZE' environment variable
in `ENVIRONMENT' section;
- bump date.

ls.c:
- Sort options in `usage';
- augment comment about when to figure out block size.

branches: 1.69.2; 1.69.8;
Move usage and mark it static+dead

PR#7540, add a -M option to ls which causes sizes (and number of blocks) to be
displayed with comma separators (or a locale specific separator).

Add #include <sys/param.h> for howmany().

fix -Wsign-compare issues

branches: 1.65.6;
Change '-n' so that it implies '-l' rather than requires '-l'.
Brings ls(1) closer to POSIX.1 2004.
Per discussion with Thomas Klausner and Igor Sobrado.

Remove the \n and tabs from the __COPYRIGHT() strings.

branches: 1.63.12;
Complete the move of string_to_flags() and flags_to_string() from the
bin/ls sources to libutil:
o Bump libutil minor version number
o Fix uses to include <util.h> to pick up the function definitions
o Fix most uses of flags_to_string() to release the now-malloc()ed result

Pass lint. From Anon Ymous

PR/34499: mac at S dot culver dot net: ls allocates more memory than needed
Applied patch, thanks!

from zafer: you can have either -k or -h but not both since it does not make
sense.

branches: 1.59.2;
Coverity CID 1755: Add fts_close() in traverse.

Rather than '-h' suppressing '-s' when using '-l', make it display
the blocks used in human readable form, as suggested by Alan Barrett
and Daniel Carosone.

Honor the COLUMNS variable even when producing output not to a terminal,
as long as a specific format (that could use COLUMNS) was requested.
This makes

env COLUMNS=50 ls -C > file

not surprise the user who clearly wanted some specific output in the file.

- Add -h to usage.
- Use set/getprogname(3).

Fix bug with previous change- always initialise d.s_block. Now "ls -1sh"
works.
XXX: ls -sh now always uses 4 chars for the size column width even if it
needs less than that.

KNF - wrap long lines.

implement -h(umanize).

from David P. Reese Jr. in PR bin/23870.

After last weeks addition of the '-b' flag, add '-B' and '-w' flags,
suggested by uwe@, inspired by FreeBSD. The three flags override
each other (and the '-q' flag) and behave as follows:

-B Force printing of non-printable characters in file names as
\xxx, where xxx is the numeric value of the character in octal.

-b As -B, but use C escape codes whenever possible.

-w Force raw printing of non-printable characters. This is the
default when output is not to a terminal.

Implement '-b' option, which, following FreeBSD, Linux and (I think) Solaris
prints octal escapes for nongraphic characters.

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22249, verified by myself.

Pass a NULL to getbsize() for any arguments that aren't needed, and
remove the otherwise unused variables.

If both -g and -l options are present, let -l take precedence over -g,
as requested by several users.

POSIX-2001 is unclear on conflicting option letters as far as the -g
option is concerned; a clarification request will be made.

Addresses PR bin/21519 by Geoff Wing.

Add a FALLTHROUGH to keep lint happy.

make -g behave as it should according to SUSv3 (long listing without
owner).

ok'd by kleink@.

Need to initialise the blocksize variable if the -i option is used
too. The code in display() could possibly be a bit smarter about this
requirement...

Fixes the problem in PR bin/18321 from David Laight and PR bin/18436
from FUKAUMI Naoki.

Use the output blocksize when computing how much room to leave for the
-s option, to suppress unnecessary leading spaces.

convert to new KNF

Do not modify the file name when not printing non-printables, also do
it consistently with the file name and possible symbolic link target.

fixes bin/10385 and bin/10384

branches: 1.41.2;
- Fix a typo that when group_from_gid is failed (though it merely fails
on NetBSD), numeric gid string is used as `user'.
- Don't mix use %u and %d for numeric uid/gid.
- Share temporary buffer.

Since our gcc doesn't warn about NULL format strings anymore, we can
fix the incorrect err(1, "%s", "") et al.
Closes PR bin/7592 by cgd.

Call setlocale(3) to use localization in "ls" as suggested by
Jens A Nilsson in PR bin/8730.

branches: 1.38.2;
Rename ls.c::main() -> ls.c::ls_main(), and add a wrapper in main.c::main().
This allows other programs to link in against ls (e.g, ftpd), without having
to have hacks to deal with multiple main()s.

Yes, I know this is ugly. The clean alternative (move lots of this
into libutil, yada yada yada) isn't fun, and the effort probably isn't
justified...

If an error is encountered, exit with non-zero status.

Based on FreeBSD fix (in 1996!), and fixes PR bin/7514 from
Jorgen Pehrson.

branches: 1.36.2;
Add support for the XCU5 -p option (-F restricted to directories).

Implement 1003.2 -m option (stream output format).

%q -> %ll

include termios.h for struct winsize

Check for NULL value returned by user_from_uid and group_from_gid and DTRT,
rather than crash.

Add some braces to make egcs happy.

Delint.

Delint.

Slight code reduction.

__AUDIT__ cleanup.

* blocks can be 64bit (not u_long), so calculate and display accordingly
* cleanup some other typedamage (int is as good as u_long)
* remove unused variables

Deal with GCC warning.

* implement -x; sort columns across the page rather than down the page
* in printcol(), don't bother building an index to the linked list if
only printing one column with printscol()...
* implement -n; prevent [gu]id->name mapping in long listings.
inspired by openbsd, but does *not* imply -l by itself.
* fix sorting with -d (or mismatched types in general). (from openbsd).
* document -g. (from openbsd).

Automatically resize the major and minor number fields, and DTRT if the size
field is not the same size.

branches: 1.22.2;
Add some casts to printf args to keep the compiler happy on the Alpha.

include <pwd.h> and <grp.h> to bring prototypes into scope.

remove user_from_uid and group_from_gid prototypes.

Fix compiler warnings.
Add WARNS=1

Sort FTS_NS entries by name, just so the order is well-defined.

Partition FTS_NS entries from others, to avoid confusing qsort().
Don't bother to order the FTS_NS entries amongst themselves.

branches: 1.16.4;
Changed so that COLUMNS environment variable will override the value
obtained via the TIOCGWINSIZ ioctl. This is required by POSIX.2, see
section 4.39.5.3.

Sync with 4.4lite2

convert to new RCS id conventions.

Sync with CSRG.

Merge with 4.4-Lite version.

Changed traverse() and display() so that errors are reported when
they are first detected in display(), rather than waiting until later
in traverse().

The old code allowed "Can not read directory" error messages to be
left unreported unless the -R (recurse) option was used.

"yet" on quad_t/off_t things. (not noticed on i386 becuase of endian I guess.)

(1) fixup getbsize() calls
(2) convert to use err(), warn(), and warnx(), as appropriate.

Patches from Thomas Eberhardt <thomas@mathematik.uni-Bremen.de> to allow
sorting by size.

New version from uunet, with -k option readded, and 4.4 ffs--specific stuff
in `#ifdef notyet'.

Add RCS identifiers.

previous patch to ls.c wasn't quite correct. This patch from same author.

first environment variable was trounced in the case of
"ls -l". Patch from <bob@obiwan.uucp> Bob Willcox

changed "Id" to "Header" for rcsids

added rcs ids to all files

branches: 1.1.1;
Initial revision

Apply diff from Igor Sobrado <isd@orion.ciencias.uniovi.es>:

We have written a diff to our ls(1) to recover the traditional behaviour
of -f implying -a. This change does not only accommodates POSIX.1
but also matches traditional UNIX.

OpenBSD commit message:

CVSROOT: /cvs
Module name: src
Changes by: sobrado@cvs.openbsd.org 2014/03/31 14:54:37

Modified files:
bin/ls : ls.1 ls.c

Log message:
restore the traditional behavior of -f implying -a; apparently Keith Bostic
forgot to restore it when the -f flag was put back on 2nd of September 1989,
after being removed on 16th of August as a consequence of issues getting it
working over NFS, so deviation from traditional UNIX behavior in all BSDs
looks like an historical accident; as a side effect, this change accommodates
behavior of this option to IEEE Std 1003.1-2008 (``POSIX.1'').

joint work with jmc@ (who found the inaccuracy in our implementation),
schwarze@ (who provided a detailed tracking of historical facts) and millert@

ok millert@, schwarze@

add u option to getopt again.

Add -X (don't cross mount points when recursing) from tls@

Add -O (only leaf files) and -P (print full path), from tls@

PR/47167
ls.1:
- Sort options in `SYNOPSIS', the option list, and texts within
the man page;
- improve wording;
- improve macro usage;
- use more consistency regarding (locations for) information about
which options override which;
- cross-reference `-d' and `-R';
- simplify description of `-k', removing redundant and unneeded
information;
- sort entry type list (but leave `-a' and `-A' as they are, given
their meaning);
- correct / augment description of `BLOCKSIZE' environment variable
in `ENVIRONMENT' section;
- bump date.

ls.c:
- Sort options in `usage';
- augment comment about when to figure out block size.

branches: 1.69.2; 1.69.8;
Move usage and mark it static+dead

PR#7540, add a -M option to ls which causes sizes (and number of blocks) to be
displayed with comma separators (or a locale specific separator).

Add #include <sys/param.h> for howmany().

fix -Wsign-compare issues

branches: 1.65.6;
Change '-n' so that it implies '-l' rather than requires '-l'.
Brings ls(1) closer to POSIX.1 2004.
Per discussion with Thomas Klausner and Igor Sobrado.

Remove the \n and tabs from the __COPYRIGHT() strings.

branches: 1.63.12;
Complete the move of string_to_flags() and flags_to_string() from the
bin/ls sources to libutil:
o Bump libutil minor version number
o Fix uses to include <util.h> to pick up the function definitions
o Fix most uses of flags_to_string() to release the now-malloc()ed result

Pass lint. From Anon Ymous

PR/34499: mac at S dot culver dot net: ls allocates more memory than needed
Applied patch, thanks!

from zafer: you can have either -k or -h but not both since it does not make
sense.

branches: 1.59.2;
Coverity CID 1755: Add fts_close() in traverse.

Rather than '-h' suppressing '-s' when using '-l', make it display
the blocks used in human readable form, as suggested by Alan Barrett
and Daniel Carosone.

Honor the COLUMNS variable even when producing output not to a terminal,
as long as a specific format (that could use COLUMNS) was requested.
This makes

env COLUMNS=50 ls -C > file

not surprise the user who clearly wanted some specific output in the file.

- Add -h to usage.
- Use set/getprogname(3).

Fix bug with previous change- always initialise d.s_block. Now "ls -1sh"
works.
XXX: ls -sh now always uses 4 chars for the size column width even if it
needs less than that.

KNF - wrap long lines.

implement -h(umanize).

from David P. Reese Jr. in PR bin/23870.

After last weeks addition of the '-b' flag, add '-B' and '-w' flags,
suggested by uwe@, inspired by FreeBSD. The three flags override
each other (and the '-q' flag) and behave as follows:

-B Force printing of non-printable characters in file names as
\xxx, where xxx is the numeric value of the character in octal.

-b As -B, but use C escape codes whenever possible.

-w Force raw printing of non-printable characters. This is the
default when output is not to a terminal.

Implement '-b' option, which, following FreeBSD, Linux and (I think) Solaris
prints octal escapes for nongraphic characters.

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22249, verified by myself.

Pass a NULL to getbsize() for any arguments that aren't needed, and
remove the otherwise unused variables.

If both -g and -l options are present, let -l take precedence over -g,
as requested by several users.

POSIX-2001 is unclear on conflicting option letters as far as the -g
option is concerned; a clarification request will be made.

Addresses PR bin/21519 by Geoff Wing.

Add a FALLTHROUGH to keep lint happy.

make -g behave as it should according to SUSv3 (long listing without
owner).

ok'd by kleink@.

Need to initialise the blocksize variable if the -i option is used
too. The code in display() could possibly be a bit smarter about this
requirement...

Fixes the problem in PR bin/18321 from David Laight and PR bin/18436
from FUKAUMI Naoki.

Use the output blocksize when computing how much room to leave for the
-s option, to suppress unnecessary leading spaces.

convert to new KNF

Do not modify the file name when not printing non-printables, also do
it consistently with the file name and possible symbolic link target.

fixes bin/10385 and bin/10384

branches: 1.41.2;
- Fix a typo that when group_from_gid is failed (though it merely fails
on NetBSD), numeric gid string is used as `user'.
- Don't mix use %u and %d for numeric uid/gid.
- Share temporary buffer.

Since our gcc doesn't warn about NULL format strings anymore, we can
fix the incorrect err(1, "%s", "") et al.
Closes PR bin/7592 by cgd.

Call setlocale(3) to use localization in "ls" as suggested by
Jens A Nilsson in PR bin/8730.

branches: 1.38.2;
Rename ls.c::main() -> ls.c::ls_main(), and add a wrapper in main.c::main().
This allows other programs to link in against ls (e.g, ftpd), without having
to have hacks to deal with multiple main()s.

Yes, I know this is ugly. The clean alternative (move lots of this
into libutil, yada yada yada) isn't fun, and the effort probably isn't
justified...

If an error is encountered, exit with non-zero status.

Based on FreeBSD fix (in 1996!), and fixes PR bin/7514 from
Jorgen Pehrson.

branches: 1.36.2;
Add support for the XCU5 -p option (-F restricted to directories).

Implement 1003.2 -m option (stream output format).

%q -> %ll

include termios.h for struct winsize

Check for NULL value returned by user_from_uid and group_from_gid and DTRT,
rather than crash.

Add some braces to make egcs happy.

Delint.

Delint.

Slight code reduction.

__AUDIT__ cleanup.

* blocks can be 64bit (not u_long), so calculate and display accordingly
* cleanup some other typedamage (int is as good as u_long)
* remove unused variables

Deal with GCC warning.

* implement -x; sort columns across the page rather than down the page
* in printcol(), don't bother building an index to the linked list if
only printing one column with printscol()...
* implement -n; prevent [gu]id->name mapping in long listings.
inspired by openbsd, but does *not* imply -l by itself.
* fix sorting with -d (or mismatched types in general). (from openbsd).
* document -g. (from openbsd).

Automatically resize the major and minor number fields, and DTRT if the size
field is not the same size.

branches: 1.22.2;
Add some casts to printf args to keep the compiler happy on the Alpha.

include <pwd.h> and <grp.h> to bring prototypes into scope.

remove user_from_uid and group_from_gid prototypes.

Fix compiler warnings.
Add WARNS=1

Sort FTS_NS entries by name, just so the order is well-defined.

Partition FTS_NS entries from others, to avoid confusing qsort().
Don't bother to order the FTS_NS entries amongst themselves.

branches: 1.16.4;
Changed so that COLUMNS environment variable will override the value
obtained via the TIOCGWINSIZ ioctl. This is required by POSIX.2, see
section 4.39.5.3.

Sync with 4.4lite2

convert to new RCS id conventions.

Sync with CSRG.

Merge with 4.4-Lite version.

Changed traverse() and display() so that errors are reported when
they are first detected in display(), rather than waiting until later
in traverse().

The old code allowed "Can not read directory" error messages to be
left unreported unless the -R (recurse) option was used.

"yet" on quad_t/off_t things. (not noticed on i386 becuase of endian I guess.)

(1) fixup getbsize() calls
(2) convert to use err(), warn(), and warnx(), as appropriate.

Patches from Thomas Eberhardt <thomas@mathematik.uni-Bremen.de> to allow
sorting by size.

New version from uunet, with -k option readded, and 4.4 ffs--specific stuff
in `#ifdef notyet'.

Add RCS identifiers.

previous patch to ls.c wasn't quite correct. This patch from same author.

first environment variable was trounced in the case of
"ls -l". Patch from <bob@obiwan.uucp> Bob Willcox

changed "Id" to "Header" for rcsids

added rcs ids to all files

branches: 1.1.1;
Initial revision

imported from 44lite2

Import original 4.4-Lite version.

initial import of 386bsd-0.1 sources

From trunk:
Various changes to make the sorting deterministic (and correct).

Pull up 1.23 (mycroft)

Pull up revision 1.37 (requested by hubertf):
Exit with non-zero status if an error was encountered. Fixes
PR#7514.

Pull up to last week's -current.

Sync w/ netbsd-1-5-base.

Pull up following revision(s) (requested by christos in ticket #53):
bin/df/df.c: revision 1.71
bin/mv/mv.c: revision 1.36
bin/ls/ls.1: revision 1.61
bin/ls/ls.c: revision 1.60
-h and -[mgk] are mutually exclusive. Only use the last specified. [from zafer]
Use one variable instead of 3 flags to hold the scale, so that we don't have
to reset each flag.
from zafer: you can have either -k or -h but not both since it does not make
sense.
- detect buffer overflow.
- if we have a trailing slash, don't add another one.

Sync with wrstuden-revivesa-base-2.

Sync with HEAD.

Third (and last) commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html

Rebase to HEAD as of a few days ago.

resync with head

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")

sync with (a bit old) head