Merge pull request wryun#128 from jpco/posix

Posix and portability improvements

.circleci/config.yml

@@ -27,10 +27,15 @@ 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:

.gitignore

@@ -43,3 +43,4 @@ sigmsgs.c
 token.h
 es
 esdump
+testrun

Makefile.in

@@ -77,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
@@ -94,7 +94,10 @@ install : es
 	$(MKDIR_P) $(DESTDIR)$(datadir)/es
 	$(INSTALL_DATA) $(srcdir)/share/* $(DESTDIR)$(datadir)/es
 
-test	: es $(testdir)/test.es
+testrun	: $(testdir)/testrun.c
+	${CC} -o testrun $(testdir)/testrun.c
+
+test	: es testrun $(testdir)/test.es
 	./es -s < $(testdir)/test.es $(testdir)/tests/*
 
 src	:

access.c

@@ -14,21 +14,29 @@
 #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;
 }
 
@@ -56,16 +64,17 @@ static int testperm(struct stat *stat, unsigned int perm) {
 
 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);
 }
 
@@ -114,19 +123,13 @@ PRIM(access) {
 		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);
@@ -177,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);
 }

configure.ac

@@ -18,12 +18,6 @@ rm -f conftest*
 
 AC_CANONICAL_HOST
 
-case "$host" in
-	*sun5* | *solaris2*)
-		AC_DEFINE(SOLARIS, [], [Are we Solaris?])
-	;;
-esac
-
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
@@ -67,12 +61,10 @@ AC_TYPE_SIZE_T
 
 dnl Checks for library functions.
 AC_TYPE_GETGROUPS
-AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MMAP
 
-AC_FUNC_WAIT3
 AC_CHECK_FUNCS(strerror strtol lstat setrlimit sigrelse sighold sigaction \
-sysconf setsid sigsetjmp)
+sysconf setsid sigsetjmp getrusage)
 
 AC_CACHE_CHECK(for an abused getenv, es_cv_abused_getenv,
 AC_RUN_IFELSE([AC_LANG_SOURCE([[

esconfig.h

@@ -200,16 +200,6 @@
 #endif
 #endif	/* sgi */
 
-
-/* SunOS 4.x defaults */
-
-#if sun && !SOLARIS
-#ifndef	INITIAL_PATH
-#define	INITIAL_PATH		"/usr/ucb", "/usr/bin", ""
-#endif
-#endif	/* sun */
-
-
 /* HP/UX 9.0.1 -- from [email protected] (Rich $alz) and haahr*/
 
 #if HPUX

glob.c

@@ -55,7 +55,7 @@ static List *dirmatch(const char *prefix, const char *dirname, const char *patte
 	 * is necessary (sigh);  the check is done here instead of with the
 	 * opendir to handle a trailing slash.
 	 */
-	if (stat(dirname, &s) == -1 || (s.st_mode & S_IFMT) != S_IFDIR)
+	if (stat(dirname, &s) == -1 || !S_ISDIR(s.st_mode))
 		return NULL;	
 
 	if (!haswild(pattern, quote)) {

prim-sys.c

@@ -14,7 +14,7 @@
 #if BSD_LIMITS || BUILTIN_TIME
 #include <sys/time.h>
 #include <sys/resource.h>
-#if !HAVE_WAIT3
+#if !HAVE_GETRUSAGE
 #include <sys/times.h>
 #include <limits.h>
 #endif
@@ -28,17 +28,15 @@ PRIM(newpgrp) {
 		fail("$&newpgrp", "usage: newpgrp");
 	pid = getpid();
 	setpgrp(pid, pid);
-#ifdef TIOCSPGRP
 	{
 		Sigeffect sigtstp = esignal(SIGTSTP, sig_ignore);
 		Sigeffect sigttin = esignal(SIGTTIN, sig_ignore);
 		Sigeffect sigttou = esignal(SIGTTOU, sig_ignore);
-		ioctl(2, TIOCSPGRP, &pid);
+		tcsetpgrp(2, pid);
 		esignal(SIGTSTP, sigtstp);
 		esignal(SIGTTIN, sigttin);
 		esignal(SIGTTOU, sigttou);
 	}
-#endif
 	return ltrue;
 }
 
@@ -296,8 +294,7 @@ PRIM(limit) {
 
 #if BUILTIN_TIME
 PRIM(time) {
-
-#if HAVE_WAIT3
+#if HAVE_GETRUSAGE
 
 	int pid, status;
 	time_t t0, t1;
@@ -326,7 +323,7 @@ PRIM(time) {
 	RefEnd(lp);
 	return mklist(mkstr(mkstatus(status)), NULL);
 
-#else	/* !HAVE_WAIT3 */
+#else	/* !HAVE_GETRUSAGE */
 
 	int pid, status;
 	Ref(List *, lp, list);
@@ -370,8 +367,7 @@ PRIM(time) {
 	RefEnd(lp);
 	return mklist(mkstr(mkstatus(status)), NULL);
 
-#endif	/* !HAVE_WAIT3 */
-
+#endif	/* !HAVE_GETRUSAGE */
 }
 #endif	/* BUILTIN_TIME */