Browse Source

Add 'test' utility implementation from OpenBSD. The test.c is public domain.

git-svn-id: https://klish.googlecode.com/svn/trunk@247 0eaa4687-2ee9-07dd-09d9-bcdd2d2dd5fb
Serj Kalichev 13 years ago
parent
commit
acf6aaf536
10 changed files with 617 additions and 24 deletions
  1. 2 1
      Makefile.am
  2. 13 10
      Makefile.in
  3. 10 10
      configure
  4. 2 2
      configure.ac
  5. 4 1
      lub/module.am
  6. 20 0
      lub/system.h
  7. 4 0
      lub/system/module.am
  8. 9 0
      lub/system/private.h
  9. 46 0
      lub/system/system_test.c
  10. 507 0
      lub/system/test.c

+ 2 - 1
Makefile.am

@@ -8,7 +8,8 @@ if DEBUG
   DEBUG_CFLAGS = -DDEBUG
 endif
 
-AM_CFLAGS               = -ansi -pedantic -Werror -Wall -D_POSIX_C_SOURCE=199309 -DVERSION=$(VERSION) $(DEBUG_CFLAGS)
+AM_CFLAGS               = -pedantic -Werror -Wall -DVERSION=$(VERSION) $(DEBUG_CFLAGS)
+#AM_CFLAGS               = -ansi -pedantic -Werror -Wall -D_POSIX_C_SOURCE=199309 -DVERSION=$(VERSION) $(DEBUG_CFLAGS)
 
 bin_PROGRAMS            =
 lib_LTLIBRARIES         =

File diff suppressed because it is too large
+ 13 - 10
Makefile.in


+ 10 - 10
configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for clish 1.2.1.
+# Generated by GNU Autoconf 2.64 for clish 1.3.0.
 #
 # Report bugs to <serj.kalichev at gmail dot com>.
 #
@@ -698,8 +698,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='clish'
 PACKAGE_TARNAME='clish'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='clish 1.2.1'
+PACKAGE_VERSION='1.3.0'
+PACKAGE_STRING='clish 1.3.0'
 PACKAGE_BUGREPORT='serj.kalichev at gmail dot com'
 PACKAGE_URL=''
 
