Index: head/bin/ls/Makefile =================================================================== --- head/bin/ls/Makefile (revision 88590) +++ head/bin/ls/Makefile (revision 88591) @@ -1,15 +1,16 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 # $FreeBSD$ PROG= ls SRCS= cmp.c ls.c print.c util.c lomac.c +LDADD= -lm WARNS= 0 .if !defined(RELEASE_CRUNCH) CFLAGS+= -DCOLORLS LDADD+= -ltermcap DPADD+= ${LIBTERMCAP} .endif .include Index: head/bin/ls/ls.1 =================================================================== --- head/bin/ls/ls.1 (revision 88590) +++ head/bin/ls/ls.1 (revision 88591) @@ -1,588 +1,614 @@ .\" Copyright (c) 1980, 1990, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by .\" the Institute of Electrical and Electronics Engineers, Inc. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. All advertising materials mentioning features or use of this software .\" must display the following acknowledgment: .\" This product includes software developed by the University of .\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" $FreeBSD$ .\" .Dd July 29, 1994 .Dt LS 1 .Os .Sh NAME .Nm ls .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHLPRTWZabcdfgiklnoqrstu1 +.Op Fl ABCFGHLPRTWZabcdfghiklnoqrstu1 .Op Ar .Sh DESCRIPTION For each operand that names a .Ar file of a type other than directory, .Nm displays its name as well as any requested, associated information. For each operand that names a .Ar file of type directory, .Nm displays the names of files contained within that directory, as well as any requested, associated information. .Pp If no operands are given, the contents of the current directory are displayed. If more than one operand is given, non-directory operands are displayed first; directory and non-directory operands are sorted separately and in lexicographical order. .Pp The following options are available: .Bl -tag -width indent .It Fl A List all entries except for .Ql .\& and .Ql .. . Always set for the super-user. .It Fl B Force printing of non-printable characters (as defined by .Xr ctype 3 and current locale settings) in file names as \\xxx, where xxx is the numeric value of the character in octal. .It Fl C Force multi-column output; this is the default when output is to a terminal. .It Fl F Display a slash (/) immediately after each pathname that is a directory, an asterisk (*) after each that is executable, an at sign (@) after each symbolic link, an equals sign (=) after each socket, a percent sign (%) after each whiteout, and a vertical bar (|) after each that is a .Tn FIFO . .It Fl G Enable colorized output. This option is equivalent to defining .Ev CLICOLOR in the environment. (See below). .It Fl H Symbolic links on the command line are followed. This option is assumed if none of the .Fl F , .Fl d , or .Fl l options are specified. .It Fl L If argument is a symbolic link, list the file or directory the link references rather than the link itself. This option cancels the .Fl P option. .It Fl P If argument is a symbolic link, list the link itself rather than the object the link references. This option cancels the .Fl H and .Fl L options. .It Fl R Recursively list subdirectories encountered. .It Fl T Display complete time information for the file, including month, day, hour, minute, second, and year. .It Fl W Display whiteouts when scanning directories. .It Fl Z Display each file's LOMAC level. .It Fl a Include directory entries whose names begin with a dot (.). .It Fl b As .Fl B , but use C escape codes whenever possible. .It Fl c Use time when file status was last changed for sorting or printing. .It Fl d Directories are listed as plain files (not searched recursively). .It Fl f Output is not sorted. .It Fl g This option is deprecated and is only available for compatibility with .Bx 4.3 ; it was used to display the group name in the long .Pq Fl l format output. +.It Fl h +When used wih the +.Fl l +option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte +and Petabyte in order to reduce the number of digits to three or less +using base 2 for sizes. .It Fl i For each file, print the file's file serial number (inode number). .It Fl k If the .Fl s option is specified, print the file size allocation in kilobytes, not blocks. This option overrides the environment variable BLOCKSIZE. .It Fl l (The lowercase letter ``ell.'') List in long format. (See below.) If the output is to a terminal, a total sum for all the file sizes is output on a line before the long listing. .It Fl n Display user and group IDs numerically rather than converting to a user or group name in a long .Pq Fl l output. .It Fl o Include the file flags in a long .Pq Fl l output. .It Fl q Force printing of non-graphic characters in file names as the character `?'; this is the default when output is to a terminal. .It Fl r Reverse the order of the sort to get reverse lexicographical order or the oldest entries first. .It Fl s Display the number of file system blocks actually used by each file, in units of 512 bytes, where partial units are rounded up to the next integer value. If the output is to a terminal, a total sum for all the file sizes is output on a line before the listing. The environment variable BLOCKSIZE overrides the unit size of 512 bytes. .It Fl t Sort by time modified (most recently modified first) before sorting the operands by lexicographical order. .It Fl u Use time of last access, instead of last modification of the file for sorting .Pq Fl t or printing .Pq Fl l . .It Fl \&1 (The numeric digit ``one.'') Force output to be one entry per line. This is the default when output is not to a terminal. .El .Pp The .Fl 1 , .Fl C , and .Fl l options all override each other; the last one specified determines the format used. .Pp The .Fl c and .Fl u options override each other; the last one specified determines the file time used. .Pp The .Fl B , .Fl b and .Fl q options all override each other; the last one specified determines the format used for non-printable characters. .Pp The .Fl H , .Fl L and .Fl P options all override each other (either partially or fully); they are applied in the order specified. .Pp By default, .Nm lists one entry per line to standard output; the exceptions are to terminals or when the .Fl C option is specified. .Pp File information is displayed with one or more s separating the information associated with the .Fl i , .Fl s , and .Fl l options. .Ss The Long Format If the .Fl l option is given, the following information is displayed for each file: file mode, number of links, owner name, group name, LOMAC level, number of bytes in the file, abbreviated month, day-of-month file was last modified, hour file last modified, minute file last modified, and the pathname. In addition, for each directory whose contents are displayed, the total number of 512-byte blocks used by the files in the directory is displayed on a line by itself immediately before the information for the files in the directory. .Pp If the modification time of the file is more than 6 months in the past or future, then the year of the last modification is displayed in place of the hour and minute fields. .Pp If the owner or group names are not a known user or group name, or the .Fl n option is given, the numeric ID's are displayed. .Pp If the file is a character special or block special file, the major and minor device numbers for the file are displayed in the size field. If the file is a symbolic link the pathname of the linked-to file is preceded by .Dq \-> . .Pp The file mode printed under the .Fl l option consists of the entry type, owner permissions, and group permissions. The entry type character describes the type of file, as follows: .Pp .Bl -tag -width 4n -offset indent -compact .It Sy b Block special file. .It Sy c Character special file. .It Sy d Directory. .It Sy l Symbolic link. .It Sy s Socket link. .It Sy p .Tn FIFO . .It Sy \- Regular file. .El .Pp The next three fields are three characters each: owner permissions, group permissions, and other permissions. Each field has three character positions: .Bl -enum -offset indent .It If .Sy r , the file is readable; if .Sy \- , it is not readable. .It If .Sy w , the file is writable; if .Sy \- , it is not writable. .It The first of the following that applies: .Bl -tag -width 4n -offset indent .It Sy S If in the owner permissions, the file is not executable and set-user-ID mode is set. If in the group permissions, the file is not executable and set-group-ID mode is set. .It Sy s If in the owner permissions, the file is executable and set-user-ID mode is set. If in the group permissions, the file is executable and setgroup-ID mode is set. .It Sy x The file is executable or the directory is searchable. .It Sy \- The file is neither readable, writable, executable, nor set-user-ID nor set-group-ID mode, nor sticky. (See below.) .El .Pp These next two apply only to the third character in the last group (other permissions). .Bl -tag -width 4n -offset indent .It Sy T The sticky bit is set (mode .Li 1000 ) , but not execute or search permission. (See .Xr chmod 1 or .Xr sticky 8 . ) .It Sy t The sticky bit is set (mode .Li 1000 ) , and is searchable or executable. (See .Xr chmod 1 or .Xr sticky 8 . ) .El .El .Sh EXAMPLES The following is how to do an .Nm listing sorted by size (and shows why .Nm does not need a separate option for this): .Pp .Dl "ls -l | sort -n +4" .Pp Additionally, the .Fl r flag to .Xr sort 1 may be used to get the results sorted from largest to smallest (a reverse sort). .Sh DIAGNOSTICS .Ex -std .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : .Bl -tag -width BLOCKSIZE .It Ev BLOCKSIZE If the environment variable .Ev BLOCKSIZE is set, the block counts (see .Fl s ) will be displayed in units of that size block. .It Ev CLICOLOR Use .Tn ANSI color sequences to distinguish file types. See .Ev LSCOLORS below. In addition to the file types mentioned in the .Fl F option some extra attributes (setuid bit set, etc.) are also displayed. The colorization is dependent on a terminal type with the proper .Xr termcap 5 capabilities. The default .Dq cons25 console has the proper capabilities, but to display the colors in an .Xr xterm 1 , for example, the .Ev TERM variable must be set to .Dq xterm-color . Other terminal types may require similar adjustments. Colorization is silently disabled if the output isn't directed to a terminal unless the .Ev CLICOLOR_FORCE variable is defined. .It Ev CLICOLOR_FORCE Color sequences are normally disabled if the output isn't directed to a terminal. This can be overridden by setting this flag. The .Ev TERM variable still needs to reference a color capable terminal however otherwise it is not possible to determine which color sequences to use. .It Ev COLUMNS If this variable contains a string representing a decimal integer, it is used as the column position width for displaying multiple-text-column output. The .Nm utility calculates how many pathname text columns to display based on the width provided. (See .Fl C . ) .It Ev LANG The locale to use when determining the order of day and month in the long .Fl l format output. See .Xr environ 7 for more information. .It Ev LSCOLORS The value of this variable describes what color to use for which attribute when colors are enabled with .Ev CLICOLOR . This string is a concatenation of pairs of the format .Sy fb , where .Sy f is the foreground color and .Sy b is the background color. .Pp The color designators are as follows: .Pp .Bl -tag -width 4n -offset indent -compact .It Sy a black .It Sy b red .It Sy c green .It Sy d brown .It Sy e blue .It Sy f magenta .It Sy g cyan .It Sy h light grey .It Sy A bold black, usually shows up as dark grey .It Sy B bold red .It Sy C bold green .It Sy D bold brown, usually shows up as yellow .It Sy E bold blue .It Sy F bold magenta .It Sy G bold cyan .It Sy H bold light grey; looks like bright white .It Sy x default foreground or background .El .Pp Note that the above are standard .Tn ANSI colors. The actual display may differ depending on the color capabilities of the terminal in use. .Pp The order of the attributes are as follows: .Pp .Bl -enum -offset indent -compact .It directory .It symbolic link .It socket .It pipe .It executable .It block special .It character special .It executable with setuid bit set .It executable with setgid bit set .It directory writable to others, with sticky bit .It directory writable to others, without sticky bit .El .Pp The default is "exfxcxdxbxegedabagacad", i.e. blue foreground and default background for regular directories, black foreground and red background for setuid executables, etc. .It Ev LS_COLWIDTHS If this variable is set, it is considered to be a colon-delimited list of minimum column widths. Unreasonable and insufficient widths are ignored (thus zero signifies a dynamically sized column). Not all columns have changeable widths. The fields are, in order: inode, block count, number of links, user name, group name, flags, file size, file name. .It Ev TERM The .Ev CLICOLOR functionality depends on a terminal type with color capabilities. .It Ev TZ The timezone to use when displaying dates. See .Xr environ 7 for more information. .El .Sh COMPATIBILITY The group field is now automatically included in the long listing for files in order to be compatible with the .St -p1003.2 specification. .Sh FILES .Bl -tag -width ".Pa /dev/lomac" -compact .It Pa /dev/lomac interface used to query the .Xr lomac 4 KLD .El .Sh SEE ALSO .Xr chflags 1 , .Xr chmod 1 , .Xr sort 1 , .Xr xterm 1 , .Xr lomac 4 , .Xr termcap 5 , .Xr symlink 7 , .Xr sticky 8 .Sh HISTORY An .Nm command appeared in .At v1 . .Sh STANDARDS The .Nm function is expected to be a superset of the .St -p1003.2 specification. .Sh BUGS To maintain backward compatibility, the relationships between the many options are quite complex. + + + + +*************** +*** 43,49 **** + .Nd list directory contents + .Sh SYNOPSIS + .Nm +- .Op Fl ABCFGHLPRTWabcdfgiklnoqrstu1 + .Op Ar + .Sh DESCRIPTION + For each operand that names a +--- 43,49 ---- + .Nd list directory contents + .Sh SYNOPSIS + .Nm + .Op Ar + .Sh DESCRIPTION + For each operand that names a Index: head/bin/ls/ls.c =================================================================== --- head/bin/ls/ls.c (revision 88590) +++ head/bin/ls/ls.c (revision 88591) @@ -1,752 +1,756 @@ /* * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Michael Fischbein. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint #if 0 static char sccsid[] = "@(#)ls.c 8.5 (Berkeley) 4/2/94"; #else static const char rcsid[] = "$FreeBSD$"; #endif #endif /* not lint */ #include #include #include #include #include #include #include #include #include #include #include #include #include #ifdef COLORLS #include #include #endif #include "ls.h" #include "extern.h" #include "lomac.h" /* * Upward approximation of the maximum number of characters needed to * represent a value of integral type t as a string, excluding the * NUL terminator, with provision for a sign. */ #define STRBUF_SIZEOF(t) (1 + CHAR_BIT * sizeof(t) / 3 + 1) static void display __P((FTSENT *, FTSENT *)); static u_quad_t makenines __P((u_long)); static int mastercmp __P((const FTSENT **, const FTSENT **)); static void traverse __P((int, char **, int)); static void (*printfcn) __P((DISPLAY *)); static int (*sortfcn) __P((const FTSENT *, const FTSENT *)); long blocksize; /* block size units */ int termwidth = 80; /* default terminal width */ /* flags */ int f_accesstime; /* use time of last access */ int f_column; /* columnated format */ int f_flags; /* show flags associated with a file */ +int f_humanval; /* show human-readable file sizes */ int f_inode; /* print inode */ int f_kblocks; /* print size in kilobytes */ int f_listdir; /* list actual directory, not contents */ int f_listdot; /* list files beginning with . */ int f_longform; /* long listing format */ int f_nonprint; /* show unprintables as ? */ int f_nosort; /* don't sort output */ int f_notabs; /* don't use tab-separated multi-col output */ int f_numericonly; /* don't convert uid/gid to name */ int f_octal; /* show unprintables as \xxx */ int f_octal_escape; /* like f_octal but use C escapes if possible */ int f_recursive; /* ls subdirectories also */ int f_reversesort; /* reverse whatever sort is used */ int f_sectime; /* print the real time for all files */ int f_singlecol; /* use single column output */ int f_size; /* list size in short listing */ int f_statustime; /* use time of last mode change */ int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ int f_whiteout; /* show whiteout entries */ int f_lomac; /* show LOMAC attributes */ #ifdef COLORLS int f_color; /* add type in color for non-regular files */ char *ansi_bgcol; /* ANSI sequence to set background colour */ char *ansi_fgcol; /* ANSI sequence to set foreground colour */ char *ansi_coloff; /* ANSI sequence to reset colours */ char *attrs_off; /* ANSI sequence to turn off attributes */ char *enter_bold; /* ANSI sequence to set color to bold mode */ #endif int rval; int main(argc, argv) int argc; char *argv[]; { static char dot[] = ".", *dotav[] = { dot, NULL }; struct winsize win; int ch, fts_options, notused; char *p; #ifdef COLORLS char termcapbuf[1024]; /* termcap definition buffer */ char tcapbuf[512]; /* capability buffer */ char *bp = tcapbuf; #endif (void) setlocale(LC_ALL, ""); /* Terminal defaults to -Cq, non-terminal defaults to -1. */ if (isatty(STDOUT_FILENO)) { if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) == -1 || !win.ws_col) { if ((p = getenv("COLUMNS")) != NULL) termwidth = atoi(p); } else termwidth = win.ws_col; f_column = f_nonprint = 1; } else { f_singlecol = 1; /* retrieve environment variable, in case of explicit -C */ if ((p = getenv("COLUMNS"))) termwidth = atoi(p); } /* Root is -A automatically. */ if (!getuid()) f_listdot = 1; fts_options = FTS_PHYSICAL; - while ((ch = getopt(argc, argv, "1ABCFGHLPRTWZabcdfgiklnoqrstu")) != -1) { + while ((ch = getopt(argc, argv, "1ABCFGHLPRTWZabcdfghiklnoqrstu")) != -1) { switch (ch) { /* * The -1, -C and -l options all override each other so shell * aliasing works right. */ case '1': f_singlecol = 1; f_column = f_longform = 0; break; case 'B': f_nonprint = 0; f_octal = 1; f_octal_escape = 0; break; case 'C': f_column = 1; f_longform = f_singlecol = 0; break; case 'l': f_longform = 1; f_column = f_singlecol = 0; break; /* The -c and -u options override each other. */ case 'c': f_statustime = 1; f_accesstime = 0; break; case 'u': f_accesstime = 1; f_statustime = 0; break; case 'F': f_type = 1; break; case 'H': fts_options |= FTS_COMFOLLOW; break; case 'G': setenv("CLICOLOR", "", 1); break; case 'L': fts_options &= ~FTS_PHYSICAL; fts_options |= FTS_LOGICAL; break; case 'P': fts_options &= ~FTS_COMFOLLOW; fts_options &= ~FTS_LOGICAL; fts_options |= FTS_PHYSICAL; break; case 'R': f_recursive = 1; break; case 'a': fts_options |= FTS_SEEDOT; /* FALLTHROUGH */ case 'A': f_listdot = 1; break; /* The -d option turns off the -R option. */ case 'd': f_listdir = 1; f_recursive = 0; break; case 'f': f_nosort = 1; break; case 'g': /* Compatibility with 4.3BSD. */ + break; + case 'h': + f_humanval = 1; break; case 'i': f_inode = 1; break; case 'k': f_kblocks = 1; break; case 'n': f_numericonly = 1; break; case 'o': f_flags = 1; break; case 'q': f_nonprint = 1; f_octal = 0; f_octal_escape = 0; break; case 'r': f_reversesort = 1; break; case 's': f_size = 1; break; case 'T': f_sectime = 1; break; case 't': f_timesort = 1; break; case 'W': f_whiteout = 1; break; case 'b': f_nonprint = 0; f_octal = 0; f_octal_escape = 1; break; case 'Z': f_lomac = 1; break; default: case '?': usage(); } } argc -= optind; argv += optind; /* Enabling of colours is conditional on the environment. */ if (getenv("CLICOLOR") && (isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE"))) #ifdef COLORLS if (tgetent(termcapbuf, getenv("TERM")) == 1) { ansi_fgcol = tgetstr("AF", &bp); ansi_bgcol = tgetstr("AB", &bp); attrs_off = tgetstr("me", &bp); enter_bold = tgetstr("md", &bp); /* To switch colours off use 'op' if * available, otherwise use 'oc', or * don't do colours at all. */ ansi_coloff = tgetstr("op", &bp); if (!ansi_coloff) ansi_coloff = tgetstr("oc", &bp); if (ansi_fgcol && ansi_bgcol && ansi_coloff) f_color = 1; } #else (void)fprintf(stderr, "Color support not compiled in.\n"); #endif /*COLORLS*/ #ifdef COLORLS if (f_color) { /* * We can't put tabs and color sequences together: * column number will be incremented incorrectly * for "stty oxtabs" mode. */ f_notabs = 1; (void) signal(SIGINT, colorquit); (void) signal(SIGQUIT, colorquit); parsecolors(getenv("LSCOLORS")); } #endif /* * If not -F, -i, -l, -s or -t options, don't require stat * information, unless in color mode in which case we do * need this to determine which colors to display. */ if (!f_inode && !f_longform && !f_size && !f_timesort && !f_type #ifdef COLORLS && !f_color #endif ) fts_options |= FTS_NOSTAT; /* * If not -F, -d or -l options, follow any symbolic links listed on * the command line. */ if (!f_longform && !f_listdir && !f_type) fts_options |= FTS_COMFOLLOW; /* * If -W, show whiteout entries */ #ifdef FTS_WHITEOUT if (f_whiteout) fts_options |= FTS_WHITEOUT; #endif /* If -l or -s, figure out block size. */ if (f_longform || f_size) { if (f_kblocks) blocksize = 2; else { (void)getbsize(¬used, &blocksize); blocksize /= 512; } } /* Select a sort function. */ if (f_reversesort) { if (!f_timesort) sortfcn = revnamecmp; else if (f_accesstime) sortfcn = revacccmp; else if (f_statustime) sortfcn = revstatcmp; else /* Use modification time. */ sortfcn = revmodcmp; } else { if (!f_timesort) sortfcn = namecmp; else if (f_accesstime) sortfcn = acccmp; else if (f_statustime) sortfcn = statcmp; else /* Use modification time. */ sortfcn = modcmp; } /* Select a print function. */ if (f_singlecol) printfcn = printscol; else if (f_longform) printfcn = printlong; else printfcn = printcol; if (argc) traverse(argc, argv, fts_options); else traverse(1, dotav, fts_options); exit(rval); } static int output; /* If anything output. */ /* * Traverse() walks the logical directory structure specified by the argv list * in the order specified by the mastercmp() comparison function. During the * traversal it passes linked lists of structures to display() which represent * a superset (may be exact set) of the files to be displayed. */ static void traverse(argc, argv, options) int argc, options; char *argv[]; { FTS *ftsp; FTSENT *p, *chp; int ch_options; if ((ftsp = fts_open(argv, options, f_nosort ? NULL : mastercmp)) == NULL) err(1, NULL); display(NULL, fts_children(ftsp, 0)); if (f_listdir) return; /* * If not recursing down this tree and don't need stat info, just get * the names. */ ch_options = !f_recursive && options & FTS_NOSTAT ? FTS_NAMEONLY : 0; while ((p = fts_read(ftsp)) != NULL) switch (p->fts_info) { case FTS_DC: warnx("%s: directory causes a cycle", p->fts_name); break; case FTS_DNR: case FTS_ERR: warnx("%s: %s", p->fts_name, strerror(p->fts_errno)); rval = 1; break; case FTS_D: if (p->fts_level != FTS_ROOTLEVEL && p->fts_name[0] == '.' && !f_listdot) break; /* * If already output something, put out a newline as * a separator. If multiple arguments, precede each * directory with its name. */ if (output) (void)printf("\n%s:\n", p->fts_path); else if (argc > 1) { (void)printf("%s:\n", p->fts_path); output = 1; } chp = fts_children(ftsp, ch_options); display(p, chp); if (!f_recursive && chp != NULL) (void)fts_set(ftsp, p, FTS_SKIP); break; } if (errno) err(1, "fts_read"); } /* * Display() takes a linked list of FTSENT structures and passes the list * along with any other necessary information to the print function. P * points to the parent directory of the display list. */ static void display(p, list) FTSENT *p, *list; { struct stat *sp; DISPLAY d; FTSENT *cur; NAMES *np; u_quad_t maxsize; u_long btotal, maxblock, maxinode, maxlen, maxnlink, maxlattr; int bcfile, flen, glen, ulen, lattrlen, maxflags, maxgroup, maxuser; char *initmax; int entries, needstats; char *user, *group, *flags, *lattr; char buf[STRBUF_SIZEOF(u_quad_t) + 1]; char ngroup[STRBUF_SIZEOF(uid_t) + 1]; char nuser[STRBUF_SIZEOF(gid_t) + 1]; /* * If list is NULL there are two possibilities: that the parent * directory p has no children, or that fts_children() returned an * error. We ignore the error case since it will be replicated * on the next call to fts_read() on the post-order visit to the * directory p, and will be signaled in traverse(). */ if (list == NULL) return; needstats = f_inode || f_longform || f_size; flen = 0; btotal = 0; initmax = getenv("LS_COLWIDTHS"); /* Fields match -lios order. New ones should be added at the end. */ if (initmax != NULL && *initmax != '\0') { char *initmax2, *jinitmax; int ninitmax; /* Fill-in "::" as "0:0:0" for the sake of scanf. */ jinitmax = initmax2 = malloc(strlen(initmax) * 2 + 2); if (jinitmax == NULL) err(1, NULL); if (*initmax == ':') strcpy(initmax2, "0:"), initmax2 += 2; else *initmax2++ = *initmax, *initmax2 = '\0'; for (initmax++; *initmax != '\0'; initmax++) { if (initmax[-1] == ':' && initmax[0] == ':') { *initmax2++ = '0'; *initmax2++ = initmax[0]; initmax2[1] = '\0'; } else { *initmax2++ = initmax[0]; initmax2[1] = '\0'; } } if (initmax2[-1] == ':') strcpy(initmax2, "0"); ninitmax = sscanf(jinitmax, " %lu : %lu : %lu : %i : %i : %i : %qu : %lu : %lu ", &maxinode, &maxblock, &maxnlink, &maxuser, &maxgroup, &maxflags, &maxsize, &maxlen, &maxlattr); f_notabs = 1; switch (ninitmax) { case 0: maxinode = 0; case 1: maxblock = 0; case 2: maxnlink = 0; case 3: maxuser = 0; case 4: maxgroup = 0; case 5: maxflags = 0; case 6: maxsize = 0; case 7: maxlen = 0; case 8: maxlattr = 0; #ifdef COLORLS if (!f_color) #endif f_notabs = 0; } maxinode = makenines(maxinode); maxblock = makenines(maxblock); maxnlink = makenines(maxnlink); maxsize = makenines(maxsize); } else if (initmax == NULL || *initmax == '\0') maxlattr = maxblock = maxinode = maxlen = maxnlink = maxuser = maxgroup = maxflags = maxsize = 0; if (f_lomac) lomac_start(); bcfile = 0; flags = NULL; for (cur = list, entries = 0; cur; cur = cur->fts_link) { if (cur->fts_info == FTS_ERR || cur->fts_info == FTS_NS) { warnx("%s: %s", cur->fts_name, strerror(cur->fts_errno)); cur->fts_number = NO_PRINT; rval = 1; continue; } /* * P is NULL if list is the argv list, to which different rules * apply. */ if (p == NULL) { /* Directories will be displayed later. */ if (cur->fts_info == FTS_D && !f_listdir) { cur->fts_number = NO_PRINT; continue; } } else { /* Only display dot file if -a/-A set. */ if (cur->fts_name[0] == '.' && !f_listdot) { cur->fts_number = NO_PRINT; continue; } } if (cur->fts_namelen > maxlen) maxlen = cur->fts_namelen; if (f_octal || f_octal_escape) { u_long t = len_octal(cur->fts_name, cur->fts_namelen); if (t > maxlen) maxlen = t; } if (needstats) { sp = cur->fts_statp; if (sp->st_blocks > maxblock) maxblock = sp->st_blocks; if (sp->st_ino > maxinode) maxinode = sp->st_ino; if (sp->st_nlink > maxnlink) maxnlink = sp->st_nlink; if (sp->st_size > maxsize) maxsize = sp->st_size; btotal += sp->st_blocks; if (f_longform) { if (f_numericonly) { (void)snprintf(nuser, sizeof(nuser), "%u", sp->st_uid); (void)snprintf(ngroup, sizeof(ngroup), "%u", sp->st_gid); user = nuser; group = ngroup; } else { user = user_from_uid(sp->st_uid, 0); group = group_from_gid(sp->st_gid, 0); } if ((ulen = strlen(user)) > maxuser) maxuser = ulen; if ((glen = strlen(group)) > maxgroup) maxgroup = glen; if (f_flags) { flags = fflagstostr(sp->st_flags); if (flags != NULL && *flags == '\0') { free(flags); flags = strdup("-"); } if (flags == NULL) err(1, NULL); if ((flen = strlen(flags)) > maxflags) maxflags = flen; } else flen = 0; if (f_lomac) { lattr = get_lattr(cur); lattrlen = strlen(lattr); if (lattrlen > maxlattr) maxlattr = lattrlen; } else lattrlen = 0; if ((np = malloc(sizeof(NAMES) + lattrlen + ulen + glen + flen + 4)) == NULL) err(1, NULL); np->user = &np->data[0]; (void)strcpy(np->user, user); np->group = &np->data[ulen + 1]; (void)strcpy(np->group, group); if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode)) bcfile = 1; if (f_flags) { np->flags = &np->data[ulen + glen + 2]; (void)strcpy(np->flags, flags); free(flags); } if (f_lomac) { np->lattr = &np->data[ulen + glen + 2 + (f_flags ? flen + 1 : 0)]; (void)strcpy(np->lattr, lattr); free(lattr); } cur->fts_pointer = np; } } ++entries; } if (!entries) return; d.list = list; d.entries = entries; d.maxlen = maxlen; if (needstats) { d.bcfile = bcfile; d.btotal = btotal; (void)snprintf(buf, sizeof(buf), "%lu", maxblock); d.s_block = strlen(buf); d.s_flags = maxflags; d.s_lattr = maxlattr; d.s_group = maxgroup; (void)snprintf(buf, sizeof(buf), "%lu", maxinode); d.s_inode = strlen(buf); (void)snprintf(buf, sizeof(buf), "%lu", maxnlink); d.s_nlink = strlen(buf); (void)snprintf(buf, sizeof(buf), "%qu", maxsize); d.s_size = strlen(buf); d.s_user = maxuser; } printfcn(&d); output = 1; if (f_longform) for (cur = list; cur; cur = cur->fts_link) free(cur->fts_pointer); if (f_lomac) lomac_stop(); } /* * Ordering for mastercmp: * If ordering the argv (fts_level = FTS_ROOTLEVEL) return non-directories * as larger than directories. Within either group, use the sort function. * All other levels use the sort function. Error entries remain unsorted. */ static int mastercmp(a, b) const FTSENT **a, **b; { int a_info, b_info; a_info = (*a)->fts_info; if (a_info == FTS_ERR) return (0); b_info = (*b)->fts_info; if (b_info == FTS_ERR) return (0); if (a_info == FTS_NS || b_info == FTS_NS) return (namecmp(*a, *b)); if (a_info != b_info && (*a)->fts_level == FTS_ROOTLEVEL && !f_listdir) { if (a_info == FTS_D) return (1); if (b_info == FTS_D) return (-1); } return (sortfcn(*a, *b)); } /* * Makenines() returns (10**n)-1. This is useful for converting a width * into a number that wide in decimal. */ static u_quad_t makenines(n) u_long n; { u_long i; u_quad_t reg; reg = 1; /* Use a loop instead of pow(), since all values of n are small. */ for (i = 0; i < n; i++) reg *= 10; reg--; return reg; } Index: head/bin/ls/ls.h =================================================================== --- head/bin/ls/ls.h (revision 88590) +++ head/bin/ls/ls.h (revision 88591) @@ -1,84 +1,85 @@ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Michael Fischbein. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 * $FreeBSD$ */ #define NO_PRINT 1 extern long blocksize; /* block size units */ extern int f_accesstime; /* use time of last access */ extern int f_flags; /* show flags associated with a file */ +extern int f_humanval; /* show human-readable file sizes */ extern int f_lomac; /* show LOMAC attributes */ extern int f_inode; /* print inode */ extern int f_longform; /* long listing format */ extern int f_octal; /* print unprintables in octal */ extern int f_octal_escape; /* like f_octal but use C escapes if possible */ extern int f_nonprint; /* show unprintables as ? */ extern int f_sectime; /* print the real time for all files */ extern int f_size; /* list size in short listing */ extern int f_statustime; /* use time of last mode change */ extern int f_notabs; /* don't use tab-separated multi-col output */ extern int f_type; /* add type character for non-regular files */ #ifdef COLORLS extern int f_color; /* add type in color for non-regular files */ #endif typedef struct { FTSENT *list; u_long btotal; int bcfile; int entries; int maxlen; int s_block; int s_flags; int s_lattr; int s_group; int s_inode; int s_nlink; int s_size; int s_user; } DISPLAY; typedef struct { char *user; char *group; char *flags; char *lattr; char data[1]; } NAMES; Index: head/bin/ls/print.c =================================================================== --- head/bin/ls/print.c (revision 88590) +++ head/bin/ls/print.c (revision 88591) @@ -1,552 +1,622 @@ /* * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Michael Fischbein. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #ifndef lint #if 0 static char sccsid[] = "@(#)print.c 8.4 (Berkeley) 4/17/94"; #else static const char rcsid[] = "$FreeBSD$"; #endif #endif /* not lint */ #include #include #include #include #include #include +#include #include #include #include #include #include #include #include #ifdef COLORLS #include #include #include #endif #include "ls.h" #include "extern.h" static int printaname __P((FTSENT *, u_long, u_long)); static void printlink __P((FTSENT *)); static void printtime __P((time_t)); static int printtype __P((u_int)); +static void printsize __P((size_t, off_t)); #ifdef COLORLS static void endcolor __P((int)); static int colortype __P((mode_t)); #endif #define IS_NOPRINT(p) ((p)->fts_number == NO_PRINT) +#define UNITS_2 2 +#define KILO_SZ(n) (n) +#define MEGA_SZ(n) ((n) * (n)) +#define GIGA_SZ(n) ((n) * (n) * (n)) +#define TERA_SZ(n) ((n) * (n) * (n) * (n)) +#define PETA_SZ(n) ((n) * (n) * (n) * (n) * (n)) + +#define KILO_2_SZ (KILO_SZ(1024ULL)) +#define MEGA_2_SZ (MEGA_SZ(1024ULL)) +#define GIGA_2_SZ (GIGA_SZ(1024ULL)) +#define TERA_2_SZ (TERA_SZ(1024ULL)) +#define PETA_2_SZ (PETA_SZ(1024ULL)) + +unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ}; + +typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t; +static unit_t unit_adjust __P((off_t *)); + +int unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; + #ifdef COLORLS /* Most of these are taken from */ typedef enum Colors { C_DIR, /* directory */ C_LNK, /* symbolic link */ C_SOCK, /* socket */ C_FIFO, /* pipe */ C_EXEC, /* executable */ C_BLK, /* block special */ C_CHR, /* character special */ C_SUID, /* setuid executable */ C_SGID, /* setgid executable */ C_WSDIR, /* directory writeble to others, with sticky bit */ C_WDIR, /* directory writeble to others, without sticky bit */ C_NUMCOLORS /* just a place-holder */ } Colors; const char *defcolors = "exfxcxdxbxegedabagacad"; /* colors for file types */ static struct { int num[2]; int bold; } colors[C_NUMCOLORS]; #endif void printscol(dp) DISPLAY *dp; { FTSENT *p; for (p = dp->list; p; p = p->fts_link) { if (IS_NOPRINT(p)) continue; (void)printaname(p, dp->s_inode, dp->s_block); (void)putchar('\n'); } } /* * print name in current style */ static int printname(name) const char *name; { if (f_octal || f_octal_escape) return prn_octal(name); else if (f_nonprint) return prn_printable(name); else return printf("%s", name); } void printlong(dp) DISPLAY *dp; { struct stat *sp; FTSENT *p; NAMES *np; char buf[20]; #ifdef COLORLS int color_printed = 0; #endif if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size)) (void)printf("total %lu\n", howmany(dp->btotal, blocksize)); for (p = dp->list; p; p = p->fts_link) { if (IS_NOPRINT(p)) continue; sp = p->fts_statp; if (f_inode) (void)printf("%*lu ", dp->s_inode, (u_long)sp->st_ino); if (f_size) (void)printf("%*qd ", dp->s_block, howmany(sp->st_blocks, blocksize)); (void)strmode(sp->st_mode, buf); np = p->fts_pointer; (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, sp->st_nlink, dp->s_user, np->user, dp->s_group, np->group); if (f_flags) (void)printf("%-*s ", dp->s_flags, np->flags); if (f_lomac) (void)printf("%-*s ", dp->s_lattr, np->lattr); if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode)) if (minor(sp->st_rdev) > 255 || minor(sp->st_rdev) < 0) (void)printf("%3d, 0x%08x ", major(sp->st_rdev), (u_int)minor(sp->st_rdev)); else (void)printf("%3d, %3d ", major(sp->st_rdev), minor(sp->st_rdev)); else if (dp->bcfile) (void)printf("%*s%*qd ", 8 - dp->s_size, "", dp->s_size, sp->st_size); else - (void)printf("%*qd ", dp->s_size, sp->st_size); + printsize(dp->s_size, sp->st_size); if (f_accesstime) printtime(sp->st_atime); else if (f_statustime) printtime(sp->st_ctime); else printtime(sp->st_mtime); #ifdef COLORLS if (f_color) color_printed = colortype(sp->st_mode); #endif (void)printname(p->fts_name); #ifdef COLORLS if (f_color && color_printed) endcolor(0); #endif if (f_type) (void)printtype(sp->st_mode); if (S_ISLNK(sp->st_mode)) printlink(p); (void)putchar('\n'); } } void printcol(dp) DISPLAY *dp; { extern int termwidth; static FTSENT **array; static int lastentries = -1; FTSENT *p; int base; int chcnt; int cnt; int col; int colwidth; int endcol; int num; int numcols; int numrows; int row; int tabwidth; if (f_notabs) tabwidth = 1; else tabwidth = 8; /* * Have to do random access in the linked list -- build a table * of pointers. */ if (dp->entries > lastentries) { lastentries = dp->entries; if ((array = realloc(array, dp->entries * sizeof(FTSENT *))) == NULL) { warn(NULL); printscol(dp); } } for (p = dp->list, num = 0; p; p = p->fts_link) if (p->fts_number != NO_PRINT) array[num++] = p; colwidth = dp->maxlen; if (f_inode) colwidth += dp->s_inode + 1; if (f_size) colwidth += dp->s_block + 1; if (f_type) colwidth += 1; colwidth = (colwidth + tabwidth) & ~(tabwidth - 1); if (termwidth < 2 * colwidth) { printscol(dp); return; } numcols = termwidth / colwidth; numrows = num / numcols; if (num % numcols) ++numrows; if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size)) (void)printf("total %lu\n", howmany(dp->btotal, blocksize)); for (row = 0; row < numrows; ++row) { endcol = colwidth; for (base = row, chcnt = col = 0; col < numcols; ++col) { chcnt += printaname(array[base], dp->s_inode, dp->s_block); if ((base += numrows) >= num) break; while ((cnt = ((chcnt + tabwidth) & ~(tabwidth - 1))) <= endcol){ (void)putchar(f_notabs ? ' ' : '\t'); chcnt = cnt; } endcol += colwidth; } (void)putchar('\n'); } } /* * print [inode] [size] name * return # of characters printed, no trailing characters. */ static int printaname(p, inodefield, sizefield) FTSENT *p; u_long inodefield; u_long sizefield; { struct stat *sp; int chcnt; #ifdef COLORLS int color_printed = 0; #endif sp = p->fts_statp; chcnt = 0; if (f_inode) chcnt += printf("%*lu ", (int)inodefield, (u_long)sp->st_ino); if (f_size) chcnt += printf("%*qd ", (int)sizefield, howmany(sp->st_blocks, blocksize)); #ifdef COLORLS if (f_color) color_printed = colortype(sp->st_mode); #endif chcnt += printname(p->fts_name); #ifdef COLORLS if (f_color && color_printed) endcolor(0); #endif if (f_type) chcnt += printtype(sp->st_mode); return (chcnt); } static void printtime(ftime) time_t ftime; { char longstring[80]; static time_t now; const char *format; static int d_first = -1; if (d_first < 0) d_first = (*nl_langinfo(D_MD_ORDER) == 'd'); if (now == 0) now = time(NULL); #define SIXMONTHS ((365 / 2) * 86400) if (f_sectime) /* mmm dd hh:mm:ss yyyy || dd mmm hh:mm:ss yyyy */ format = d_first ? "%e %b %T %Y " : "%b %e %T %Y "; else if (ftime + SIXMONTHS > now && ftime < now + SIXMONTHS) /* mmm dd hh:mm || dd mmm hh:mm */ format = d_first ? "%e %b %R " : "%b %e %R "; else /* mmm dd yyyy || dd mmm yyyy */ format = d_first ? "%e %b %Y " : "%b %e %Y "; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); } static int printtype(mode) u_int mode; { switch (mode & S_IFMT) { case S_IFDIR: (void)putchar('/'); return (1); case S_IFIFO: (void)putchar('|'); return (1); case S_IFLNK: (void)putchar('@'); return (1); case S_IFSOCK: (void)putchar('='); return (1); case S_IFWHT: (void)putchar('%'); return (1); } if (mode & (S_IXUSR | S_IXGRP | S_IXOTH)) { (void)putchar('*'); return (1); } return (0); } #ifdef COLORLS static int putch(c) int c; { (void) putchar(c); return 0; } static int writech(c) int c; { char tmp = c; (void) write(STDOUT_FILENO, &tmp, 1); return 0; } static void printcolor(c) Colors c; { char *ansiseq; if (colors[c].bold) tputs(enter_bold, 1, putch); if (colors[c].num[0] != -1) { ansiseq = tgoto(ansi_fgcol, 0, colors[c].num[0]); if (ansiseq) tputs(ansiseq, 1, putch); } if (colors[c].num[1] != -1) { ansiseq = tgoto(ansi_bgcol, 0, colors[c].num[1]); if (ansiseq) tputs(ansiseq, 1, putch); } } static void endcolor(sig) int sig; { tputs(ansi_coloff, 1, sig ? writech : putch); tputs(attrs_off, 1, sig ? writech : putch); } static int colortype(mode) mode_t mode; { switch(mode & S_IFMT) { case S_IFDIR: if (mode & S_IWOTH) if (mode & S_ISTXT) printcolor(C_WSDIR); else printcolor(C_WDIR); else printcolor(C_DIR); return(1); case S_IFLNK: printcolor(C_LNK); return(1); case S_IFSOCK: printcolor(C_SOCK); return(1); case S_IFIFO: printcolor(C_FIFO); return(1); case S_IFBLK: printcolor(C_BLK); return(1); case S_IFCHR: printcolor(C_CHR); return(1); } if (mode & (S_IXUSR | S_IXGRP | S_IXOTH)) { if (mode & S_ISUID) printcolor(C_SUID); else if (mode & S_ISGID) printcolor(C_SGID); else printcolor(C_EXEC); return(1); } return(0); } void parsecolors(cs) const char *cs; { int i; int j; int len; char c[2]; short legacy_warn = 0; if (cs == NULL) cs = ""; /* LSCOLORS not set */ len = strlen(cs); for (i = 0 ; i < C_NUMCOLORS ; i++) { colors[i].bold = 0; if (len <= 2 * i) { c[0] = defcolors[2 * i]; c[1] = defcolors[2 * i + 1]; } else { c[0] = cs[2 * i]; c[1] = cs[2 * i + 1]; } for (j = 0 ; j < 2 ; j++) { /* Legacy colours used 0-7 */ if (c[j] >= '0' && c[j] <= '7') { colors[i].num[j] = c[j] - '0'; if (!legacy_warn) { fprintf(stderr, "warn: LSCOLOURS should use " "characters a-h instead of 0-9 (" "see the manual page)\n"); } legacy_warn = 1; } else if (c[j] >= 'a' && c[j] <= 'h') colors[i].num[j] = c[j] - 'a'; else if (c[j] >= 'A' && c[j] <= 'H') { colors[i].num[j] = c[j] - 'A'; colors[i].bold = 1; } else if (tolower((unsigned char)c[j] == 'x')) colors[i].num[j] = -1; else { fprintf(stderr, "error: invalid character '%c' in LSCOLORS" " env var\n", c[j]); colors[i].num[j] = -1; } } } } void colorquit(sig) int sig; { endcolor(sig); (void) signal(sig, SIG_DFL); (void) kill(getpid(), sig); } #endif /*COLORLS*/ static void printlink(p) FTSENT *p; { int lnklen; char name[MAXPATHLEN + 1]; char path[MAXPATHLEN + 1]; if (p->fts_level == FTS_ROOTLEVEL) (void)snprintf(name, sizeof(name), "%s", p->fts_name); else (void)snprintf(name, sizeof(name), "%s/%s", p->fts_parent->fts_accpath, p->fts_name); if ((lnklen = readlink(name, path, sizeof(path) - 1)) == -1) { (void)fprintf(stderr, "\nls: %s: %s\n", name, strerror(errno)); return; } path[lnklen] = '\0'; (void)printf(" -> "); printname(path); +} + +static void +printsize(width, bytes) + size_t width; + off_t bytes; +{ + unit_t unit; + + if (f_humanval) { + unit = unit_adjust(&bytes); + + if (bytes == 0) + (void)printf("%*s ", width, "0B"); + else + (void)printf("%*qd%c ", width - 1, bytes, + "BKMGTPE"[unit]); + } + else + (void)printf("%*qd ", width, bytes); +} + +/* + * Output in "human-readable" format. Uses 3 digits max and puts + * unit suffixes at the end. Makes output compact and easy to read, + * especially on huge disks. + * + */ +unit_t +unit_adjust(val) + off_t *val; +{ + double abval; + unit_t unit; + unsigned int unit_sz; + + abval = fabs(*val); + + unit_sz = abval ? ilogb(abval) / 10 : 0; + + if (unit_sz >= UNIT_MAX) { + unit = NONE; + } else { + unit = unitp[unit_sz]; + *val /= (double)vals_base2[unit_sz]; + } + + return (unit); } Index: head/bin/ls/util.c =================================================================== --- head/bin/ls/util.c (revision 88590) +++ head/bin/ls/util.c (revision 88591) @@ -1,171 +1,171 @@ /* * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Michael Fischbein. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #ifndef lint #if 0 static char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/2/94"; #else static const char rcsid[] = "$FreeBSD$"; #endif #endif /* not lint */ #include #include #include #include #include #include #include #include #include "ls.h" #include "extern.h" int prn_printable(s) const char *s; { unsigned char c; int n; for (n = 0; (c = *s) != '\0'; ++s, ++n) if (isprint(c)) putchar(c); else putchar('?'); return n; } /* * The fts system makes it difficult to replace fts_name with a different- * sized string, so we just calculate the real length here and do the * conversion in prn_octal() * * XXX when using f_octal_escape (-b) rather than f_octal (-B), the * length computed by len_octal may be too big. I just can't be buggered * to fix this as an efficient fix would involve a lookup table. Same goes * for the rather inelegant code in prn_octal. * * DES 1998/04/23 */ int len_octal(s, len) const char *s; int len; { int r = 0; while (len--) if (isprint((unsigned char)*s++)) r++; else r += 4; return r; } int prn_octal(s) const char *s; { unsigned char ch; int len = 0; while ((ch = *s++)) { if (isprint(ch) && (ch != '\"') && (ch != '\\')) putchar(ch), len++; else if (f_octal_escape) { putchar('\\'); switch (ch) { case '\\': putchar('\\'); break; case '\"': putchar('"'); break; case '\a': putchar('a'); break; case '\b': putchar('b'); break; case '\f': putchar('f'); break; case '\n': putchar('n'); break; case '\r': putchar('r'); break; case '\t': putchar('t'); break; case '\v': putchar('v'); break; default: putchar('0' + (ch >> 6)); putchar('0' + ((ch >> 3) & 7)); putchar('0' + (ch & 7)); len += 2; break; } len += 2; } else { putchar('\\'); putchar('0' + (ch >> 6)); putchar('0' + ((ch >> 3) & 7)); putchar('0' + (ch & 7)); len += 4; } } return len; } void usage() { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHLPRTWZabcdfgiklnoqrstu1]" + "usage: ls [-ABCFGHLPRTWZabcdfghiklnoqrstu1]" #else - "usage: ls [-ABCFHLPRTWZabcdfgiklnoqrstu1]" + "usage: ls [-ABCFHLPRTWZabcdfghiklnoqrstu1]" #endif " [file ...]\n"); exit(1); }