diff options
Diffstat (limited to 'bin/dash/src/bltin')
| -rw-r--r-- | bin/dash/src/bltin/bltin.h | 89 | ||||
| -rw-r--r-- | bin/dash/src/bltin/echo.1 | 109 | ||||
| -rw-r--r-- | bin/dash/src/bltin/printf.1 | 354 | ||||
| -rw-r--r-- | bin/dash/src/bltin/printf.c | 478 | ||||
| -rw-r--r-- | bin/dash/src/bltin/test.1 | 309 | ||||
| -rw-r--r-- | bin/dash/src/bltin/test.c | 700 | ||||
| -rw-r--r-- | bin/dash/src/bltin/times.c | 42 |
7 files changed, 0 insertions, 2081 deletions
diff --git a/bin/dash/src/bltin/bltin.h b/bin/dash/src/bltin/bltin.h deleted file mode 100644 index f5ac06f2..00000000 --- a/bin/dash/src/bltin/bltin.h +++ /dev/null @@ -1,89 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * Copyright (c) 1997-2005 - * Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Kenneth Almquist. - * - * 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. 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. - * - * @(#)bltin.h 8.1 (Berkeley) 5/31/93 - */ - -/* - * This file is included by programs which are optionally built into the - * shell. If SHELL is defined, we try to map the standard UNIX library - * routines to ash routines using defines. - */ - -#include "../shell.h" -#include "../mystring.h" -#include "../options.h" -#ifdef SHELL -#include "../memalloc.h" -#include "../output.h" -#include "../error.h" -#ifndef USE_GLIBC_STDIO -#undef stdout -#undef stderr -#undef putc -#undef putchar -#undef fileno -#define stdout out1 -#define stderr out2 -#define printf out1fmt -#define putc(c, file) outc(c, file) -#define putchar(c) out1c(c) -#define FILE struct output -#define fprintf outfmt -#define fputs outstr -#define fflush flushout -#define fileno(f) ((f)->fd) -#define ferror outerr -#endif -#define INITARGS(argv) -#define error sh_error -#define warn sh_warn -#define warnx sh_warnx -#define exit sh_exit -#define setprogname(s) -#define getprogname() commandname -#define setlocate(l,s) 0 - -#define getenv(p) bltinlookup((p),0) - -#else -#undef NULL -#include <stdio.h> -#undef main -#define INITARGS(argv) if ((commandname = argv[0]) == NULL) {fputs("Argc is zero\n", stderr); exit(2);} else -#endif - -int echocmd(int, char **); - - -extern const char *commandname; diff --git a/bin/dash/src/bltin/echo.1 b/bin/dash/src/bltin/echo.1 deleted file mode 100644 index fbc7fb43..00000000 --- a/bin/dash/src/bltin/echo.1 +++ /dev/null @@ -1,109 +0,0 @@ -.\" Copyright (c) 1991, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" Copyright (c) 1997-2005 -.\" Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved. -.\" -.\" This code is derived from software contributed to Berkeley by -.\" Kenneth Almquist. -.\" Copyright 1989 by Kenneth Almquist -.\" -.\" 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. 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. -.\" -.\" @(#)echo.1 8.1 (Berkeley) 5/31/93 -.\" -.Dd May 31, 1993 -.Dt ECHO 1 -.Os -.Sh NAME -.Nm echo -.Nd produce message in a shell script -.Sh SYNOPSIS -.Nm -.Op Fl n | Fl e -.Ar args ... -.Sh DESCRIPTION -.Nm -prints its arguments on the standard output, separated by spaces. -Unless the -.Fl n -option is present, a newline is output following the arguments. -The -.Fl e -option causes -.Nm -to treat the escape sequences specially, as described in the following -paragraph. -The -.Fl e -option is the default, and is provided solely for compatibility with -other systems. -Only one of the options -.Fl n -and -.Fl e -may be given. -.Pp -If any of the following sequences of characters is encountered during -output, the sequence is not output. Instead, the specified action is -performed: -.Bl -tag -width indent -.It Li \eb -A backspace character is output. -.It Li \ec -Subsequent output is suppressed. This is normally used at the end of the -last argument to suppress the trailing newline that -.Nm -would otherwise output. -.It Li \ef -Output a form feed. -.It Li \en -Output a newline character. -.It Li \er -Output a carriage return. -.It Li \et -Output a (horizontal) tab character. -.It Li \ev -Output a vertical tab. -.It Li \e0 Ns Ar digits -Output the character whose value is given by zero to three digits. -If there are zero digits, a nul character is output. -.It Li \e\e -Output a backslash. -.El -.Sh HINTS -Remember that backslash is special to the shell and needs to be escaped. -To output a message to standard error, say -.Pp -.D1 echo message \*[Gt]\*[Am]2 -.Sh BUGS -The octal character escape mechanism -.Pq Li \e0 Ns Ar digits -differs from the -C language mechanism. -.Pp -There is no way to force -.Nm -to treat its arguments literally, rather than interpreting them as -options and escape sequences. diff --git a/bin/dash/src/bltin/printf.1 b/bin/dash/src/bltin/printf.1 deleted file mode 100644 index 38731732..00000000 --- a/bin/dash/src/bltin/printf.1 +++ /dev/null @@ -1,354 +0,0 @@ -.\" Copyright (c) 1989, 1990, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" Copyright (c) 1997-2005 -.\" Herbert Xu <herbert@gondor.apana.org.au>. 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. 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: @(#)printf.1 8.1 (Berkeley) 6/6/93 -.\" -.Dd November 5, 1993 -.Dt PRINTF 1 -.Os -.Sh NAME -.Nm printf -.Nd formatted output -.Sh SYNOPSIS -.Nm -.Ar format -.Op Ar arguments ... -.Sh DESCRIPTION -.Nm -formats and prints its arguments, after the first, under control -of the -.Ar format . -The -.Ar format -is a character string which contains three types of objects: plain characters, -which are simply copied to standard output, character escape sequences which -are converted and copied to the standard output, and format specifications, -each of which causes printing of the next successive -.Ar argument . -.Pp -The -.Ar arguments -after the first are treated as strings if the corresponding format is -either -.Cm b , -.Cm B , -.Cm c -or -.Cm s ; -otherwise it is evaluated as a C constant, with the following extensions: -.Pp -.Bl -bullet -offset indent -compact -.It -A leading plus or minus sign is allowed. -.It -If the leading character is a single or double quote, the value is the -.Tn ASCII -code of the next character. -.El -.Pp -The format string is reused as often as necessary to satisfy the -.Ar arguments . -Any extra format specifications are evaluated with zero or the null -string. -.Pp -Character escape sequences are in backslash notation as defined in -.St -ansiC . -The characters and their meanings are as follows: -.Bl -tag -width Ds -offset indent -.It Cm \ee -Write an \*[Lt]escape\*[Gt] character. -.It Cm \ea -Write a \*[Lt]bell\*[Gt] character. -.It Cm \eb -Write a \*[Lt]backspace\*[Gt] character. -.It Cm \ef -Write a \*[Lt]form-feed\*[Gt] character. -.It Cm \en -Write a \*[Lt]new-line\*[Gt] character. -.It Cm \er -Write a \*[Lt]carriage return\*[Gt] character. -.It Cm \et -Write a \*[Lt]tab\*[Gt] character. -.It Cm \ev -Write a \*[Lt]vertical tab\*[Gt] character. -.It Cm \e\' -Write a \*[Lt]single quote\*[Gt] character. -.It Cm \e" -Write a \*[Lt]double quote\*[Gt] character. -.It Cm \e\e -Write a backslash character. -.It Cm \e Ns Ar num -Write an 8\-bit character whose -.Tn ASCII -value is the 1\-, 2\-, or 3\-digit octal number -.Ar num . -.It Cm \ex Ns Ar xx -Write an 8\-bit character whose -.Tn ASCII -value is the 1\- or 2\-digit hexadecimal number -.Ar xx . -.El -.Pp -Each format specification is introduced by the percent character -(``%''). -The remainder of the format specification includes, -in the following order: -.Bl -tag -width Ds -.It "Zero or more of the following flags:" -.Bl -tag -width Ds -.It Cm # -A `#' character -specifying that the value should be printed in an ``alternative form''. -For -.Cm b , -.Cm c , -.Cm d , -and -.Cm s -formats, this option has no effect. -For the -.Cm o -format the precision of the number is increased to force the first -character of the output string to a zero. -For the -.Cm x -.Pq Cm X -format, a non-zero result has the string -.Li 0x -.Pq Li 0X -prepended to it. -For -.Cm e , -.Cm E , -.Cm f , -.Cm g , -and -.Cm G -formats, the result will always contain a decimal point, even if no -digits follow the point (normally, a decimal point only appears in the -results of those formats if a digit follows the decimal point). -For -.Cm g -and -.Cm G -formats, trailing zeros are not removed from the result as they -would otherwise be. -.\" I turned this off - decided it isn't a valid use of '#' -.\" For the -.\" .Cm B -.\" format, backslash-escape sequences are expanded first; -.It Cm \&\- -A minus sign `\-' which specifies -.Em left adjustment -of the output in the indicated field; -.It Cm \&+ -A `+' character specifying that there should always be -a sign placed before the number when using signed formats. -.It Sq \&\ \& -A space specifying that a blank should be left before a positive number -for a signed format. -A `+' overrides a space if both are used; -.It Cm \&0 -A zero `0' character indicating that zero-padding should be used -rather than blank-padding. -A `\-' overrides a `0' if both are used; -.El -.It "Field Width:" -An optional digit string specifying a -.Em field width ; -if the output string has fewer characters than the field width it will -be blank-padded on the left (or right, if the left-adjustment indicator -has been given) to make up the field width (note that a leading zero -is a flag, but an embedded zero is part of a field width); -.It Precision : -An optional period, -.Sq Cm \&.\& , -followed by an optional digit string giving a -.Em precision -which specifies the number of digits to appear after the decimal point, -for -.Cm e -and -.Cm f -formats, or the maximum number of characters to be printed -from a string -.Sm off -.Pf ( Cm b No , -.Sm on -.Cm B -and -.Cm s -formats); if the digit string is missing, the precision is treated -as zero; -.It Format : -A character which indicates the type of format to use (one of -.Cm diouxXfwEgGbBcs ) . -.El -.Pp -A field width or precision may be -.Sq Cm \&* -instead of a digit string. -In this case an -.Ar argument -supplies the field width or precision. -.Pp -The format characters and their meanings are: -.Bl -tag -width Fl -.It Cm diouXx -The -.Ar argument -is printed as a signed decimal (d or i), unsigned octal, unsigned decimal, -or unsigned hexadecimal (X or x), respectively. -.It Cm f -The -.Ar argument -is printed in the style -.Sm off -.Pf [\-]ddd Cm \&. No ddd -.Sm on -where the number of d's -after the decimal point is equal to the precision specification for -the argument. -If the precision is missing, 6 digits are given; if the precision -is explicitly 0, no digits and no decimal point are printed. -.It Cm eE -The -.Ar argument -is printed in the style -.Sm off -.Pf [\-]d Cm \&. No ddd Cm e No \\*(Pmdd -.Sm on -where there -is one digit before the decimal point and the number after is equal to -the precision specification for the argument; when the precision is -missing, 6 digits are produced. -An upper-case E is used for an `E' format. -.It Cm gG -The -.Ar argument -is printed in style -.Cm f -or in style -.Cm e -.Pq Cm E -whichever gives full precision in minimum space. -.It Cm b -Characters from the string -.Ar argument -are printed with backslash-escape sequences expanded. -.br -The following additional backslash-escape sequences are supported: -.Bl -tag -width Ds -.It Cm \ec -Causes -.Nm -to ignore any remaining characters in the string operand containing it, -any remaining string operands, and any additional characters in -the format operand. -.It Cm \e0 Ns Ar num -Write an 8\-bit character whose -.Tn ASCII -value is the 1\-, 2\-, or 3\-digit -octal number -.Ar num . -.It Cm \e^ Ns Ar c -Write the control character -.Ar c . -Generates characters `\e000' through `\e037`, and `\e177' (from `\e^?'). -.It Cm \eM\- Ns Ar c -Write the character -.Ar c -with the 8th bit set. -Generates characters `\e241' through `\e376`. -.It Cm \eM^ Ns Ar c -Write the control character -.Ar c -with the 8th bit set. -Generates characters `\e000' through `\e037`, and `\e177' (from `\eM^?'). -.El -.It Cm B -Characters from the string -.Ar argument -are printed with unprintable characters backslash-escaped using the -.Sm off -.Pf ` Cm \e Ar c No ', -.Pf ` Cm \e^ Ar c No ', -.Pf ` Cm \eM\- Ar c No ' -or -.Pf ` Cm \eM^ Ar c No ', -.Sm on -formats described above. -.It Cm c -The first character of -.Ar argument -is printed. -.It Cm s -Characters from the string -.Ar argument -are printed until the end is reached or until the number of characters -indicated by the precision specification is reached; if the -precision is omitted, all characters in the string are printed. -.It Cm \&% -Print a `%'; no argument is used. -.El -.Pp -In no case does a non-existent or small field width cause truncation of -a field; padding takes place only if the specified field width exceeds -the actual width. -.Sh EXIT STATUS -.Nm -exits 0 on success, 1 on failure. -.Sh SEE ALSO -.Xr echo 1 , -.Xr printf 3 , -.Xr printf 9 -.Xr vis 3 -.Sh STANDARDS -The -.Nm -utility conforms to -.St -p1003.1-2001 . -.Pp -Support for the floating point formats and `*' as a field width and precision -are optional in POSIX. -.Pp -The behaviour of the %B format and the \e', \e", \exxx, \ee and -\e[M][\-|^]c escape sequences are undefined in POSIX. -.Sh BUGS -Since the floating point numbers are translated from -.Tn ASCII -to floating-point and -then back again, floating-point precision may be lost. -.Pp -Hexadecimal character constants are restricted to, and should be specified -as, two character constants. This is contrary to the ISO C standard but -does guarantee detection of the end of the constant. diff --git a/bin/dash/src/bltin/printf.c b/bin/dash/src/bltin/printf.c deleted file mode 100644 index 7785735b..00000000 --- a/bin/dash/src/bltin/printf.c +++ /dev/null @@ -1,478 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * Copyright (c) 1997-2005 - * Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved. - * - * 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. 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. - */ - -#include <sys/types.h> - -#include <ctype.h> -#include <errno.h> -#include <inttypes.h> -#include <limits.h> -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -static int conv_escape_str(char *, char **); -static char *conv_escape(char *, int *); -static int getchr(void); -static double getdouble(void); -static uintmax_t getuintmax(int); -static char *getstr(void); -static char *mklong(const char *, const char *); -static void check_conversion(const char *, const char *); - -static int rval; -static char **gargv; - -#define isodigit(c) ((c) >= '0' && (c) <= '7') -#define octtobin(c) ((c) - '0') - -#include "bltin.h" -#include "system.h" - -#define PF(f, func) { \ - switch ((char *)param - (char *)array) { \ - default: \ - (void)printf(f, array[0], array[1], func); \ - break; \ - case sizeof(*param): \ - (void)printf(f, array[0], func); \ - break; \ - case 0: \ - (void)printf(f, func); \ - break; \ - } \ -} - -#define ASPF(sp, f, func) ({ \ - int ret; \ - switch ((char *)param - (char *)array) { \ - default: \ - ret = xasprintf(sp, f, array[0], array[1], func); \ - break; \ - case sizeof(*param): \ - ret = xasprintf(sp, f, array[0], func); \ - break; \ - case 0: \ - ret = xasprintf(sp, f, func); \ - break; \ - } \ - ret; \ -}) - - -static int print_escape_str(const char *f, int *param, int *array, char *s) -{ - struct stackmark smark; - char *p, *q; - int done; - int len; - int total; - - setstackmark(&smark); - done = conv_escape_str(s, &q); - p = stackblock(); - len = q - p; - total = len - 1; - - q[-1] = (!!((f[1] - 's') | done) - 1) & f[2]; - total += !!q[-1]; - if (f[1] == 's') - goto easy; - - p = makestrspace(len, q); - memset(p, 'X', total); - p[total] = 0; - - q = stackblock(); - total = ASPF(&p, f, p); - - len = strchrnul(p, 'X') - p; - memcpy(p + len, q, strspn(p + len, "X")); - -easy: - out1mem(p, total); - - popstackmark(&smark); - return done; -} - - -int printfcmd(int argc, char *argv[]) -{ - char *fmt; - char *format; - int ch; - - rval = 0; - - nextopt(nullstr); - - argv = argptr; - format = *argv; - - if (!format) - error("usage: printf format [arg ...]"); - - gargv = ++argv; - -#define SKIP1 "#-+ 0" -#define SKIP2 "*0123456789" - do { - /* - * Basic algorithm is to scan the format string for conversion - * specifications -- once one is found, find out if the field - * width or precision is a '*'; if it is, gather up value. - * Note, format strings are reused as necessary to use up the - * provided arguments, arguments of zero/null string are - * provided to use up the format string. - */ - - /* find next format specification */ - for (fmt = format; (ch = *fmt++) ;) { - char *start; - char nextch; - int array[2]; - int *param; - - if (ch == '\\') { - int c_ch; - fmt = conv_escape(fmt, &c_ch); - ch = c_ch; - goto pc; - } - if (ch != '%' || (*fmt == '%' && (++fmt || 1))) { -pc: - putchar(ch); - continue; - } - - /* Ok - we've found a format specification, - Save its address for a later printf(). */ - start = fmt - 1; - param = array; - - /* skip to field width */ - fmt += strspn(fmt, SKIP1); - if (*fmt == '*') { - ++fmt; - *param++ = getuintmax(1); - } else { - /* skip to possible '.', - * get following precision - */ - fmt += strspn(fmt, SKIP2); - } - - if (*fmt == '.') { - ++fmt; - if (*fmt == '*') { - ++fmt; - *param++ = getuintmax(1); - } else - fmt += strspn(fmt, SKIP2); - } - - ch = *fmt; - if (!ch) - error("missing format character"); - /* null terminate format string to we can use it - as an argument to printf. */ - nextch = fmt[1]; - fmt[1] = 0; - switch (ch) { - - case 'b': - *fmt = 's'; - /* escape if a \c was encountered */ - if (print_escape_str(start, param, array, - getstr())) - goto out; - *fmt = 'b'; - break; - case 'c': { - int p = getchr(); - PF(start, p); - break; - } - case 's': { - char *p = getstr(); - PF(start, p); - break; - } - case 'd': - case 'i': { - uintmax_t p = getuintmax(1); - start = mklong(start, fmt); - PF(start, p); - break; - } - case 'o': - case 'u': - case 'x': - case 'X': { - uintmax_t p = getuintmax(0); - start = mklong(start, fmt); - PF(start, p); - break; - } - case 'a': - case 'A': - case 'e': - case 'E': - case 'f': - case 'F': - case 'g': - case 'G': { - double p = getdouble(); - PF(start, p); - break; - } - default: - error("%s: invalid directive", start); - } - *++fmt = nextch; - } - } while (gargv != argv && *gargv); - -out: - return rval; -} - - -/* - * Print SysV echo(1) style escape string - * Halts processing string if a \c escape is encountered. - */ -static int -conv_escape_str(char *str, char **sp) -{ - int c; - int ch; - char *cp; - - /* convert string into a temporary buffer... */ - STARTSTACKSTR(cp); - - do { - c = ch = *str++; - if (ch != '\\') - continue; - - c = *str++; - if (c == 'c') { - /* \c as in SYSV echo - abort all processing.... */ - c = ch = 0x100; - continue; - } - - /* - * %b string octal constants are not like those in C. - * They start with a \0, and are followed by 0, 1, 2, - * or 3 octal digits. - */ - if (c == '0' && isodigit(*str)) - str++; - - /* Finally test for sequences valid in the format string */ - str = conv_escape(str - 1, &c); - } while (STPUTC(c, cp), (char)ch); - - *sp = cp; - - return ch; -} - -/* - * Print "standard" escape characters - */ -static char * -conv_escape(char *str, int *conv_ch) -{ - int value; - int ch; - - ch = *str; - - switch (ch) { - default: - if (!isodigit(*str)) { - value = '\\'; - goto out; - } - - ch = 3; - value = 0; - do { - value <<= 3; - value += octtobin(*str++); - } while (isodigit(*str) && --ch); - goto out; - - case '\\': value = '\\'; break; /* backslash */ - case 'a': value = '\a'; break; /* alert */ - case 'b': value = '\b'; break; /* backspace */ - case 'f': value = '\f'; break; /* form-feed */ - case 'n': value = '\n'; break; /* newline */ - case 'r': value = '\r'; break; /* carriage-return */ - case 't': value = '\t'; break; /* tab */ - case 'v': value = '\v'; break; /* vertical-tab */ - } - - str++; -out: - *conv_ch = value; - return str; -} - -static char * -mklong(const char *str, const char *ch) -{ - /* - * Replace a string like "%92.3u" with "%92.3"PRIuMAX. - * - * Although C99 does not guarantee it, we assume PRIiMAX, - * PRIoMAX, PRIuMAX, PRIxMAX, and PRIXMAX are all the same - * as PRIdMAX with the final 'd' replaced by the corresponding - * character. - */ - - char *copy; - size_t len; - - len = ch - str + sizeof(PRIdMAX); - STARTSTACKSTR(copy); - copy = makestrspace(len, copy); - memcpy(copy, str, len - sizeof(PRIdMAX)); - memcpy(copy + len - sizeof(PRIdMAX), PRIdMAX, sizeof(PRIdMAX)); - copy[len - 2] = *ch; - return (copy); -} - -static int -getchr(void) -{ - int val = 0; - - if (*gargv) - val = **gargv++; - return val; -} - -static char * -getstr(void) -{ - char *val = nullstr; - - if (*gargv) - val = *gargv++; - return val; -} - -static uintmax_t -getuintmax(int sign) -{ - uintmax_t val = 0; - char *cp, *ep; - - cp = *gargv; - if (cp == NULL) - goto out; - gargv++; - - val = (unsigned char) cp[1]; - if (*cp == '\"' || *cp == '\'') - goto out; - - errno = 0; - val = sign ? strtoimax(cp, &ep, 0) : strtoumax(cp, &ep, 0); - check_conversion(cp, ep); -out: - return val; -} - -static double -getdouble(void) -{ - double val; - char *cp, *ep; - - cp = *gargv; - if (cp == NULL) - return 0; - gargv++; - - if (*cp == '\"' || *cp == '\'') - return (unsigned char) cp[1]; - - errno = 0; - val = strtod(cp, &ep); - check_conversion(cp, ep); - return val; -} - -static void -check_conversion(const char *s, const char *ep) -{ - if (*ep) { - if (ep == s) - warnx("%s: expected numeric value", s); - else - warnx("%s: not completely converted", s); - rval = 1; - } else if (errno == ERANGE) { - warnx("%s: %s", s, strerror(ERANGE)); - rval = 1; - } -} - -int -echocmd(int argc, char **argv) -{ - const char *lastfmt = snlfmt; - int nonl; - - if (*++argv && equal(*argv, "-n")) { - argv++; - lastfmt = "%s"; - } - - do { - const char *fmt = "%s "; - char *s = *argv; - - if (!s || !*++argv) - fmt = lastfmt; - - nonl = print_escape_str(fmt, NULL, NULL, s ?: nullstr); - } while (!nonl && *argv); - return 0; -} diff --git a/bin/dash/src/bltin/test.1 b/bin/dash/src/bltin/test.1 deleted file mode 100644 index 42435fb3..00000000 --- a/bin/dash/src/bltin/test.1 +++ /dev/null @@ -1,309 +0,0 @@ -.\" Copyright (c) 1991, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" Copyright (c) 1997-2005 -.\" Herbert Xu <herbert@gondor.apana.org.au>. 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. 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. -.\" -.\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" -.Dd May 31, 1993 -.Dt TEST 1 -.Os -.Sh NAME -.Nm test , -.Nm \&[ -.Nd condition evaluation utility -.Sh SYNOPSIS -.Nm test -.Ar expression -.Nm \&[ -.Ar expression Cm ] -.Sh DESCRIPTION -The -.Nm test -utility evaluates the expression and, if it evaluates -to true, returns a zero (true) exit status; otherwise -it returns 1 (false). -If there is no expression, test also -returns 1 (false). -.Pp -All operators and flags are separate arguments to the -.Nm test -utility. -.Pp -The following primaries are used to construct expression: -.Bl -tag -width Ar -.It Fl b Ar file -True if -.Ar file -exists and is a block special -file. -.It Fl c Ar file -True if -.Ar file -exists and is a character -special file. -.It Fl d Ar file -True if -.Ar file -exists and is a directory. -.It Fl e Ar file -True if -.Ar file -exists (regardless of type). -.It Fl f Ar file -True if -.Ar file -exists and is a regular file. -.It Fl g Ar file -True if -.Ar file -exists and its set group ID flag -is set. -.It Fl h Ar file -True if -.Ar file -exists and is a symbolic link. -.It Fl k Ar file -True if -.Ar file -exists and its sticky bit is set. -.It Fl n Ar string -True if the length of -.Ar string -is nonzero. -.It Fl p Ar file -True if -.Ar file -is a named pipe -.Po Tn FIFO Pc . -.It Fl r Ar file -True if -.Ar file -exists and is readable. -.It Fl s Ar file -True if -.Ar file -exists and has a size greater -than zero. -.It Fl t Ar file_descriptor -True if the file whose file descriptor number -is -.Ar file_descriptor -is open and is associated with a terminal. -.It Fl u Ar file -True if -.Ar file -exists and its set user ID flag -is set. -.It Fl w Ar file -True if -.Ar file -exists and is writable. -True -indicates only that the write flag is on. -The file is not writable on a read-only file -system even if this test indicates true. -.It Fl x Ar file -True if -.Ar file -exists and is executable. -True -indicates only that the execute flag is on. -If -.Ar file -is a directory, true indicates that -.Ar file -can be searched. -.It Fl z Ar string -True if the length of -.Ar string -is zero. -.It Fl L Ar file -True if -.Ar file -exists and is a symbolic link. -This operator is retained for compatibility with previous versions of -this program. -Do not rely on its existence; use -.Fl h -instead. -.It Fl O Ar file -True if -.Ar file -exists and its owner matches the effective user id of this process. -.It Fl G Ar file -True if -.Ar file -exists and its group matches the effective group id of this process. -.It Fl S Ar file -True if -.Ar file -exists and is a socket. -.It Ar file1 Fl nt Ar file2 -True if -.Ar file1 -exists and is newer than -.Ar file2 . -.It Ar file1 Fl ot Ar file2 -True if -.Ar file1 -exists and is older than -.Ar file2 . -.It Ar file1 Fl ef Ar file2 -True if -.Ar file1 -and -.Ar file2 -exist and refer to the same file. -.It Ar string -True if -.Ar string -is not the null -string. -.It Ar \&s\&1 Cm \&= Ar \&s\&2 -True if the strings -.Ar \&s\&1 -and -.Ar \&s\&2 -are identical. -.It Ar \&s\&1 Cm \&!= Ar \&s\&2 -True if the strings -.Ar \&s\&1 -and -.Ar \&s\&2 -are not identical. -.It Ar \&s\&1 Cm \&\*[Lt] Ar \&s\&2 -True if string -.Ar \&s\&1 -comes before -.Ar \&s\&2 -based on the ASCII value of their characters. -.It Ar \&s\&1 Cm \&\*[Gt] Ar \&s\&2 -True if string -.Ar \&s\&1 -comes after -.Ar \&s\&2 -based on the ASCII value of their characters. -.It Ar \&n\&1 Fl \&eq Ar \&n\&2 -True if the integers -.Ar \&n\&1 -and -.Ar \&n\&2 -are algebraically -equal. -.It Ar \&n\&1 Fl \&ne Ar \&n\&2 -True if the integers -.Ar \&n\&1 -and -.Ar \&n\&2 -are not -algebraically equal. -.It Ar \&n\&1 Fl \> Ar \&n\&2 -True if the integer -.Ar \&n\&1 -is algebraically -greater than the integer -.Ar \&n\&2 . -.It Ar \&n\&1 Fl \&ge Ar \&n\&2 -True if the integer -.Ar \&n\&1 -is algebraically -greater than or equal to the integer -.Ar \&n\&2 . -.It Ar \&n\&1 Fl \< Ar \&n\&2 -True if the integer -.Ar \&n\&1 -is algebraically less -than the integer -.Ar \&n\&2 . -.It Ar \&n\&1 Fl \&le Ar \&n\&2 -True if the integer -.Ar \&n\&1 -is algebraically less -than or equal to the integer -.Ar \&n\&2 . -.El -.Pp -These primaries can be combined with the following operators: -.Bl -tag -width Ar -.It Cm \&! Ar expression -True if -.Ar expression -is false. -.It Ar expression1 Fl a Ar expression2 -True if both -.Ar expression1 -and -.Ar expression2 -are true. -.It Ar expression1 Fl o Ar expression2 -True if either -.Ar expression1 -or -.Ar expression2 -are true. -.It Cm \&( Ns Ar expression Ns Cm \&) -True if expression is true. -.El -.Pp -The -.Fl a -operator has higher precedence than the -.Fl o -operator. -.Sh GRAMMAR AMBIGUITY -The -.Nm test -grammar is inherently ambiguous. -In order to assure a degree of consistency, the cases described in -.St -p1003.2 -section 4.62.4, -are evaluated consistently according to the rules specified in the -standards document. -All other cases are subject to the ambiguity in the command semantics. -.Sh EXIT STATUS -The -.Nm test -utility exits with one of the following values: -.Bl -tag -width Ds -.It 0 -expression evaluated to true. -.It 1 -expression evaluated to false or expression was -missing. -.It \*[Gt]1 -An error occurred. -.El -.Sh STANDARDS -The -.Nm test -utility implements a superset of the -.St -p1003.2 -specification. diff --git a/bin/dash/src/bltin/test.c b/bin/dash/src/bltin/test.c deleted file mode 100644 index c7fc479d..00000000 --- a/bin/dash/src/bltin/test.c +++ /dev/null @@ -1,700 +0,0 @@ -/* - * test(1); version 7-like -- author Erik Baalbergen - * modified by Eric Gisin to be used as built-in. - * modified by Arnold Robbins to add SVR3 compatibility - * (-x -c -b -p -u -g -k) plus Korn's -L -nt -ot -ef and new -S (socket). - * modified by J.T. Conklin for NetBSD. - * - * This program is in the Public Domain. - */ - -#include <sys/stat.h> -#include <sys/types.h> - -#include <fcntl.h> -#include <inttypes.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <stdarg.h> -#include "bltin.h" - -/* test(1) accepts the following grammar: - oexpr ::= aexpr | aexpr "-o" oexpr ; - aexpr ::= nexpr | nexpr "-a" aexpr ; - nexpr ::= primary | "!" primary - primary ::= unary-operator operand - | operand binary-operator operand - | operand - | "(" oexpr ")" - ; - unary-operator ::= "-r"|"-w"|"-x"|"-f"|"-d"|"-c"|"-b"|"-p"| - "-u"|"-g"|"-k"|"-s"|"-t"|"-z"|"-n"|"-o"|"-O"|"-G"|"-L"|"-S"; - - binary-operator ::= "="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"| - "-nt"|"-ot"|"-ef"; - operand ::= <any legal UNIX file name> -*/ - -enum token { - EOI, - FILRD, - FILWR, - FILEX, - FILEXIST, - FILREG, - FILDIR, - FILCDEV, - FILBDEV, - FILFIFO, - FILSOCK, - FILSYM, - FILGZ, - FILTT, - FILSUID, - FILSGID, - FILSTCK, - FILNT, - FILOT, - FILEQ, - FILUID, - FILGID, - STREZ, - STRNZ, - STREQ, - STRNE, - STRLT, - STRGT, - INTEQ, - INTNE, - INTGE, - INTGT, - INTLE, - INTLT, - UNOT, - BAND, - BOR, - LPAREN, - RPAREN, - OPERAND -}; - -enum token_types { - UNOP, - BINOP, - BUNOP, - BBINOP, - PAREN -}; - -static struct t_op { - const char *op_text; - short op_num, op_type; -} const ops [] = { - {"-r", FILRD, UNOP}, - {"-w", FILWR, UNOP}, - {"-x", FILEX, UNOP}, - {"-e", FILEXIST,UNOP}, - {"-f", FILREG, UNOP}, - {"-d", FILDIR, UNOP}, - {"-c", FILCDEV,UNOP}, - {"-b", FILBDEV,UNOP}, - {"-p", FILFIFO,UNOP}, - {"-u", FILSUID,UNOP}, - {"-g", FILSGID,UNOP}, - {"-k", FILSTCK,UNOP}, - {"-s", FILGZ, UNOP}, - {"-t", FILTT, UNOP}, - {"-z", STREZ, UNOP}, - {"-n", STRNZ, UNOP}, - {"-h", FILSYM, UNOP}, /* for backwards compat */ - {"-O", FILUID, UNOP}, - {"-G", FILGID, UNOP}, - {"-L", FILSYM, UNOP}, - {"-S", FILSOCK,UNOP}, - {"=", STREQ, BINOP}, - {"!=", STRNE, BINOP}, - {"<", STRLT, BINOP}, - {">", STRGT, BINOP}, - {"-eq", INTEQ, BINOP}, - {"-ne", INTNE, BINOP}, - {"-ge", INTGE, BINOP}, - {"-gt", INTGT, BINOP}, - {"-le", INTLE, BINOP}, - {"-lt", INTLT, BINOP}, - {"-nt", FILNT, BINOP}, - {"-ot", FILOT, BINOP}, - {"-ef", FILEQ, BINOP}, - {"!", UNOT, BUNOP}, - {"-a", BAND, BBINOP}, - {"-o", BOR, BBINOP}, - {"(", LPAREN, PAREN}, - {")", RPAREN, PAREN}, - {0, 0, 0} -}; - -static char **t_wp; -static struct t_op const *t_wp_op; - -static void syntax(const char *, const char *); -static int oexpr(enum token); -static int aexpr(enum token); -static int nexpr(enum token); -static int primary(enum token); -static int binop(void); -static int filstat(char *, enum token); -static enum token t_lex(char **); -static int isoperand(char **); -static int newerf(const char *, const char *); -static int olderf(const char *, const char *); -static int equalf(const char *, const char *); -#ifdef HAVE_FACCESSAT -static int test_file_access(const char *, int); -#else -static int test_access(const struct stat64 *, int); -#endif - -#ifdef HAVE_FACCESSAT -# ifdef HAVE_TRADITIONAL_FACCESSAT -static inline int faccessat_confused_about_superuser(void) { return 1; } -# else -static inline int faccessat_confused_about_superuser(void) { return 0; } -# endif -#endif - -static inline intmax_t getn(const char *s) -{ - return atomax10(s); -} - -static const struct t_op *getop(const char *s) -{ - const struct t_op *op; - - for (op = ops; op->op_text; op++) { - if (strcmp(s, op->op_text) == 0) - return op; - } - - return NULL; -} - -int -testcmd(int argc, char **argv) -{ - const struct t_op *op; - enum token n; - int res = 1; - - if (*argv[0] == '[') { - if (*argv[--argc] != ']') - error("missing ]"); - argv[argc] = NULL; - } - - t_wp_op = NULL; - -recheck: - argv++; - argc--; - - if (argc < 1) - return res; - - /* - * POSIX prescriptions: he who wrote this deserves the Nobel - * peace prize. - */ - switch (argc) { - case 3: - op = getop(argv[1]); - if (op && op->op_type == BINOP) { - n = OPERAND; - goto eval; - } - /* fall through */ - - case 4: - if (!strcmp(argv[0], "(") && !strcmp(argv[argc - 1], ")")) { - argv[--argc] = NULL; - argv++; - argc--; - } else if (!strcmp(argv[0], "!")) { - res = 0; - goto recheck; - } - } - - n = t_lex(argv); - -eval: - t_wp = argv; - res ^= oexpr(n); - argv = t_wp; - - if (argv[0] != NULL && argv[1] != NULL) - syntax(argv[0], "unexpected operator"); - - return res; -} - -static void -syntax(const char *op, const char *msg) -{ - if (op && *op) - error("%s: %s", op, msg); - else - error("%s", msg); -} - -static int -oexpr(enum token n) -{ - int res = 0; - - for (;;) { - res |= aexpr(n); - n = t_lex(t_wp + 1); - if (n != BOR) - break; - n = t_lex(t_wp += 2); - } - return res; -} - -static int -aexpr(enum token n) -{ - int res = 1; - - for (;;) { - if (!nexpr(n)) - res = 0; - n = t_lex(t_wp + 1); - if (n != BAND) - break; - n = t_lex(t_wp += 2); - } - return res; -} - -static int -nexpr(enum token n) -{ - if (n != UNOT) - return primary(n); - - n = t_lex(t_wp + 1); - if (n != EOI) - t_wp++; - return !nexpr(n); -} - -static int -primary(enum token n) -{ - enum token nn; - int res; - - if (n == EOI) - return 0; /* missing expression */ - if (n == LPAREN) { - if ((nn = t_lex(++t_wp)) == RPAREN) - return 0; /* missing expression */ - res = oexpr(nn); - if (t_lex(++t_wp) != RPAREN) - syntax(NULL, "closing paren expected"); - return res; - } - if (t_wp_op && t_wp_op->op_type == UNOP) { - /* unary expression */ - if (*++t_wp == NULL) - syntax(t_wp_op->op_text, "argument expected"); - switch (n) { - case STREZ: - return strlen(*t_wp) == 0; - case STRNZ: - return strlen(*t_wp) != 0; - case FILTT: - return isatty(getn(*t_wp)); -#ifdef HAVE_FACCESSAT - case FILRD: - return test_file_access(*t_wp, R_OK); - case FILWR: - return test_file_access(*t_wp, W_OK); - case FILEX: - return test_file_access(*t_wp, X_OK); -#endif - default: - return filstat(*t_wp, n); - } - } - - if (t_lex(t_wp + 1), t_wp_op && t_wp_op->op_type == BINOP) { - return binop(); - } - - return strlen(*t_wp) > 0; -} - -static int -binop(void) -{ - const char *opnd1, *opnd2; - struct t_op const *op; - - opnd1 = *t_wp; - (void) t_lex(++t_wp); - op = t_wp_op; - - if ((opnd2 = *++t_wp) == (char *)0) - syntax(op->op_text, "argument expected"); - - switch (op->op_num) { - default: -#ifdef DEBUG - abort(); - /* NOTREACHED */ -#endif - case STREQ: - return strcmp(opnd1, opnd2) == 0; - case STRNE: - return strcmp(opnd1, opnd2) != 0; - case STRLT: - return strcmp(opnd1, opnd2) < 0; - case STRGT: - return strcmp(opnd1, opnd2) > 0; - case INTEQ: - return getn(opnd1) == getn(opnd2); - case INTNE: - return getn(opnd1) != getn(opnd2); - case INTGE: - return getn(opnd1) >= getn(opnd2); - case INTGT: - return getn(opnd1) > getn(opnd2); - case INTLE: - return getn(opnd1) <= getn(opnd2); - case INTLT: - return getn(opnd1) < getn(opnd2); - case FILNT: - return newerf (opnd1, opnd2); - case FILOT: - return olderf (opnd1, opnd2); - case FILEQ: - return equalf (opnd1, opnd2); - } -} - -static int -filstat(char *nm, enum token mode) -{ - struct stat64 s; - - if (mode == FILSYM ? lstat64(nm, &s) : stat64(nm, &s)) - return 0; - - switch (mode) { -#ifndef HAVE_FACCESSAT - case FILRD: - return test_access(&s, R_OK); - case FILWR: - return test_access(&s, W_OK); - case FILEX: - return test_access(&s, X_OK); -#endif - case FILEXIST: - return 1; - case FILREG: - return S_ISREG(s.st_mode); - case FILDIR: - return S_ISDIR(s.st_mode); - case FILCDEV: - return S_ISCHR(s.st_mode); - case FILBDEV: - return S_ISBLK(s.st_mode); - case FILFIFO: - return S_ISFIFO(s.st_mode); - case FILSOCK: - return S_ISSOCK(s.st_mode); - case FILSYM: - return S_ISLNK(s.st_mode); - case FILSUID: - return (s.st_mode & S_ISUID) != 0; - case FILSGID: - return (s.st_mode & S_ISGID) != 0; - case FILSTCK: - return (s.st_mode & S_ISVTX) != 0; - case FILGZ: - return !!s.st_size; - case FILUID: - return s.st_uid == geteuid(); - case FILGID: - return s.st_gid == getegid(); - default: - return 1; - } -} - -static enum token t_lex(char **tp) -{ - struct t_op const *op; - char *s = *tp; - - if (s == 0) { - t_wp_op = (struct t_op *)0; - return EOI; - } - - op = getop(s); - if (op && !(op->op_type == UNOP && isoperand(tp)) && - !(op->op_num == LPAREN && !tp[1])) { - t_wp_op = op; - return op->op_num; - } - - t_wp_op = (struct t_op *)0; - return OPERAND; -} - -static int isoperand(char **tp) -{ - struct t_op const *op; - char *s; - - if (!(s = tp[1])) - return 1; - if (!tp[2]) - return 0; - - op = getop(s); - return op && op->op_type == BINOP; -} - -static int -newerf (const char *f1, const char *f2) -{ - struct stat64 b1, b2; - -#ifdef HAVE_ST_MTIM - return (stat64(f1, &b1) == 0 && - stat64(f2, &b2) == 0 && - ( b1.st_mtim.tv_sec > b2.st_mtim.tv_sec || - (b1.st_mtim.tv_sec == b2.st_mtim.tv_sec && (b1.st_mtim.tv_nsec > b2.st_mtim.tv_nsec ))) - ); -#else - return (stat64(f1, &b1) == 0 && - stat64(f2, &b2) == 0 && - b1.st_mtime > b2.st_mtime); -#endif -} - -static int -olderf (const char *f1, const char *f2) -{ - struct stat64 b1, b2; - -#ifdef HAVE_ST_MTIM - return (stat64(f1, &b1) == 0 && - stat64(f2, &b2) == 0 && - (b1.st_mtim.tv_sec < b2.st_mtim.tv_sec || - (b1.st_mtim.tv_sec == b2.st_mtim.tv_sec && (b1.st_mtim.tv_nsec < b2.st_mtim.tv_nsec ))) - ); -#else - return (stat64(f1, &b1) == 0 && - stat64(f2, &b2) == 0 && - b1.st_mtime < b2.st_mtime); -#endif -} - -static int -equalf (const char *f1, const char *f2) -{ - struct stat64 b1, b2; - - return (stat64(f1, &b1) == 0 && - stat64(f2, &b2) == 0 && - b1.st_dev == b2.st_dev && - b1.st_ino == b2.st_ino); -} - -#ifdef HAVE_FACCESSAT -static int has_exec_bit_set(const char *path) -{ - struct stat64 st; - - if (stat64(path, &st)) - return 0; - return st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH); -} - -static int test_file_access(const char *path, int mode) -{ - if (faccessat_confused_about_superuser() && - mode == X_OK && geteuid() == 0 && !has_exec_bit_set(path)) - return 0; - return !faccessat(AT_FDCWD, path, mode, AT_EACCESS); -} -#else /* HAVE_FACCESSAT */ -/* - * The manual, and IEEE POSIX 1003.2, suggests this should check the mode bits, - * not use access(): - * - * True shall indicate only that the write flag is on. The file is not - * writable on a read-only file system even if this test indicates true. - * - * Unfortunately IEEE POSIX 1003.1-2001, as quoted in SuSv3, says only: - * - * True shall indicate that permission to read from file will be granted, - * as defined in "File Read, Write, and Creation". - * - * and that section says: - * - * When a file is to be read or written, the file shall be opened with an - * access mode corresponding to the operation to be performed. If file - * access permissions deny access, the requested operation shall fail. - * - * and of course access permissions are described as one might expect: - * - * * If a process has the appropriate privilege: - * - * * If read, write, or directory search permission is requested, - * access shall be granted. - * - * * If execute permission is requested, access shall be granted if - * execute permission is granted to at least one user by the file - * permission bits or by an alternate access control mechanism; - * otherwise, access shall be denied. - * - * * Otherwise: - * - * * The file permission bits of a file contain read, write, and - * execute/search permissions for the file owner class, file group - * class, and file other class. - * - * * Access shall be granted if an alternate access control mechanism - * is not enabled and the requested access permission bit is set for - * the class (file owner class, file group class, or file other class) - * to which the process belongs, or if an alternate access control - * mechanism is enabled and it allows the requested access; otherwise, - * access shall be denied. - * - * and when I first read this I thought: surely we can't go about using - * open(O_WRONLY) to try this test! However the POSIX 1003.1-2001 Rationale - * section for test does in fact say: - * - * On historical BSD systems, test -w directory always returned false - * because test tried to open the directory for writing, which always - * fails. - * - * and indeed this is in fact true for Seventh Edition UNIX, UNIX 32V, and UNIX - * System III, and thus presumably also for BSD up to and including 4.3. - * - * Secondly I remembered why using open() and/or access() are bogus. They - * don't work right for detecting read and write permissions bits when called - * by root. - * - * Interestingly the 'test' in 4.4BSD was closer to correct (as per - * 1003.2-1992) and it was implemented efficiently with stat() instead of - * open(). - * - * This was apparently broken in NetBSD around about 1994/06/30 when the old - * 4.4BSD implementation was replaced with a (arguably much better coded) - * implementation derived from pdksh. - * - * Note that modern pdksh is yet different again, but still not correct, at - * least not w.r.t. 1003.2-1992. - * - * As I think more about it and read more of the related IEEE docs I don't like - * that wording about 'test -r' and 'test -w' in 1003.1-2001 at all. I very - * much prefer the original wording in 1003.2-1992. It is much more useful, - * and so that's what I've implemented. - * - * (Note that a strictly conforming implementation of 1003.1-2001 is in fact - * totally useless for the case in question since its 'test -w' and 'test -r' - * can never fail for root for any existing files, i.e. files for which 'test - * -e' succeeds.) - * - * The rationale for 1003.1-2001 suggests that the wording was "clarified" in - * 1003.1-2001 to align with the 1003.2b draft. 1003.2b Draft 12 (July 1999), - * which is the latest copy I have, does carry the same suggested wording as is - * in 1003.1-2001, with its rationale saying: - * - * This change is a clarification and is the result of interpretation - * request PASC 1003.2-92 #23 submitted for IEEE Std 1003.2-1992. - * - * That interpretation can be found here: - * - * http://www.pasc.org/interps/unofficial/db/p1003.2/pasc-1003.2-23.html - * - * Not terribly helpful, unfortunately. I wonder who that fence sitter was. - * - * Worse, IMVNSHO, I think the authors of 1003.2b-D12 have mis-interpreted the - * PASC interpretation and appear to be gone against at least one widely used - * implementation (namely 4.4BSD). The problem is that for file access by root - * this means that if test '-r' and '-w' are to behave as if open() were called - * then there's no way for a shell script running as root to check if a file - * has certain access bits set other than by the grotty means of interpreting - * the output of 'ls -l'. This was widely considered to be a bug in V7's - * "test" and is, I believe, one of the reasons why direct use of access() was - * avoided in some more recent implementations! - * - * I have always interpreted '-r' to match '-w' and '-x' as per the original - * wording in 1003.2-1992, not the other way around. I think 1003.2b goes much - * too far the wrong way without any valid rationale and that it's best if we - * stick with 1003.2-1992 and test the flags, and not mimic the behaviour of - * open() since we already know very well how it will work -- existance of the - * file is all that matters to open() for root. - * - * Unfortunately the SVID is no help at all (which is, I guess, partly why - * we're in this mess in the first place :-). - * - * The SysV implementation (at least in the 'test' builtin in /bin/sh) does use - * access(name, 2) even though it also goes to much greater lengths for '-x' - * matching the 1003.2-1992 definition (which is no doubt where that definition - * came from). - * - * The ksh93 implementation uses access() for '-r' and '-w' if - * (euid==uid&&egid==gid), but uses st_mode for '-x' iff running as root. - * i.e. it does strictly conform to 1003.1-2001 (and presumably 1003.2b). - */ -static int test_access(const struct stat64 *sp, int stmode) -{ - gid_t *groups; - register int n; - uid_t euid; - int maxgroups; - - /* - * I suppose we could use access() if not running as root and if we are - * running with ((euid == uid) && (egid == gid)), but we've already - * done the stat() so we might as well just test the permissions - * directly instead of asking the kernel to do it.... - */ - euid = geteuid(); - if (euid == 0) { - if (stmode != X_OK) - return 1; - - /* any bit is good enough */ - stmode = (stmode << 6) | (stmode << 3) | stmode; - } else if (sp->st_uid == euid) - stmode <<= 6; - else if (sp->st_gid == getegid()) - stmode <<= 3; - else { - /* XXX stolen almost verbatim from ksh93.... */ - /* on some systems you can be in several groups */ - maxgroups = getgroups(0, NULL); - groups = stalloc(maxgroups * sizeof(*groups)); - n = getgroups(maxgroups, groups); - while (--n >= 0) { - if (groups[n] == sp->st_gid) { - stmode <<= 3; - break; - } - } - } - - return sp->st_mode & stmode; -} -#endif /* HAVE_FACCESSAT */ diff --git a/bin/dash/src/bltin/times.c b/bin/dash/src/bltin/times.c deleted file mode 100644 index 1166a68e..00000000 --- a/bin/dash/src/bltin/times.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 1999 Herbert Xu <herbert@gondor.apana.org.au> - * This file contains code for the times builtin. - */ - -#include <sys/times.h> -#include <unistd.h> -#ifdef USE_GLIBC_STDIO -#include <stdio.h> -#else -#include "bltin.h" -#endif -#include "system.h" - -int timescmd() { - struct tms buf; - long int clk_tck = sysconf(_SC_CLK_TCK); - int mutime, mstime, mcutime, mcstime; - double utime, stime, cutime, cstime; - - times(&buf); - - utime = (double)buf.tms_utime / clk_tck; - mutime = utime / 60; - utime -= mutime * 60.0; - - stime = (double)buf.tms_stime / clk_tck; - mstime = stime / 60; - stime -= mstime * 60.0; - - cutime = (double)buf.tms_cutime / clk_tck; - mcutime = cutime / 60; - cutime -= mcutime * 60.0; - - cstime = (double)buf.tms_cstime / clk_tck; - mcstime = cstime / 60; - cstime -= mcstime * 60.0; - - printf("%dm%fs %dm%fs\n%dm%fs %dm%fs\n", mutime, utime, mstime, stime, - mcutime, cutime, mcstime, cstime); - return 0; -} |