@@ -1450,7 +1450,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures clish 1.2.1 to adapt to many kinds of systems.
+\`configure' configures clish 1.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1520,7 +1520,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of clish 1.2.1:";;
+     short | recursive ) echo "Configuration of clish 1.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1630,7 +1630,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-clish configure 1.2.1
+clish configure 1.3.0
 generated by GNU Autoconf 2.64
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2300,7 +2300,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by clish $as_me 1.2.1, which was
+It was created by clish $as_me 1.3.0, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
@@ -14368,7 +14368,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='clish'
- VERSION='1.2.1'
+ VERSION='1.3.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15888,7 +15888,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by clish $as_me 1.2.1, which was
+This file was extended by clish $as_me 1.3.0, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15952,7 +15952,7 @@ Report bugs to <serj.kalichev at gmail dot com>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-clish config.status 1.2.1
+clish config.status 1.3.0
 configured by $0, generated by GNU Autoconf 2.64,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

+ 2 - 2
configure.ac

@@ -1,8 +1,8 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 m4_define([MAJOR_VERSION], 1)
-m4_define([MINOR_VERSION], 2)
-m4_define([MICRO_VERSION], 1)
+m4_define([MINOR_VERSION], 3)
+m4_define([MICRO_VERSION], 0)
 
 AC_PREREQ(2.59)
 AC_INIT([clish],

+ 4 - 1
lub/module.am

@@ -16,7 +16,8 @@ nobase_include_HEADERS  +=  \
     lub/string.h            \
     lub/size_fmt.h          \
     lub/test.h              \
-    lub/types.h
+    lub/types.h             \
+    lub/system.h
 
 EXTRA_DIST             +=   \
     lub/argv/module.am      \
@@ -28,6 +29,7 @@ EXTRA_DIST             +=   \
     lub/heap/module.am      \
     lub/string/module.am    \
     lub/test/module.am      \
+    lub/system/module.am    \
     lub/README
 
 include $(top_srcdir)/lub/argv/module.am
@@ -40,3 +42,4 @@ include $(top_srcdir)/lub/heap/module.am
 include $(top_srcdir)/lub/partition/module.am
 include $(top_srcdir)/lub/string/module.am
 include $(top_srcdir)/lub/test/module.am
+include $(top_srcdir)/lub/system/module.am

+ 20 - 0
lub/system.h

@@ -0,0 +1,20 @@
+/*
+ * system.h
+ *
+ */
+#ifndef _lub_system_h
+#define _lub_system_h
+
+#include <stddef.h>
+
+#include "lub/c_decl.h"
+_BEGIN_C_DECL
+
+bool_t lub_system_test(int argc, char **argv);
+bool_t lub_system_argv_test(const lub_argv_t *argv);
+bool_t lub_system_line_test(const char *line);
+
+_END_C_DECL
+
+#endif /* _lub_system_h */
+

+ 4 - 0
lub/system/module.am

@@ -0,0 +1,4 @@
+liblub_la_SOURCES +=	lub/system/test.c \
+			lub/system/system_test.c \
+			lub/system/private.h
+

+ 9 - 0
lub/system/private.h

@@ -0,0 +1,9 @@
+/*
+ * private.h
+ */
+#include "lub/types.h"
+#include "lub/argv.h"
+#include "lub/system.h"
+
+int testcmd(int argc, char *argv[]);
+

+ 46 - 0
lub/system/system_test.c

@@ -0,0 +1,46 @@
+/*
+ * system_test.c
+ */
+
+#include <stdlib.h>
+
+#include "private.h"
+
+/*--------------------------------------------------------- */
+bool_t lub_system_test(int argc, char **argv)
+{
+	return testcmd(argc, argv) ? BOOL_FALSE : BOOL_TRUE;
+}
+
+/*--------------------------------------------------------- */
+bool_t lub_system_line_test(const char *line)
+{
+	bool_t res;
+	lub_argv_t *argv;
+
+	argv = lub_argv_new(line, 0);
+	res = lub_system_argv_test(argv);
+	lub_argv_delete(argv);
+
+	return res;
+}
+
+/*--------------------------------------------------------- */
+bool_t lub_system_argv_test(const lub_argv_t *argv)
+{
+	bool_t res;
+	char **str_argv;
+	int str_argc;
+
+	/* Make args */
+	str_argv = lub_argv__get_argv(argv, "");
+	str_argc = lub_argv__get_count(argv) + 1;
+
+	/* Test it */
+	res = lub_system_test(str_argc, str_argv);
+	free(str_argv);
+
+	return res;
+}
+
+/*--------------------------------------------------------- */

+ 507 - 0
lub/system/test.c

@@ -0,0 +1,507 @@
+/*	$OpenBSD: test.c,v 1.11 2009/10/27 23:59:22 deraadt Exp $	*/
+/*	$NetBSD: test.c,v 1.15 1995/03/21 07:04:06 cgd Exp $	*/
+
+/*
+ * 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/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <err.h>
+
+#ifndef __dead
+#define __dead __attribute__((noreturn))
+#endif
+
+#define main testcmd
+
+/* 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
+};
+
+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}
+};
+
+char **t_wp;
+struct t_op const *t_wp_op;
+
+static enum token t_lex(char *);
+static enum token t_lex_type(char *);
+static int oexpr(enum token n);
+static int aexpr(enum token n);
+static int nexpr(enum token n);
+static int binop(void);
+static int primary(enum token n);
+static int filstat(char *nm, enum token mode);
+static int getn(const char *s);
+static int newerf(const char *, const char *);
+static int olderf(const char *, const char *);
+static int equalf(const char *, const char *);
+static void syntax(const char *op, char *msg);
+
+int
+main(int argc, char *argv[])
+{
+	int	res;
+
+	if (strcmp(argv[0], "[") == 0) {
+		if (strcmp(argv[--argc], "]"))
+			errx(2, "missing ]");
+		argv[argc] = NULL;
+	}
+
+	/* Implement special cases from POSIX.2, section 4.62.4 */
+	switch (argc) {
+	case 1:
+		return 1;
+	case 2:
+		return (*argv[1] == '\0');
+	case 3:
+		if (argv[1][0] == '!' && argv[1][1] == '\0') {
+			return !(*argv[2] == '\0');
+		}
+		break;
+	case 4:
+		if (argv[1][0] != '!' || argv[1][1] != '\0') {
+			if (t_lex(argv[2]),
+			    t_wp_op && t_wp_op->op_type == BINOP) {
+				t_wp = &argv[1];
+				return (binop() == 0);
+			}
+		}
+		break;
+	case 5:
+		if (argv[1][0] == '!' && argv[1][1] == '\0') {
+			if (t_lex(argv[3]),
+			    t_wp_op && t_wp_op->op_type == BINOP) {
+				t_wp = &argv[2];
+				return !(binop() == 0);
+			}
+		}
+		break;
+	}
+
+	t_wp = &argv[1];
+	res = !oexpr(t_lex(*t_wp));
+
+	if (*t_wp != NULL && *++t_wp != NULL)
+		syntax(*t_wp, "unknown operand");
+
+	return res;
+}
+
+static __dead void
+syntax(const char *op, char *msg)
+{
+	if (op && *op)
+		errx(2, "%s: %s", op, msg);
+	else
+		errx(2, "%s", msg);
+}
+
+static int
+oexpr(enum token n)
+{
+	int res;
+
+	res = aexpr(n);
+	if (t_lex(*++t_wp) == BOR)
+		return oexpr(t_lex(*++t_wp)) || res;
+	t_wp--;
+	return res;
+}
+
+static int
+aexpr(enum token n)
+{
+	int res;
+
+	res = nexpr(n);
+	if (t_lex(*++t_wp) == BAND)
+		return aexpr(t_lex(*++t_wp)) && res;
+	t_wp--;
+	return res;
+}
+
+static int
+nexpr(enum token n)
+{
+	if (n == UNOT)
+		return !nexpr(t_lex(*++t_wp));
+	return primary(n);
+}
+
+static int
+primary(enum token n)
+{
+	int res;
+
+	if (n == EOI)
+		syntax(NULL, "argument expected");
+	if (n == LPAREN) {
+		res = oexpr(t_lex(*++t_wp));
+		if (t_lex(*++t_wp) != RPAREN)
+			syntax(NULL, "closing paren expected");
+		return res;
+	}
+	/*
+	 * We need this, if not binary operations with more than 4
+	 * arguments will always fall into unary.
+	 */
+	if(t_lex_type(t_wp[1]) == BINOP) {
+		t_lex(t_wp[1]);
+		if (t_wp_op && t_wp_op->op_type == BINOP)
+			return binop();
+	}
+
+	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));
+		default:
+			return filstat(*t_wp, n);
+		}
+	}
+
+	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) == NULL)
+		syntax(op->op_text, "argument expected");
+
+	switch (op->op_num) {
+	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);
+	}
+	/* NOTREACHED */
+	return 1; /* to make compiler happy */
+}
+
+static enum token
+t_lex_type(char *s)
+{
+	struct t_op const *op = ops;
+
+	if (s == NULL)
+		return -1;
+
+	while (op->op_text) {
+		if (strcmp(s, op->op_text) == 0)
+			return op->op_type;
+		op++;
+	}
+	return -1;
+}
+
+static int
+filstat(char *nm, enum token mode)
+{
+	struct stat s;
+	mode_t i;
+
+	if (mode == FILSYM) {
+#ifdef S_IFLNK
+		if (lstat(nm, &s) == 0) {
+			i = S_IFLNK;
+			goto filetype;
+		}
+#endif
+		return 0;
+	}
+
+	if (stat(nm, &s) != 0)
+		return 0;
+
+	switch (mode) {
+	case FILRD:
+		return access(nm, R_OK) == 0;
+	case FILWR:
+		return access(nm, W_OK) == 0;
+	case FILEX:
+		return access(nm, X_OK) == 0;
+	case FILEXIST:
+		return access(nm, F_OK) == 0;
+	case FILREG:
+		i = S_IFREG;
+		goto filetype;
+	case FILDIR:
+		i = S_IFDIR;
+		goto filetype;
+	case FILCDEV:
+		i = S_IFCHR;
+		goto filetype;
+	case FILBDEV:
+		i = S_IFBLK;
+		goto filetype;
+	case FILFIFO:
+#ifdef S_IFIFO
+		i = S_IFIFO;
+		goto filetype;
+#else
+		return 0;
+#endif
+	case FILSOCK:
+#ifdef S_IFSOCK
+		i = S_IFSOCK;
+		goto filetype;
+#else
+		return 0;
+#endif
+	case FILSUID:
+		i = S_ISUID;
+		goto filebit;
+	case FILSGID:
+		i = S_ISGID;
+		goto filebit;
+	case FILSTCK:
+		i = S_ISVTX;
+		goto filebit;
+	case FILGZ:
+		return s.st_size > 0L;
+	case FILUID:
+		return s.st_uid == geteuid();
+	case FILGID:
+		return s.st_gid == getegid();
+	default:
+		return 1;
+	}
+
+filetype:
+	return ((s.st_mode & S_IFMT) == i);
+
+filebit:
+	return ((s.st_mode & i) != 0);
+}
+
+static enum token
+t_lex(char *s)
+{
+	struct t_op const *op = ops;
+
+	if (s == 0) {
+		t_wp_op = NULL;
+		return EOI;
+	}
+	while (op->op_text) {
+		if (strcmp(s, op->op_text) == 0) {
+			t_wp_op = op;
+			return op->op_num;
+		}
+		op++;
+	}
+	t_wp_op = NULL;
+	return OPERAND;
+}
+
+/* atoi with error detection */
+static int
+getn(const char *s)
+{
+	char *p;
+	long r;
+
+	errno = 0;
+	r = strtol(s, &p, 10);
+
+	if (errno != 0)
+		errx(2, "%s: out of range", s);
+
+	while (isspace(*p))
+		p++;
+
+	if (*p)
+		errx(2, "%s: bad number", s);
+
+	return (int) r;
+}
+
+static int
+newerf(const char *f1, const char *f2)
+{
+	struct stat b1, b2;
+
+	return (stat(f1, &b1) == 0 &&
+	    stat(f2, &b2) == 0 &&
+	    b1.st_mtime > b2.st_mtime);
+}
+
+static int
+olderf(const char *f1, const char *f2)
+{
+	struct stat b1, b2;
+
+	return (stat(f1, &b1) == 0 &&
+	    stat(f2, &b2) == 0 &&
+	    b1.st_mtime < b2.st_mtime);
+}
+
+static int
+equalf(const char *f1, const char *f2)
+{
+	struct stat b1, b2;
+
+	return (stat(f1, &b1) == 0 &&
+	    stat(f2, &b2) == 0 &&
+	    b1.st_dev == b2.st_dev &&
+	    b1.st_ino == b2.st_ino);
+}

Some files were not shown because too many files changed in this diff