Merge branch 'master' into fastread

Author: jpco

.circleci/config.yml

@@ -27,6 +27,44 @@ jobs:
           name: Build
           command: make 'ADDCFLAGS=-DGCDEBUG=1 -DREF_ASSERTIONS=1'
 
+      - run:
+          name: Build test helper
+          command: make testrun
+
+      - persist_to_workspace:
+          root: .
+          paths:
+            - es
+            - testrun
+
+  test:
+    docker:
+      - image: cimg/base:stable
+
+    steps:
+      - checkout
+
+      - attach_workspace:
+          at: .
+
       - run:
           name: Test
-          command: make trip
+          command: |
+            mkdir -p ./test/results
+            ./es -s < ./test/test.es --junit ./test/tests/* > ./test/results/results.xml
+
+      - store_artifacts:
+          path: ./test/results/
+
+      - store_test_results:
+          path: ./test/results/
+
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build
+      - test:
+          requires:
+            - build

.gitattributes

@@ -1 +1 @@
-trip.es diff -a
+test/tests/trip.es text diff

.gitignore

@@ -21,6 +21,13 @@ autom4te.cache
 /missing
 /stamp-h1
 /ltmain.sh
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+/config.h.in~
+/configure~
 
 Makefile
 config.h
@@ -36,3 +43,4 @@ sigmsgs.c
 token.h
 es
 esdump
+testrun

INSTALL

@@ -33,9 +33,10 @@ execute configure with a path to the source.  For example:
    Also obeying the GNU configure convention, configure will take
 arguments specifying a variety of directories.  Currently the only
 relevant ones are the prefix directory (/usr/local by default); bindir,
-the directory in which `es' will reside ($prefix/bin by default); and
+the directory in which `es' will reside ($prefix/bin by default);
 mandir, the directory that will contain the manpage ($prefix/man by
-default).  These are given to configure by:
+default); and datadir, the directory that will contain the es script
+library ($prefix/share by default).  These are given to configure by:
 
    % ./configure --prefix=directory
    % ./configure --bindir=directory --mandir=directory

Makefile.in

@@ -26,38 +26,42 @@
 # to get definitions of all signals from <sys/signal.h>.
 # _POSIX_SOURCE, _XOPEN_SOURCE are the obvious ones.
 
-datarootdir = @datarootdir@
 prefix  = @prefix@
+datarootdir = @datarootdir@
+datadir	= @datadir@
 exec_prefix	= @exec_prefix@
 mandir	= @mandir@
 bindir	= @bindir@
 srcdir  = @srcdir@
+testdir	= @srcdir@/test
 
 
 SHELL	= /bin/sh
 CC	= @CC@
 INSTALL	= @INSTALL@
+INSTALL_PROGRAM	= ${INSTALL}
+INSTALL_DATA	= ${INSTALL} -m 644
 MKDIR_P = @MKDIR_P@
 
 
 ## Bison is generating incorrect parsers.  So do not use, for now
 # YACC = @YACC@
 
-CFLAGS	= $(ADDCFLAGS) -I. -I$(srcdir) -W -Wall -Wno-implicit-fallthrough -Wno-cast-function-type -Wno-missing-field-initializers -Wno-unused-parameter -Wno-clobbered @CFLAGS@
+CFLAGS	= $(ADDCFLAGS) -I. -I$(srcdir) -W -Wall -Wdeclaration-after-statement @READLINE_CFLAGS@ @CFLAGS@
 LDFLAGS	= $(ADDLDFLAGS) @LDFLAGS@
-LIBS	= $(ADDLIBS) @LIBS@
+LIBS	= $(ADDLIBS) @READLINE_LIBS@ @LIBS@
 
 VPATH = $(srcdir)
 
 HFILES	= config.h es.h gc.h input.h prim.h print.h sigmsgs.h \
 	  stdenv.h syntax.h term.h var.h
 CFILES	= access.c closure.c conv.c dict.c eval.c except.c fd.c gc.c glob.c \
-	  glom.c input.c heredoc.c list.c main.c match.c open.c opt.c \
+	  glom.c input.c heredoc.c history.c list.c main.c match.c open.c opt.c \
 	  prim-ctl.c prim-etc.c prim-io.c prim-sys.c prim.c print.c proc.c \
 	  sigmsgs.c signal.c split.c status.c str.c syntax.c term.c token.c \
 	  tree.c util.c var.c vec.c version.c y.tab.c dump.c
 OFILES	= access.o closure.o conv.o dict.o eval.o except.o fd.o gc.o glob.o \
-	  glom.o input.o heredoc.o list.o main.o match.o open.o opt.o \
+	  glom.o input.o heredoc.o history.o list.o main.o match.o open.o opt.o \
 	  prim-ctl.o prim-etc.o prim-io.o prim-sys.o prim.o print.o proc.o \
 	  sigmsgs.o signal.o split.o status.o str.o syntax.o term.o token.o \
 	  tree.o util.o var.o vec.o version.o y.tab.o
@@ -73,7 +77,7 @@ esdump	: ${OFILES} dump.o
 	${CC} -o esdump ${LDFLAGS} ${OFILES} dump.o ${LIBS}
 
 clean	:
-	rm -f es ${OFILES} ${GEN} dump.o initial.o
+	rm -f es testrun ${OFILES} ${GEN} dump.o initial.o
 
 distclean:	clean
 	rm -f config.cache config.log config.h Makefile cscope.out tags TAGS core cs.out config.status ltmain.sh
@@ -84,21 +88,26 @@ MANIFEST:
 
 install : es
 	$(MKDIR_P) $(DESTDIR)$(bindir)
-	$(INSTALL) -s $(srcdir)/es $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) -s es $(DESTDIR)$(bindir)
 	$(MKDIR_P) $(DESTDIR)$(mandir)/man1
-	$(INSTALL) $(srcdir)/doc/es.1 $(DESTDIR)$(mandir)/man1
+	$(INSTALL_DATA) $(srcdir)/doc/es.1 $(DESTDIR)$(mandir)/man1
+	$(MKDIR_P) $(DESTDIR)$(datadir)/es
+	$(INSTALL_DATA) $(srcdir)/share/* $(DESTDIR)$(datadir)/es
 
-test	: trip
+testrun	: $(testdir)/testrun.c
+	${CC} -o testrun $(testdir)/testrun.c
 
-trip	: es $(srcdir)/trip.es
-	./es < $(srcdir)/trip.es
+test	: es testrun $(testdir)/test.es
+	./es -s < $(testdir)/test.es $(testdir)/tests/*
 
 src	:
 	@echo ${OTHER} ${CFILES} ${HFILES}
 
-y.tab.c y.tab.h : parse.y
+y.tab.h	: parse.y
 	${YACC} -vd $(srcdir)/parse.y
 
+y.tab.c	: y.tab.h
+
 token.h : y.tab.h
 	-cmp -s y.tab.h token.h || cp y.tab.h token.h
 
@@ -126,6 +135,7 @@ glob.o : glob.c es.h config.h stdenv.h gc.h
 glom.o : glom.c es.h config.h stdenv.h gc.h 
 input.o : input.c es.h config.h stdenv.h input.h 
 heredoc.o : heredoc.c es.h config.h stdenv.h gc.h input.h syntax.h 
+history.o : history.c es.h config.h stdenv.h gc.h input.h 
 list.o : list.c es.h config.h stdenv.h gc.h 
 main.o : main.c es.h config.h stdenv.h 
 match.o : match.c es.h config.h stdenv.h 

access.c

@@ -14,26 +14,34 @@
 #define	GROUP	3
 #define	OTHER	0
 
+#define	IFREG	1
+#define	IFDIR	2
+#define	IFCHR	3
+#define	IFBLK	4
+#define	IFLNK	5
+#define	IFSOCK	6
+#define	IFIFO	7
+
 /* ingroupset -- determine whether gid lies in the user's set of groups */
 static Boolean ingroupset(gidset_t gid) {
-#ifdef NGROUPS
 	int i;
 	static int ngroups;
-	static gidset_t gidset[NGROUPS];
+	static gidset_t *gidset;
 	static Boolean initialized = FALSE;
 	if (!initialized) {
 		initialized = TRUE;
-		ngroups = getgroups(NGROUPS, gidset);
+		ngroups = getgroups(0, gidset);
+		gidset = ealloc(ngroups * sizeof(gidset_t));
+		getgroups(ngroups, gidset);
 	}
 	for (i = 0; i < ngroups; i++)
 		if (gid == gidset[i])
 			return TRUE;
-#endif
 	return FALSE;
 }
 
