Rolled back wrongly committed changes (thought it seems all directory should go away)

extern/regex/main.c

@@ -74,9 +74,9 @@ char *argv[];
 		exit(status);
 	}
 
-	err = regComp(&re, argv[optind++], copts);
+	err = regcomp(&re, argv[optind++], copts);
 	if (err) {
-		len = regError(err, &re, erbuf, sizeof(erbuf));
+		len = regerror(err, &re, erbuf, sizeof(erbuf));
 		fprintf(stderr, "error %s, %d/%d `%s'\n",
 			eprint(err), len, sizeof(erbuf), erbuf);
 		exit(status);
@@ -84,7 +84,7 @@ char *argv[];
 	regprint(&re, stdout);	
 
 	if (optind >= argc) {
-		regFree(&re);
+		regfree(&re);
 		exit(status);
 	}
 
@@ -92,9 +92,9 @@ char *argv[];
 		subs[0].rm_so = startoff;
 		subs[0].rm_eo = strlen(argv[optind]) - endoff;
 	}
-	err = regExec(&re, argv[optind], (size_t)NS, subs, eopts);
+	err = regexec(&re, argv[optind], (size_t)NS, subs, eopts);
 	if (err) {
-		len = regError(err, &re, erbuf, sizeof(erbuf));
+		len = regerror(err, &re, erbuf, sizeof(erbuf));
 		fprintf(stderr, "error %s, %d/%d `%s'\n",
 			eprint(err), len, sizeof(erbuf), erbuf);
 		exit(status);
@@ -163,27 +163,27 @@ FILE *in;
 					options('c', f[1]) &~ REG_EXTENDED);
 	}
 
-	ne = regError(REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
+	ne = regerror(REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
 	if (strcmp(erbuf, badpat) != 0 || ne != strlen(badpat)+1) {
 		fprintf(stderr, "end: regerror() test gave `%s' not `%s'\n",
 							erbuf, badpat);
 		status = 1;
 	}
-	ne = regError(REG_BADPAT, (regex_t *)NULL, erbuf, (size_t)SHORT);
+	ne = regerror(REG_BADPAT, (regex_t *)NULL, erbuf, (size_t)SHORT);
 	if (strncmp(erbuf, badpat, SHORT-1) != 0 || erbuf[SHORT-1] != '\0' ||
 						ne != strlen(badpat)+1) {
 		fprintf(stderr, "end: regerror() short test gave `%s' not `%.*s'\n",
 						erbuf, SHORT-1, badpat);
 		status = 1;
 	}
-	ne = regError(REG_ITOA|REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
+	ne = regerror(REG_ITOA|REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
 	if (strcmp(erbuf, bpname) != 0 || ne != strlen(bpname)+1) {
 		fprintf(stderr, "end: regerror() ITOA test gave `%s' not `%s'\n",
 						erbuf, bpname);
 		status = 1;
 	}
 	re.re_endp = bpname;
-	ne = regError(REG_ATOI, &re, erbuf, sizeof(erbuf));
+	ne = regerror(REG_ATOI, &re, erbuf, sizeof(erbuf));
 	if (atoi(erbuf) != (int)REG_BADPAT) {
 		fprintf(stderr, "end: regerror() ATOI test gave `%s' not `%ld'\n",
 						erbuf, (long)REG_BADPAT);
@@ -226,10 +226,10 @@ int opts;			/* may not match f1 */
 	strcpy(f0copy, f0);
 	re.re_endp = (opts&REG_PEND) ? f0copy + strlen(f0copy) : NULL;
 	fixstr(f0copy);
-	err = regComp(&re, f0copy, opts);
+	err = regcomp(&re, f0copy, opts);
 	if (err != 0 && (!opt('C', f1) || err != efind(f2))) {
 		/* unexpected error or wrong error */
-		len = regError(err, &re, erbuf, sizeof(erbuf));
+		len = regerror(err, &re, erbuf, sizeof(erbuf));
 		fprintf(stderr, "%d: %s error %s, %d/%d `%s'\n",
 					line, type, eprint(err), len,
 					sizeof(erbuf), erbuf);
@@ -243,7 +243,7 @@ int opts;			/* may not match f1 */
 	}
 
 	if (err != 0) {
-		regFree(&re);
+		regfree(&re);
 		return;
 	}
 
@@ -256,11 +256,11 @@ int opts;			/* may not match f1 */
 		subs[0].rm_so = strchr(f2, '(') - f2 + 1;
 		subs[0].rm_eo = strchr(f2, ')') - f2;
 	}
-	err = regExec(&re, f2copy, NSUBS, subs, options('e', f1));
+	err = regexec(&re, f2copy, NSUBS, subs, options('e', f1));
 
 	if (err != 0 && (f3 != NULL || err != REG_NOMATCH)) {
 		/* unexpected error or wrong error */
-		len = regError(err, &re, erbuf, sizeof(erbuf));
+		len = regerror(err, &re, erbuf, sizeof(erbuf));
 		fprintf(stderr, "%d: %s exec error %s, %d/%d `%s'\n",
 					line, type, eprint(err), len,
 					sizeof(erbuf), erbuf);
@@ -282,7 +282,7 @@ int opts;			/* may not match f1 */
 	}
 
 	if (err != 0 || f4 == NULL) {
-		regFree(&re);
+		regfree(&re);
 		return;
 	}
 
@@ -303,7 +303,7 @@ int opts;			/* may not match f1 */
 		}
 	}
 
-	regFree(&re);
+	regfree(&re);
 }
 
 /*
@@ -485,7 +485,7 @@ int err;
 	static char epbuf[100];
 	size_t len;
 
-	len = regError(REG_ITOA|err, (regex_t *)NULL, epbuf, sizeof(epbuf));
+	len = regerror(REG_ITOA|err, (regex_t *)NULL, epbuf, sizeof(epbuf));
 	assert(len <= sizeof(epbuf));
 	return(epbuf);
 }
@@ -505,6 +505,6 @@ char *name;
 	sprintf(efbuf, "REG_%s", name);
 	assert(strlen(efbuf) < sizeof(efbuf));
 	re.re_endp = efbuf;
-	(void) regError(REG_ATOI, &re, efbuf, sizeof(efbuf));
+	(void) regerror(REG_ATOI, &re, efbuf, sizeof(efbuf));
 	return(atoi(efbuf));
 }

extern/regex/regcomp.c

@@ -83,7 +83,7 @@ static int never = 0;		/* for use in asserts; shuts lint up */
  = #define	REG_DUMP	0200
  */
 int				/* 0 success, otherwise REG_something */
-regComp(preg, pattern, cflags)
+regcomp(preg, pattern, cflags)
 regex_t *preg;
 const char *pattern;
 int cflags;
@@ -178,7 +178,7 @@ int cflags;
 
 	/* win or lose, we're done */
 	if (p->error != 0)	/* lose */
-		regFree(preg);
+		regfree(preg);
 	return(p->error);
 }
 

