toybox: toys/posix/ls.c annotate

annotate toys/posix/ls.c @ 1074:82c5eb459a91 draft

Fix generated/oldtoys.h to contain option strings with USE() macros in them.

author	Rob Landley <rob@landley.net>
date	Sun, 22 Sep 2013 03:37:39 -0500
parents	7dfad5f21984
children	5149632b0d07

rev	line source
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	1 /* ls.c - list files
458 9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	2 *
9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	3 * Copyright 2012 Andre Renaud <andre@bluewatersys.com>
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	4 * Copyright 2012 Rob Landley <rob@landley.net>
458 9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	5 *
656 6df4ccc0acbe Regularize command headers, update links to standards documents. Rob Landley <rob@landley.net> parents: 653 diff changeset	6 * See http://opengroup.org/onlinepubs/9699919799/utilities/ls.html
458 9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	7
1037 af1780148f7c Implement ls --color=auto, suggested by Rich Felker. Rob Landley <rob@landley.net> parents: 984 diff changeset	8 USE_LS(NEWTOY(ls, USE_LS_COLOR("(color):;")"goACFHLRSacdfiklmnpqrstux1[-1Cglmnox][-cu][-ftS][-HL]", TOYFLAG_BIN))
458 9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	9
9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	10 config LS
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	11 bool "ls"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	12 default y
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	13 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	14 usage: ls [-ACFHLRSacdfiklmnpqrstux1] [directory...]
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	15 list files
458 9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	16
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	17 what to show:
939 b58e86e366ab Condense ls help text. Rob Landley <rob@landley.net> parents: 937 diff changeset	18 -a all files including .hidden -c use ctime for timestamps
b58e86e366ab Condense ls help text. Rob Landley <rob@landley.net> parents: 937 diff changeset	19 -d directory, not contents -i inode number
b58e86e366ab Condense ls help text. Rob Landley <rob@landley.net> parents: 937 diff changeset	20 -k block sizes in kilobytes -p put a '/' after dir names
b58e86e366ab Condense ls help text. Rob Landley <rob@landley.net> parents: 937 diff changeset	21 -q unprintable chars as '?' -s size (in blocks)
b58e86e366ab Condense ls help text. Rob Landley <rob@landley.net> parents: 937 diff changeset	22 -u use access time for timestamps -A list all files but . and ..
b58e86e366ab Condense ls help text. Rob Landley <rob@landley.net> parents: 937 diff changeset	23 -H follow command line symlinks -L follow symlinks
b58e86e366ab Condense ls help text. Rob Landley <rob@landley.net> parents: 937 diff changeset	24 -R recursively list files in subdirs -F append /dir *exe @sym \|FIFO
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	25
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	26 output formats:
939 b58e86e366ab Condense ls help text. Rob Landley <rob@landley.net> parents: 937 diff changeset	27 -1 list one file per line -C columns (sorted vertically)
b58e86e366ab Condense ls help text. Rob Landley <rob@landley.net> parents: 937 diff changeset	28 -g like -l but no owner -l long (show full details)
b58e86e366ab Condense ls help text. Rob Landley <rob@landley.net> parents: 937 diff changeset	29 -m comma separated -n like -l but numeric uid/gid
b58e86e366ab Condense ls help text. Rob Landley <rob@landley.net> parents: 937 diff changeset	30 -o like -l but no group -x columns (horizontal sort)
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	31
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	32 sorting (default is alphabetical):
939 b58e86e366ab Condense ls help text. Rob Landley <rob@landley.net> parents: 937 diff changeset	33 -f unsorted -r reverse -t timestamp -S size
940 a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	34
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	35 config LS_COLOR
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	36 bool "ls --color"
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	37 default y
984 422696039640 ls --color should depend on LS in menuconfig. Rob Landley <rob@landley.net> parents: 941 diff changeset	38 depends on LS
940 a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	39 help
1037 af1780148f7c Implement ls --color=auto, suggested by Rich Felker. Rob Landley <rob@landley.net> parents: 984 diff changeset	40 usage: ls --color[=auto]
940 a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	41
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	42 --color device=yellow symlink=turquoise/red dir=blue socket=purple
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	43 files: exe=green suid=red suidfile=redback stickydir=greenback
1037 af1780148f7c Implement ls --color=auto, suggested by Rich Felker. Rob Landley <rob@landley.net> parents: 984 diff changeset	44 =auto means detect if output is a tty.
458 9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	45 */
9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	46
674 7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 663 diff changeset	47 #define FOR_ls
458 9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	48 #include "toys.h"
9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	49
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	50 // test sst output (suid/sticky in ls flaglist)
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	51
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	52 // ls -lR starts .: then ./subdir:
459 1dbe91079950 Second drop of ls from Andre, adds -l. Rob Landley <rob@landley.net> parents: 458 diff changeset	53
674 7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 663 diff changeset	54 GLOBALS(
1037 af1780148f7c Implement ls --color=auto, suggested by Rich Felker. Rob Landley <rob@landley.net> parents: 984 diff changeset	55 char *color;
af1780148f7c Implement ls --color=auto, suggested by Rich Felker. Rob Landley <rob@landley.net> parents: 984 diff changeset	56
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	57 struct dirtree *files;
459 1dbe91079950 Second drop of ls from Andre, adds -l. Rob Landley <rob@landley.net> parents: 458 diff changeset	58
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	59 unsigned screen_width;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	60 int nl_title;
1040 7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	61 char uid_buf[12], gid_buf[12];
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	62 )
459 1dbe91079950 Second drop of ls from Andre, adds -l. Rob Landley <rob@landley.net> parents: 458 diff changeset	63
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	64 void dlist_to_dirtree(struct dirtree *parent)
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	65 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	66 // Turn double_list into dirtree
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	67 struct dirtree *dt = parent->child;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	68 if (dt) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	69 dt->parent->next = NULL;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	70 while (dt) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	71 dt->parent = parent;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	72 dt = dt->next;
476 d10b58563cff More ls updates from Andre Renaud: Add -R and initial support for listing files on the command line. Rob Landley <rob@landley.net> parents: 459 diff changeset	73 }
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	74 }
458 9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	75 }
9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	76
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	77 static char endtype(struct stat *st)
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	78 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	79 mode_t mode = st->st_mode;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	80 if ((toys.optflags&(FLAG_F\|FLAG_p)) && S_ISDIR(mode)) return '/';
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	81 if (toys.optflags & FLAG_F) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	82 if (S_ISLNK(mode)) return '@';
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	83 if (S_ISREG(mode) && (mode&0111)) return '*';
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	84 if (S_ISFIFO(mode)) return '\|';
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	85 if (S_ISSOCK(mode)) return '=';
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	86 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	87 return 0;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	88 }
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	89
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	90 static char *getusername(uid_t uid)
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	91 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	92 struct passwd *pw = getpwuid(uid);
1040 7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	93
7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	94 sprintf(TT.uid_buf, "%u", (unsigned)uid);
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	95 return pw ? pw->pw_name : TT.uid_buf;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	96 }
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	97
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	98 static char *getgroupname(gid_t gid)
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	99 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	100 struct group *gr = getgrgid(gid);
1040 7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	101
7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	102 sprintf(TT.gid_buf, "%u", (unsigned)gid);
7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	103 return gr ? gr->gr_name : TT.gid_buf;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	104 }
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	105
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	106 // Figure out size of printable entry fields for display indent/wrap
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	107
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	108 static void entrylen(struct dirtree dt, unsigned len)
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	109 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	110 struct stat *st = &(dt->st);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	111 unsigned flags = toys.optflags;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	112
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	113 *len = strlen(dt->name);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	114 if (endtype(st)) ++*len;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	115 if (flags & FLAG_m) ++*len;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	116
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	117 if (flags & FLAG_i) *len += (len[1] = numlen(st->st_ino));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	118 if (flags & (FLAG_l\|FLAG_o\|FLAG_n\|FLAG_g)) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	119 unsigned fn = flags & FLAG_n;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	120 len[2] = numlen(st->st_nlink);
1040 7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	121 len[3] = fn ? snprintf(0, 0, "%u", (unsigned)st->st_uid)
7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	122 : strlen(getusername(st->st_uid));
7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	123 len[4] = fn ? snprintf(0, 0, "%u", (unsigned)st->st_gid)
7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	124 : strlen(getgroupname(st->st_gid));
941 62ba5ce62e9d Make ls output major, minor for block devices. Rob Landley <rob@landley.net> parents: 940 diff changeset	125 if (S_ISBLK(st->st_mode) \|\| S_ISCHR(st->st_mode)) {
62ba5ce62e9d Make ls output major, minor for block devices. Rob Landley <rob@landley.net> parents: 940 diff changeset	126 // cheating slightly here: assuming minor is always 3 digits to avoid
62ba5ce62e9d Make ls output major, minor for block devices. Rob Landley <rob@landley.net> parents: 940 diff changeset	127 // tracking another column
62ba5ce62e9d Make ls output major, minor for block devices. Rob Landley <rob@landley.net> parents: 940 diff changeset	128 len[5] = numlen(major(st->st_rdev))+5;
62ba5ce62e9d Make ls output major, minor for block devices. Rob Landley <rob@landley.net> parents: 940 diff changeset	129 } else len[5] = numlen(st->st_size);
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	130 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	131 if (flags & FLAG_s) *len += (len[6] = numlen(st->st_blocks));
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	132 }
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	133
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	134 static int compare(void a, void b)
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	135 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	136 struct dirtree dta = (struct dirtree **)a;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	137 struct dirtree dtb = (struct dirtree **)b;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	138 int ret = 0, reverse = (toys.optflags & FLAG_r) ? -1 : 1;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	139
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	140 if (toys.optflags & FLAG_S) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	141 if (dta->st.st_size > dtb->st.st_size) ret = -1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	142 else if (dta->st.st_size < dtb->st.st_size) ret = 1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	143 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	144 if (toys.optflags & FLAG_t) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	145 if (dta->st.st_mtime > dtb->st.st_mtime) ret = -1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	146 else if (dta->st.st_mtime < dtb->st.st_mtime) ret = 1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	147 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	148 if (!ret) ret = strcmp(dta->name, dtb->name);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	149 return ret * reverse;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	150 }
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	151
569 2e0367cb9585 More work on ls. Now ls -lR sort of works-ish. Rob Landley <rob@landley.net> parents: 565 diff changeset	152 // callback from dirtree_recurse() determining how to handle this entry.
2e0367cb9585 More work on ls. Now ls -lR sort of works-ish. Rob Landley <rob@landley.net> parents: 565 diff changeset	153
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	154 static int filter(struct dirtree *new)
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	155 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	156 int flags = toys.optflags;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	157
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	158 // Special case to handle enormous dirs without running out of memory.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	159 if (flags == (FLAG_1\|FLAG_f)) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	160 xprintf("%s\n", new->name);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	161 return 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	162 }
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	163
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	164 if (flags & FLAG_u) new->st.st_mtime = new->st.st_atime;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	165 if (flags & FLAG_c) new->st.st_mtime = new->st.st_ctime;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	166 if (flags & FLAG_k) new->st.st_blocks = (new->st.st_blocks + 1) / 2;
663 60cbc87c4314 I screwed up ls in commit 580. Oops. Fix it. Rob Landley <rob@landley.net> parents: 656 diff changeset	167
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	168 if (flags & (FLAG_a\|FLAG_f)) return DIRTREE_SAVE;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	169 if (!(flags & FLAG_A) && new->name[0]=='.') return 0;
663 60cbc87c4314 I screwed up ls in commit 580. Oops. Fix it. Rob Landley <rob@landley.net> parents: 656 diff changeset	170
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	171 return dirtree_notdotdot(new) & DIRTREE_SAVE;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	172 }
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	173
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	174 // For column view, calculate horizontal position (for padding) and return
ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	175 // index of next entry to display.
ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	176
ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	177 static unsigned long next_column(unsigned long ul, unsigned long dtlen,
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	178 unsigned columns, unsigned *xpos)
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	179 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	180 unsigned long transition;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	181 unsigned height, widecols;
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	182
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	183 // Horizontal sort is easy
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	184 if (!(toys.optflags & FLAG_C)) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	185 *xpos = ul % columns;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	186 return ul;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	187 }
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	188
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	189 // vertical sort
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	190
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	191 // For -x, calculate height of display, rounded up
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	192 height = (dtlen+columns-1)/columns;
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	193
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	194 // Sanity check: does wrapping render this column count impossible
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	195 // due to the right edge wrapping eating a whole row?
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	196 if (height*columns - dtlen >= height) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	197 *xpos = columns;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	198 return 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	199 }
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	200
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	201 // Uneven rounding goes along right edge
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	202 widecols = dtlen % height;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	203 if (!widecols) widecols = height;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	204 transition = widecols * columns;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	205 if (ul < transition) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	206 *xpos = ul % columns;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	207 return (xposheight) + (ul/columns);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	208 }
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	209
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	210 ul -= transition;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	211 *xpos = ul % (columns-1);
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	212
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	213 return (xposheight) + widecols + (ul/(columns-1));
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	214 }
ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	215
940 a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	216 int color_from_mode(mode_t mode)
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	217 {
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	218 int color = 0;
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	219
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	220 if (S_ISDIR(mode)) color = 256+34;
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	221 else if (S_ISLNK(mode)) color = 256+36;
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	222 else if (S_ISBLK(mode) \|\| S_ISCHR(mode)) color = 256+33;
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	223 else if (S_ISREG(mode) && (mode&0111)) color = 256+32;
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	224 else if (S_ISFIFO(mode)) color = 33;
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	225 else if (S_ISSOCK(mode)) color = 256+35;
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	226
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	227 return color;
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	228 }
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	229
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	230 // Display a list of dirtree entries, according to current format
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	231 // Output types -1, -l, -C, or stream
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	232
573 c42ed3601b35 Simplify/unify listfiles recursion: populate directory node (and detect top of tree) at start of function rather than end (and redundantly in main). Move title printing down next to total printing. Rob Landley <rob@landley.net> parents: 571 diff changeset	233 static void listfiles(int dirfd, struct dirtree *indir)
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	234 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	235 struct dirtree dt, *sort = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	236 unsigned long dtlen = 0, ul = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	237 unsigned width, flags = toys.optflags, totals[7], len[7],
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	238 colsizes = (unsigned )(toybuf+260), columns = (sizeof(toybuf)-260)/4;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	239
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	240 memset(totals, 0, sizeof(totals));
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	241
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	242 // Silently descend into single directory listed by itself on command line.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	243 // In this case only show dirname/total header when given -R.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	244 if (!indir->parent) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	245 if (!(dt = indir->child)) return;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	246 if (S_ISDIR(dt->st.st_mode) && !dt->next && !(flags & FLAG_d)) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	247 dt->extra = 1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	248 listfiles(open(dt->name, 0), dt);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	249 return;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	250 }
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	251 } else {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	252 // Read directory contents. We dup() the fd because this will close it.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	253 indir->data = dup(dirfd);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	254 dirtree_recurse(indir, filter, (flags&FLAG_L));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	255 }
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	256
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	257 // Copy linked list to array and sort it. Directories go in array because
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	258 // we visit them in sorted order.
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	259
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	260 for (;;) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	261 for (dt = indir->child; dt; dt = dt->next) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	262 if (sort) sort[dtlen] = dt;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	263 dtlen++;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	264 }
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	265 if (sort) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	266 sort = xmalloc(dtlen * sizeof(void *));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	267 dtlen = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	268 continue;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	269 }
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	270
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	271 // Label directory if not top of tree, or if -R
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	272 if (indir->parent && (!indir->extra \|\| (flags & FLAG_R)))
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	273 {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	274 char *path = dirtree_path(indir, 0);
593 fb582378a36a Implement DIRTREE_SYMFOLLOW and ls -cSHL. Rob Landley <rob@landley.net> parents: 591 diff changeset	275
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	276 if (TT.nl_title++) xputc('\n');
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	277 xprintf("%s:\n", path);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	278 free(path);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	279 }
593 fb582378a36a Implement DIRTREE_SYMFOLLOW and ls -cSHL. Rob Landley <rob@landley.net> parents: 591 diff changeset	280
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	281 if (!(flags & FLAG_f)) qsort(sort, dtlen, sizeof(void ), (void )compare);
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	282
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	283 // Find largest entry in each field for display alignment
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	284 if (flags & (FLAG_C\|FLAG_x)) {
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	285
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	286 // columns can't be more than toybuf can hold, or more than files,
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	287 // or > 1/2 screen width (one char filename, one space).
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	288 if (columns > TT.screen_width/2) columns = TT.screen_width/2;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	289 if (columns > dtlen) columns = dtlen;
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	290
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	291 // Try to fit as many columns as we can, dropping down by one each time
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	292 for (;columns > 1; columns--) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	293 unsigned c, totlen = columns;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	294
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	295 memset(colsizes, 0, columns*sizeof(unsigned));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	296 for (ul=0; ul<dtlen; ul++) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	297 entrylen(sort[next_column(ul, dtlen, columns, &c)], len);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	298 if (c == columns) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	299 // Does this put us over budget?
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	300 if (*len > colsizes[c]) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	301 totlen += *len-colsizes[c];
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	302 colsizes[c] = *len;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	303 if (totlen > TT.screen_width) break;
584 ca6875170b9a Implement -C and -x for ls. Rob Landley <rob@landley.net> parents: 580 diff changeset	304 }
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	305 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	306 // If it fit, stop here
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	307 if (ul == dtlen) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	308 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	309 } else if (flags & (FLAG_l\|FLAG_o\|FLAG_n\|FLAG_g\|FLAG_s)) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	310 unsigned long blocks = 0;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	311
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	312 for (ul = 0; ul<dtlen; ul++)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	313 {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	314 entrylen(sort[ul], len);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	315 for (width=0; width<6; width++)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	316 if (len[width] > totals[width]) totals[width] = len[width];
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	317 blocks += sort[ul]->st.st_blocks;
573 c42ed3601b35 Simplify/unify listfiles recursion: populate directory node (and detect top of tree) at start of function rather than end (and redundantly in main). Move title printing down next to total printing. Rob Landley <rob@landley.net> parents: 571 diff changeset	318 }
c42ed3601b35 Simplify/unify listfiles recursion: populate directory node (and detect top of tree) at start of function rather than end (and redundantly in main). Move title printing down next to total printing. Rob Landley <rob@landley.net> parents: 571 diff changeset	319
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	320 if (indir->parent) xprintf("total %lu\n", blocks);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	321 }
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	322
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	323 // Loop through again to produce output.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	324 memset(toybuf, ' ', 256);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	325 width = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	326 for (ul = 0; ul<dtlen; ul++) {
940 a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	327 unsigned curcol, color = 0;
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	328 unsigned long next = next_column(ul, dtlen, columns, &curcol);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	329 struct stat *st = &(sort[next]->st);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	330 mode_t mode = st->st_mode;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	331 char et = endtype(st);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	332
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	333 // Skip directories at the top of the tree when -d isn't set
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	334 if (S_ISDIR(mode) && !indir->parent && !(flags & FLAG_d)) continue;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	335 TT.nl_title=1;
571 1a06fcaa1775 Make -d work in ls. Rob Landley <rob@landley.net> parents: 570 diff changeset	336
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	337 // Handle padding and wrapping for display purposes
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	338 entrylen(sort[next], len);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	339 if (ul) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	340 if (flags & FLAG_m) xputc(',');
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	341 if (flags & (FLAG_C\|FLAG_x)) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	342 if (!curcol) xputc('\n');
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	343 } else if ((flags & FLAG_1) \|\| width+1+*len > TT.screen_width) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	344 xputc('\n');
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	345 width = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	346 } else {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	347 xputc(' ');
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	348 width++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	349 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	350 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	351 width += *len;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	352
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	353 if (flags & FLAG_i) xprintf("% *lu ", len[1], (unsigned long)st->st_ino);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	354 if (flags & FLAG_s) xprintf("% *lu ", len[6], (unsigned long)st->st_blocks);
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	355
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	356 if (flags & (FLAG_l\|FLAG_o\|FLAG_n\|FLAG_g)) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	357 struct tm *tm;
885 beb32d780164 Add library function for the file permission formatting in ls and stat Felix Janda <felix.janda@posteo.de> parents: 768 diff changeset	358 char perm[11], thyme[64], usr, upad, grp, grpad;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	359
916 b92cb3cc9696 Stat cleanup. Rob Landley <rob@landley.net> parents: 885 diff changeset	360 mode_to_string(mode, perm);
593 fb582378a36a Implement DIRTREE_SYMFOLLOW and ls -cSHL. Rob Landley <rob@landley.net> parents: 591 diff changeset	361
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	362 if (flags&FLAG_o) grp = grpad = toybuf+256;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	363 else {
1040 7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	364 sprintf(thyme, "%u", (unsigned)st->st_gid);
7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	365 grp = (flags&FLAG_n) ? thyme : getgroupname(st->st_gid);
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	366 grpad = toybuf+256-(totals[4]-len[4]);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	367 }
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	368
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	369 if (flags&FLAG_g) usr = upad = toybuf+256;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	370 else {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	371 upad = toybuf+255-(totals[3]-len[3]);
1040 7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	372 if (flags&FLAG_n) sprintf(usr = TT.uid_buf, "%u", (unsigned)st->st_uid);
7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	373 else usr = getusername(st->st_uid);
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	374 }
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	375
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	376 // Coerce the st types into something we know we can print.
941 62ba5ce62e9d Make ls output major, minor for block devices. Rob Landley <rob@landley.net> parents: 940 diff changeset	377 printf("%s% *ld %s%s%s%s", perm, totals[2]+1, (long)st->st_nlink,
62ba5ce62e9d Make ls output major, minor for block devices. Rob Landley <rob@landley.net> parents: 940 diff changeset	378 usr, upad, grp, grpad);
62ba5ce62e9d Make ls output major, minor for block devices. Rob Landley <rob@landley.net> parents: 940 diff changeset	379
62ba5ce62e9d Make ls output major, minor for block devices. Rob Landley <rob@landley.net> parents: 940 diff changeset	380 if (S_ISCHR(st->st_mode) \|\| S_ISBLK(st->st_mode))
62ba5ce62e9d Make ls output major, minor for block devices. Rob Landley <rob@landley.net> parents: 940 diff changeset	381 printf("% *d,% 4d", totals[5]-4, major(st->st_rdev),minor(st->st_rdev));
62ba5ce62e9d Make ls output major, minor for block devices. Rob Landley <rob@landley.net> parents: 940 diff changeset	382 else printf("% *"PRId64, totals[5]+1, (int64_t)st->st_size);
1040 7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	383
7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	384 tm = localtime(&(st->st_mtime));
7dfad5f21984 Switch ls from utoa to sprintf. Rob Landley <rob@landley.net> parents: 1037 diff changeset	385 strftime(thyme, sizeof(thyme), "%F %H:%M", tm);
941 62ba5ce62e9d Make ls output major, minor for block devices. Rob Landley <rob@landley.net> parents: 940 diff changeset	386 xprintf(" %s ", thyme);
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	387 }
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	388
1037 af1780148f7c Implement ls --color=auto, suggested by Rich Felker. Rob Landley <rob@landley.net> parents: 984 diff changeset	389 if (flags & FLAG_color) {
940 a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	390 color = color_from_mode(st->st_mode);
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	391 if (color) printf("\033[%d;%dm", color>>8, color&255);
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	392 }
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	393
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	394 if (flags & FLAG_q) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	395 char *p;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	396 for (p=sort[next]->name; p; p++) xputc(isprint(p) ? *p : '?');
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	397 } else xprintf("%s", sort[next]->name);
940 a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	398 if (color) xprintf("\033[0m");
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	399
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	400 if ((flags & (FLAG_l\|FLAG_o\|FLAG_n\|FLAG_g)) && S_ISLNK(mode)) {
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	401 printf(" -> ");
1037 af1780148f7c Implement ls --color=auto, suggested by Rich Felker. Rob Landley <rob@landley.net> parents: 984 diff changeset	402 if (flags & FLAG_color) {
940 a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	403 struct stat st2;
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	404
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	405 if (fstatat(dirfd, sort[next]->symlink, &st2, 0)) color = 256+31;
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	406 else color = color_from_mode(st2.st_mode);
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	407
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	408 if (color) printf("\033[%d;%dm", color>>8, color&255);
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	409 }
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	410
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	411 printf("%s", sort[next]->symlink);
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	412 if (color) printf("\033[0m");
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	413 }
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	414
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	415 if (et) xputc(et);
571 1a06fcaa1775 Make -d work in ls. Rob Landley <rob@landley.net> parents: 570 diff changeset	416
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	417 // Pad columns
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	418 if (flags & (FLAG_C\|FLAG_x)) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	419 curcol = colsizes[curcol] - *len;
937 871c68a35e95 Fix another segfault in ls -C when terminal size is 0x0. Rob Landley <rob@landley.net> parents: 916 diff changeset	420 if (curcol < 255) xprintf("%s", toybuf+255-curcol);
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	421 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	422 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	423
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	424 if (width) xputc('\n');
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	425
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	426 // Free directory entries, recursing first if necessary.
571 1a06fcaa1775 Make -d work in ls. Rob Landley <rob@landley.net> parents: 570 diff changeset	427
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	428 for (ul = 0; ul<dtlen; free(sort[ul++])) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	429 if ((flags & FLAG_d) \|\| !S_ISDIR(sort[ul]->st.st_mode)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	430 \|\| !dirtree_notdotdot(sort[ul])) continue;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	431
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	432 // Recurse into dirs if at top of the tree or given -R
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	433 if (!indir->parent \|\| (flags & FLAG_R))
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	434 listfiles(openat(dirfd, sort[ul]->name, 0), sort[ul]);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	435 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	436 free(sort);
940 a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	437 if (dirfd != AT_FDCWD) close(dirfd);
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	438 }
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	439
458 9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	440 void ls_main(void)
9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	441 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	442 char *s, noargs[] = {".", 0};
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	443 struct dirtree *dt;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	444
940 a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	445 TT.screen_width = 80;
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	446 terminal_size(&TT.screen_width, NULL);
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	447 if (TT.screen_width<2) TT.screen_width = 2;
a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	448
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	449 // Do we have an implied -1
1037 af1780148f7c Implement ls --color=auto, suggested by Rich Felker. Rob Landley <rob@landley.net> parents: 984 diff changeset	450 if (!isatty(1)) {
af1780148f7c Implement ls --color=auto, suggested by Rich Felker. Rob Landley <rob@landley.net> parents: 984 diff changeset	451 toys.optflags \|= FLAG_1;
af1780148f7c Implement ls --color=auto, suggested by Rich Felker. Rob Landley <rob@landley.net> parents: 984 diff changeset	452 if (TT.color) toys.optflags ^= FLAG_color;
af1780148f7c Implement ls --color=auto, suggested by Rich Felker. Rob Landley <rob@landley.net> parents: 984 diff changeset	453 } else if (toys.optflags&(FLAG_l\|FLAG_o\|FLAG_n\|FLAG_g))
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	454 toys.optflags \|= FLAG_1;
940 a425f97975d3 First pass at ls --color Rob Landley <rob@landley.net> parents: 939 diff changeset	455 else if (!(toys.optflags&(FLAG_1\|FLAG_x\|FLAG_m))) toys.optflags \|= FLAG_C;
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	456 // The optflags parsing infrastructure should really do this for us,
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	457 // but currently it has "switch off when this is set", so "-dR" and "-Rd"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	458 // behave differently
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	459 if (toys.optflags & FLAG_d) toys.optflags &= ~FLAG_R;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	460
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	461 // Iterate through command line arguments, collecting directories and files.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	462 // Non-absolute paths are relative to current directory.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	463 TT.files = dirtree_add_node(0, 0, 0);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	464 for (s = toys.optargs ? toys.optargs : noargs; s; s++) {
735 3aaba60133c8 Have dirtree_add_node() set parent so error message can provide full path. Rob Landley <rob@landley.net> parents: 733 diff changeset	465 dt = dirtree_add_node(0, *s,
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	466 (toys.optflags & (FLAG_L\|FLAG_H\|FLAG_l))^FLAG_l);
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	467
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	468 if (!dt) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	469 toys.exitval = 1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	470 continue;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	471 }
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	472
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	473 // Typecast means double_list->prev temporarirly goes in dirtree->parent
733 0cd93dd23b8d Minor whitespace tweak. Rob Landley <rob@landley.net> parents: 714 diff changeset	474 dlist_add_nomalloc((void )&TT.files->child, (struct double_list )dt);
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	475 }
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 533 diff changeset	476
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	477 // Turn double_list into dirtree
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	478 dlist_to_dirtree(TT.files);
569 2e0367cb9585 More work on ls. Now ls -lR sort of works-ish. Rob Landley <rob@landley.net> parents: 565 diff changeset	479
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	480 // Display the files we collected
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	481 listfiles(AT_FDCWD, TT.files);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	482
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	483 if (CFG_TOYBOX_FREE) free(TT.files);
458 9786a697d5aa Add ls from Andre Renaud. Rob Landley <rob@landley.net> parents: diff changeset	484 }

Mercurial > hg > toybox

annotate toys/posix/ls.c @ 1074:82c5eb459a91 draft