-static int testperm(struct stat *stat, int perm) {
-	int mask;
+static int testperm(struct stat *stat, unsigned int perm) {
+	unsigned int mask;
 	static gidset_t uid, gid;
 	static Boolean initialized = FALSE;
 	if (perm == 0)
@@ -51,21 +59,22 @@ static int testperm(struct stat *stat, int perm) {
 				: ((gid == stat->st_gid  || ingroupset(stat->st_gid))
 					? GROUP
 					: OTHER)));
-	return (stat->st_mode & mask) ? 0 : EACCES;
+	return (stat->st_mode & mask) == mask ? 0 : EACCES;
 }
 
-static int testfile(char *path, int perm, unsigned int type) {
+static int testfile(char *path, unsigned int perm, unsigned int type) {
 	struct stat st;
-#ifdef S_IFLNK
-	if (type == S_IFLNK) {
-		if (lstat(path, &st) == -1)
-			return errno;
-	} else
-#endif
-		if (stat(path, &st) == -1)
-			return errno;
-	if (type != 0 && (st.st_mode & S_IFMT) != type)
-		return EACCES;		/* what is an appropriate return value? */
+	if ((type == IFLNK ? lstat(path, &st) : stat(path, &st)) == -1)
+		return errno;
+	/* is EACCES the right return value? */
+	switch(type) {
+	case IFREG:	if (!S_ISREG(st.st_mode)) return EACCES; break;
+	case IFDIR:	if (!S_ISDIR(st.st_mode)) return EACCES; break;
+	case IFBLK:	if (!S_ISBLK(st.st_mode)) return EACCES; break;
+	case IFLNK:	if (!S_ISLNK(st.st_mode)) return EACCES; break;
+	case IFSOCK:	if (!S_ISSOCK(st.st_mode)) return EACCES; break;
+	case IFIFO:	if (!S_ISFIFO(st.st_mode)) return EACCES; break;
+	}
 	return testperm(&st, perm);
 }
 
@@ -97,8 +106,9 @@ static char *pathcat(char *prefix, char *suffix) {
 }
 
 PRIM(access) {
-	int c, perm = 0, type = 0, estatus = ENOENT;
-	Boolean first = FALSE, exception = FALSE;
+	int c, estatus = ENOENT;
+	unsigned int perm = 0, type = 0;
+	Boolean first = FALSE, throws = FALSE;
 	char *suffix = NULL;
 	List *lp;
 	const char * const usage = "access [-n name] [-1e] [-rwx] [-fdcblsp] path ...";
@@ -109,23 +119,17 @@ PRIM(access) {
 		switch (c) {
 		case 'n':	suffix = getstr(esoptarg());	break;
 		case '1':	first = TRUE;			break;
-		case 'e':	exception = TRUE;		break;
+		case 'e':	throws = TRUE;			break;
 		case 'r':	perm |= READ;			break;
 		case 'w':	perm |= WRITE;			break;
 		case 'x':	perm |= EXEC;			break;
-		case 'f':	type = S_IFREG;			break;
-		case 'd':	type = S_IFDIR;			break;
-		case 'c':	type = S_IFCHR;			break;
-		case 'b':	type = S_IFBLK;			break;
-#ifdef S_IFLNK
-		case 'l':	type = S_IFLNK;			break;
-#endif
-#ifdef S_IFSOCK
-		case 's':	type = S_IFSOCK;		break;
-#endif
-#ifdef S_IFIFO
-		case 'p':	type = S_IFIFO;			break;
-#endif
+		case 'f':	type = IFREG;			break;
+		case 'd':	type = IFDIR;			break;
+		case 'c':	type = IFCHR;			break;
+		case 'b':	type = IFBLK;			break;
+		case 'l':	type = IFLNK;			break;
+		case 's':	type = IFSOCK;			break;
+		case 'p':	type = IFIFO;			break;
 		default:
 			esoptend();
 			fail("$&access", "access -%c is not supported on this system", c);
@@ -153,11 +157,11 @@ PRIM(access) {
 			} else if (error != ENOENT)
 				estatus = error;
 		} else
-			lp = mklist(mkstr(error == 0 ? "0" : esstrerror(error)),
+			lp = mklist(mkstr(error == 0 ? "0" : gcdup(esstrerror(error))),
 				    lp);
 	}
 
-	if (first && exception) {
+	if (first && throws) {
 		gcenable();
 		if (suffix)
 			fail("$&access", "%s: %s", suffix, esstrerror(estatus));
@@ -176,6 +180,6 @@ extern Dict *initprims_access(Dict *primdict) {
 }
 
 extern char *checkexecutable(char *file) {
-	int err = testfile(file, EXEC, S_IFREG);
+	int err = testfile(file, EXEC, IFREG);
 	return err == 0 ? NULL : esstrerror(err);
 }