extern/regex/regerror.c

@@ -61,7 +61,7 @@ static struct rerr {
  */
 /* ARGSUSED */
 size_t
-regError(_errcode, preg, errbuf, errbuf_size)
+regerror(_errcode, preg, errbuf, errbuf_size)
 int _errcode;
 const regex_t *preg;
 char *errbuf;

extern/regex/regex.h

@@ -1,5 +1,5 @@
-#ifndef _REGEX_FB_H_
-#define	_REGEX_FB_H_	/* never again */
+#ifndef _REGEX_H_
+#define	_REGEX_H_	/* never again */
 /* ========= begin header generated by ./mkh ========= */
 #ifdef __cplusplus
 extern "C" {
@@ -20,7 +20,7 @@ typedef struct {
 
 
 /* === ./regcomp.c === */
-extern int regComp(regex_t *, const char *, int);
+extern int regcomp(regex_t *, const char *, int);
 #define	REG_BASIC	0000
 #define	REG_EXTENDED	0001
 #define	REG_ICASE	0002
@@ -51,11 +51,11 @@ extern int regComp(regex_t *, const char *, int);
 #define	REG_INVARG	16
 #define	REG_ATOI	255	/* convert name to number (!) */
 #define	REG_ITOA	0400	/* convert number to name (!) */
-extern size_t regError(int, const regex_t *, char *, size_t);
+extern size_t regerror(int, const regex_t *, char *, size_t);
 
 
 /* === ./regexec.c === */
-extern int regExec(const regex_t *, const char *, size_t, regmatch_t [], int);
+extern int regexec(const regex_t *, const char *, size_t, regmatch_t [], int);
 #define	REG_NOTBOL	00001
 #define	REG_NOTEOL	00002
 #define	REG_STARTEND	00004
@@ -65,7 +65,7 @@ extern int regExec(const regex_t *, const char *, size_t, regmatch_t [], int);
 
 
 /* === ./regfree.c === */
-extern void regFree(regex_t *);
+extern void regfree(regex_t *);
 
 #ifdef __cplusplus
 }

extern/regex/regexec.c

@@ -110,7 +110,7 @@ static int nope = 0;		/* for use in asserts; shuts lint up */
  * have been prototyped.
  */
 int				/* 0 success, REG_NOMATCH failure */
-regExec(preg, string, nmatch, pmatch, eflags)
+regexec(preg, string, nmatch, pmatch, eflags)
 const regex_t *preg;
 const char *string;
 size_t nmatch;

extern/regex/regfree.c

@@ -11,7 +11,7 @@
  = extern void regfree(regex_t *);
  */
 void
-regFree(preg)
+regfree(preg)
 regex_t *preg;
 {
 	register struct re_guts *g;