X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhlsbr.c;h=c4e822b364fa61fc347b68e93b204508d3e27ad4;hp=fbd25037d1d6645d4aa81d8709169b849c8ab050;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index fbd2503..c4e822b 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -254,45 +254,45 @@ static FILE *(*mhl_action) () = (FILE *(*) ()) 0;
 /*
 ** prototypes
 */
-static void mhl_format (char *, int, int);
-static int evalvar (struct mcomp *);
-static int ptoi (char *, int *);
-static int ptos (char *, char **);
-static char *parse (void);
-static void process (char *, char *, int, int);
-static void mhlfile (FILE *, char *, int, int);
-static int mcomp_flags (char *);
-static char *mcomp_add (long, char *, char *);
-static void mcomp_format (struct mcomp *, struct mcomp *);
-static struct mcomp *add_queue (struct mcomp **, struct mcomp **,
+static void mhl_format(char *, int, int);
+static int evalvar(struct mcomp *);
+static int ptoi(char *, int *);
+static int ptos(char *, char **);
+static char *parse(void);
+static void process(char *, char *, int, int);
+static void mhlfile(FILE *, char *, int, int);
+static int mcomp_flags(char *);
+static char *mcomp_add(long, char *, char *);
+static void mcomp_format(struct mcomp *, struct mcomp *);
+static struct mcomp *add_queue(struct mcomp **, struct mcomp **,
 		char *, char *, int);
-static void free_queue (struct mcomp **, struct mcomp **);
-static void putcomp (struct mcomp *, struct mcomp *, int);
-static char *oneline (char *, long);
-static void putstr (char *);
-static void putch (char);
-static RETSIGTYPE intrser (int);
-static RETSIGTYPE pipeser (int);
-static RETSIGTYPE quitser (int);
-static void face_format (struct mcomp *);
-static int doface (struct mcomp *);
-static void mhladios (char *, char *, ...);
-static void mhldone (int);
-static void m_popen (char *);
-
-int mhl (int, char **);
-int mhlsbr (int, char **, FILE *(*)());
-void m_pclose (void);
-
-void clear_screen (void);  /* from termsbr.c */
-int SOprintf (char *, ...);  /* from termsbr.c */
-int sc_width (void);  /* from termsbr.c */
-int sc_length (void);  /* from termsbr.c */
-int sc_hardcopy (void);  /* from termsbr.c */
+static void free_queue(struct mcomp **, struct mcomp **);
+static void putcomp(struct mcomp *, struct mcomp *, int);
+static char *oneline(char *, long);
+static void putstr(char *);
+static void putch(char);
+static RETSIGTYPE intrser(int);
+static RETSIGTYPE pipeser(int);
+static RETSIGTYPE quitser(int);
+static void face_format(struct mcomp *);
+static int doface(struct mcomp *);
+static void mhladios(char *, char *, ...);
+static void mhldone(int);
+static void m_popen(char *);
+
+int mhl(int, char **);
+int mhlsbr(int, char **, FILE *(*)());
+void m_pclose(void);
+
+void clear_screen(void);  /* from termsbr.c */
+int SOprintf(char *, ...);  /* from termsbr.c */
+int sc_width(void);  /* from termsbr.c */
+int sc_length(void);  /* from termsbr.c */
+int sc_hardcopy(void);  /* from termsbr.c */
 
 
 int
-mhl (int argc, char **argv)
+mhl(int argc, char **argv)
 {
 	int length = 0, nomore = 0;
 	int i, width = 0, vecp = 0;
@@ -300,36 +300,36 @@ mhl (int argc, char **argv)
 	char buf[BUFSIZ], *files[MAXARGS];
 	char **argp, **arguments;
 
-	invo_name = r1bindex (argv[0], '/');
+	invo_name = r1bindex(argv[0], '/');
 
 	/* read user profile/context */
 	context_read();
 
-	arguments = getarguments (invo_name, argc, argv, 1);
+	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
-	if ((cp = getenv ("MHLDEBUG")) && *cp)
+	if ((cp = getenv("MHLDEBUG")) && *cp)
 		mhldebug++;
 
-	if ((cp = getenv ("FACEPROC")))
+	if ((cp = getenv("FACEPROC")))
 		faceproc = cp;
 
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
-			switch (smatch (++cp, mhlswitches)) {
+			switch (smatch(++cp, mhlswitches)) {
 				case AMBIGSW:
-					ambigsw (cp, mhlswitches);
-					done (1);
+					ambigsw(cp, mhlswitches);
+					done(1);
 				case UNKWNSW:
-					adios (NULL, "-%s unknown\n", cp);
+					adios(NULL, "-%s unknown\n", cp);
 
 				case HELPSW:
-					snprintf (buf, sizeof(buf), "%s [switches] [files ...]", invo_name);
-					print_help (buf, mhlswitches, 1);
-					done (1);
+					snprintf(buf, sizeof(buf), "%s [switches] [files ...]", invo_name);
+					print_help(buf, mhlswitches, 1);
+					done(1);
 				case VERSIONSW:
 					print_version(invo_name);
-					done (1);
+					done(1);
 
 				case BELLSW:
 					bellflg = 1;
@@ -346,30 +346,31 @@ mhl (int argc, char **argv)
 					continue;
 
 				case FOLDSW:
-					if (!(folder = *argp++) || *folder == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+					if (!(folder = *argp++) ||
+							*folder == '-')
+						adios(NULL, "missing argument to %s", argp[-2]);
 					continue;
 				case FORMSW:
 					if (!(form = *argp++) || *form == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					continue;
 
 				case FACESW:
 					if (!(faceproc = *argp++) || *faceproc == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					continue;
 				case NFACESW:
 					faceproc = NULL;
 					continue;
 				case SLEEPSW:
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					sleepsw = atoi (cp);/* ZERO ok! */
+						adios(NULL, "missing argument to %s", argp[-2]);
+					sleepsw = atoi(cp);  /* ZERO ok! */
 					continue;
 
 				case PROGSW:
 					if (!(moreproc = *argp++) || *moreproc == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					continue;
 				case NPROGSW:
 					nomore++;
@@ -377,32 +378,33 @@ mhl (int argc, char **argv)
 
 				case LENSW:
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					if ((length = atoi (cp)) < 1)
-						adios (NULL, "bad argument %s %s", argp[-2], cp);
+						adios(NULL, "missing argument to %s", argp[-2]);
+					if ((length = atoi(cp)) < 1)
+						adios(NULL, "bad argument %s %s", argp[-2], cp);
 					continue;
 				case WIDTHSW:
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					if ((width = atoi (cp)) < 1)
-						adios (NULL, "bad argument %s %s", argp[-2], cp);
+						adios(NULL, "missing argument to %s", argp[-2]);
+					if ((width = atoi(cp)) < 1)
+						adios(NULL, "bad argument %s %s", argp[-2], cp);
 					continue;
 
 				case DGSTSW:
-					if (!(digest = *argp++) || *digest == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+					if (!(digest = *argp++) ||
+							*digest == '-')
+						adios(NULL, "missing argument to %s", argp[-2]);
 					continue;
 				case ISSUESW:
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					if ((issue = atoi (cp)) < 1)
-						adios (NULL, "bad argument %s %s", argp[-2], cp);
+						adios(NULL, "missing argument to %s", argp[-2]);
+					if ((issue = atoi(cp)) < 1)
+						adios(NULL, "bad argument %s %s", argp[-2], cp);
 					continue;
 				case VOLUMSW:
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					if ((volume = atoi (cp)) < 1)
-						adios (NULL, "bad argument %s %s", argp[-2], cp);
+						adios(NULL, "missing argument to %s", argp[-2]);
+					if ((volume = atoi(cp)) < 1)
+						adios(NULL, "bad argument %s %s", argp[-2], cp);
 					continue;
 
 				case FORW2SW:
@@ -428,54 +430,52 @@ mhl (int argc, char **argv)
 	}
 
 	if (!folder)
-		folder = getenv ("mhfolder");
+		folder = getenv("mhfolder");
 
-	if (isatty (fileno (stdout))) {
+	if (isatty(fileno(stdout))) {
 		if (!nomore && !sc_hardcopy() && moreproc && *moreproc != '\0') {
 			if (mhl_action) {
-				SIGNAL (SIGINT, SIG_IGN);
-				SIGNAL2 (SIGQUIT, quitser);
+				SIGNAL(SIGINT, SIG_IGN);
+				SIGNAL2(SIGQUIT, quitser);
 			}
-			SIGNAL2 (SIGPIPE, pipeser);
-			m_popen (moreproc);
+			SIGNAL2(SIGPIPE, pipeser);
+			m_popen(moreproc);
 			ontty = PITTY;
 		} else {
-			SIGNAL (SIGINT, SIG_IGN);
-			SIGNAL2 (SIGQUIT, quitser);
+			SIGNAL(SIGINT, SIG_IGN);
+			SIGNAL2(SIGQUIT, quitser);
 			ontty = ISTTY;
 		}
 	} else {
 		ontty = NOTTY;
 	}
 
-	mhl_format (form ? form : mhlformat, length, width);
+	mhl_format(form ? form : mhlformat, length, width);
 
 	if (vecp == 0) {
-		process (folder, NULL, 1, vecp = 1);
+		process(folder, NULL, 1, vecp = 1);
 	} else {
 		for (i = 0; i < vecp; i++)
-			process (folder, files[i], i + 1, vecp);
+			process(folder, files[i], i + 1, vecp);
 	}
 
 	if (forwall) {
 		if (digest) {
-			printf ("%s", delim4);
+			printf("%s", delim4);
 			if (volume == 0) {
-				snprintf (buf, sizeof(buf),
+				snprintf(buf, sizeof(buf),
 					"End of %s Digest\n", digest);
 			} else {
-				snprintf (buf, sizeof(buf),
-					"End of %s Digest [Volume %d Issue %d]\n",
-					digest, volume, issue);
+				snprintf(buf, sizeof(buf), "End of %s Digest [Volume %d Issue %d]\n", digest, volume, issue);
 			}
-			i = strlen (buf);
+			i = strlen(buf);
 			for (cp = buf + i; i > 1; i--)
 				*cp++ = '*';
 			*cp++ = '\n';
 			*cp = 0;
-			printf ("%s", buf);
+			printf("%s", buf);
 		} else
-			printf ("\n------- End of Forwarded Message%s\n\n",
+			printf("\n------- End of Forwarded Message%s\n\n",
 				vecp > 1 ? "s" : "");
 	}
 
@@ -485,17 +485,17 @@ mhl (int argc, char **argv)
 	}
 
 	if (clearflg > 0 && ontty == NOTTY)
-		clear_screen ();
+		clear_screen();
 
 	if (ontty == PITTY)
-		m_pclose ();
+		m_pclose();
 
 	return exitstat;
 }
 
 
 static void
-mhl_format (char *file, int length, int width)
+mhl_format(char *file, int length, int width)
 {
 	int i;
 	char *bp, *cp, **ip;
@@ -508,19 +508,19 @@ mhl_format (char *file, int length, int width)
 	static time_t mtime = 0;
 
 	if (fmthd != NULL) {
-		if (stat (etcpath (file), &st) != NOTOK
+		if (stat(etcpath(file), &st) != NOTOK
 			&& mtime == st.st_mtime
 			&& dev == st.st_dev
 			&& ino == st.st_ino)
 			goto out;
 		else
-			free_queue (&fmthd, &fmttl);
+			free_queue(&fmthd, &fmttl);
 	}
 
-	if ((fp = fopen (etcpath (file), "r")) == NULL)
-		adios (file, "unable to open format file");
+	if ((fp = fopen(etcpath(file), "r")) == NULL)
+		adios(file, "unable to open format file");
 
-	if (fstat (fileno (fp), &st) != NOTOK) {
+	if (fstat(fileno(fp), &st) != NOTOK) {
 		mtime = st.st_mtime;
 		dev = st.st_dev;
 		ino = st.st_ino;
@@ -530,15 +530,15 @@ mhl_format (char *file, int length, int width)
 	global.c_fmt = NULL;
 	global.c_offset = 0;
 	global.c_ovoff = -1;
-	if ((i = sc_width ()) > 5)
+	if ((i = sc_width()) > 5)
 		global.c_width = i;
 	global.c_cwidth = -1;
-	if ((i = sc_length ()) > 5)
+	if ((i = sc_length()) > 5)
 		global.c_length = i - 1;
 	global.c_flags = BELL;  /* BELL is default */
 	*(ip = ignores) = NULL;
 
-	while (vfgets (fp, &ap) == OK) {
+	while (vfgets(fp, &ap) == OK) {
 		bp = ap;
 		if (*bp == ';')
 			continue;
@@ -547,13 +547,14 @@ mhl_format (char *file, int length, int width)
 			*cp = 0;
 
 		if (*bp == ':') {
-			c1 = add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT);
+			c1 = add_queue(&fmthd, &fmttl, NULL, bp + 1,
+					CLEARTEXT);
 			continue;
 		}
 
 		parptr = bp;
-		strncpy (name, parse(), sizeof(name));
-		switch (*parptr) {
+		strncpy(name, parse(), sizeof(name));
+		switch(*parptr) {
 			case '\0':
 			case ',':
 			case '=':
@@ -562,12 +563,13 @@ mhl_format (char *file, int length, int width)
 				** and copy it to the end of the current
 				** "ignores" list.
 				*/
-				if (!mh_strcasecmp (name, "ignores")) {
+				if (!mh_strcasecmp(name, "ignores")) {
 					char **tmparray, **p;
 					int n = 0;
 
 					/* split the fields */
-					tmparray = brkstring (getcpy (++parptr), ",", NULL);
+					tmparray = brkstring(getcpy(++parptr),
+							",", NULL);
 
 					/* count number of fields split */
 					p = tmparray;
@@ -578,57 +580,54 @@ mhl_format (char *file, int length, int width)
 					** copy pointers to split fields
 					** to ignores array
 					*/
-					ip = copyip (tmparray, ip, MAXARGS - num_ignores);
+					ip = copyip(tmparray, ip,
+							MAXARGS - num_ignores);
 					num_ignores += n;
 					continue;
 				}
 				parptr = bp;
 				while (*parptr) {
-					if (evalvar (&global))
-						adios (NULL, "format file syntax error: %s", bp);
+					if (evalvar(&global))
+						adios(NULL, "format file syntax error: %s", bp);
 					if (*parptr)
 						parptr++;
 				}
 				continue;
 
 			case ':':
-				c1 = add_queue (&fmthd, &fmttl, name, NULL, INIT);
+				c1 = add_queue(&fmthd, &fmttl, name, NULL,
+						INIT);
 				while (*parptr == ':' || *parptr == ',') {
 					parptr++;
-					if (evalvar (c1))
-						adios (NULL, "format file syntax error: %s", bp);
+					if (evalvar(c1))
+						adios(NULL, "format file syntax error: %s", bp);
 				}
 				if (!c1->c_nfs && global.c_nfs) {
 					if (c1->c_flags & DATEFMT) {
 						if (global.c_flags & DATEFMT)
-							c1->c_nfs = getcpy (global.c_nfs);
+							c1->c_nfs = getcpy(global.c_nfs);
 					}
 					else
 						if (c1->c_flags & ADDRFMT) {
 							if (global.c_flags & ADDRFMT)
-								c1->c_nfs = getcpy (global.c_nfs);
+								c1->c_nfs = getcpy(global.c_nfs);
 						}
 				}
 				continue;
 
 			default:
-				adios (NULL, "format file syntax error: %s", bp);
+				adios(NULL, "format file syntax error: %s",
+						bp);
 		}
 	}
-	fclose (fp);
+	fclose(fp);
 
 	if (mhldebug) {
 		for (c1 = fmthd; c1; c1 = c1->c_next) {
-			fprintf (stderr, "c1: name=\"%s\" text=\"%s\" ovtxt=\"%s\"\n",
-					c1->c_name, c1->c_text, c1->c_ovtxt);
-			fprintf (stderr, "\tnfs=0x%x fmt=0x%x\n",
-					 (unsigned int)(unsigned long) c1->c_nfs,
-					 (unsigned int)(unsigned long) c1->c_fmt);
-			fprintf (stderr, "\toffset=%d ovoff=%d width=%d cwidth=%d length=%d\n",
-					c1->c_offset, c1->c_ovoff, c1->c_width,
-					c1->c_cwidth, c1->c_length);
-			fprintf (stderr, "\tflags=%s\n",
-					snprintb (buffer, sizeof(buffer), (unsigned) c1->c_flags, LBITS));
+			fprintf(stderr, "c1: name=\"%s\" text=\"%s\" ovtxt=\"%s\"\n", c1->c_name, c1->c_text, c1->c_ovtxt);
+			fprintf(stderr, "\tnfs=0x%x fmt=0x%x\n", (unsigned int)(unsigned long) c1->c_nfs, (unsigned int)(unsigned long) c1->c_fmt);
+			fprintf(stderr, "\toffset=%d ovoff=%d width=%d cwidth=%d length=%d\n", c1->c_offset, c1->c_ovoff, c1->c_width, c1->c_cwidth, c1->c_length);
+			fprintf (stderr, "\tflags=%s\n", snprintb(buffer, sizeof(buffer), (unsigned) c1->c_flags, LBITS));
 		}
 	}
 
@@ -661,60 +660,60 @@ out:
 
 
 static int
-evalvar (struct mcomp *c1)
+evalvar(struct mcomp *c1)
 {
 	char *cp, name[NAMESZ];
 	struct triple *ap;
 
 	if (!*parptr)
 		return 0;
-	strncpy (name, parse(), sizeof(name));
+	strncpy(name, parse(), sizeof(name));
 
-	if (!mh_strcasecmp (name, "component")) {
-		if (ptos (name, &c1->c_text))
+	if (!mh_strcasecmp(name, "component")) {
+		if (ptos(name, &c1->c_text))
 			return 1;
 		c1->c_flags &= ~NOCOMPONENT;
 		return 0;
 	}
 
-	if (!mh_strcasecmp (name, "overflowtext"))
-		return ptos (name, &c1->c_ovtxt);
+	if (!mh_strcasecmp(name, "overflowtext"))
+		return ptos(name, &c1->c_ovtxt);
 
-	if (!mh_strcasecmp (name, "formatfield")) {
+	if (!mh_strcasecmp(name, "formatfield")) {
 		char *nfs;
 
-		if (ptos (name, &cp))
+		if (ptos(name, &cp))
 			return 1;
-		nfs = new_fs (NULL, NULL, cp);
-		c1->c_nfs = getcpy (nfs);
+		nfs = new_fs(NULL, NULL, cp);
+		c1->c_nfs = getcpy(nfs);
 		c1->c_flags |= FORMAT;
 		return 0;
 	}
 
-	if (!mh_strcasecmp (name, "decode")) {
+	if (!mh_strcasecmp(name, "decode")) {
 		char *nfs;
 
-		nfs = new_fs (NULL, NULL, "%(decode{text})");
-		c1->c_nfs = getcpy (nfs);
+		nfs = new_fs(NULL, NULL, "%(decode{text})");
+		c1->c_nfs = getcpy(nfs);
 		c1->c_flags |= FORMAT;
 		return 0;
 	}
 
-	if (!mh_strcasecmp (name, "offset"))
-		return ptoi (name, &c1->c_offset);
-	if (!mh_strcasecmp (name, "overflowoffset"))
-		return ptoi (name, &c1->c_ovoff);
-	if (!mh_strcasecmp (name, "width"))
-		return ptoi (name, &c1->c_width);
-	if (!mh_strcasecmp (name, "compwidth"))
-		return ptoi (name, &c1->c_cwidth);
-	if (!mh_strcasecmp (name, "length"))
-		return ptoi (name, &c1->c_length);
-	if (!mh_strcasecmp (name, "nodashstuffing"))
+	if (!mh_strcasecmp(name, "offset"))
+		return ptoi(name, &c1->c_offset);
+	if (!mh_strcasecmp(name, "overflowoffset"))
+		return ptoi(name, &c1->c_ovoff);
+	if (!mh_strcasecmp(name, "width"))
+		return ptoi(name, &c1->c_width);
+	if (!mh_strcasecmp(name, "compwidth"))
+		return ptoi(name, &c1->c_cwidth);
+	if (!mh_strcasecmp(name, "length"))
+		return ptoi(name, &c1->c_length);
+	if (!mh_strcasecmp(name, "nodashstuffing"))
 		return (dashstuff = -1);
 
 	for (ap = triples; ap->t_name; ap++)
-		if (!mh_strcasecmp (ap->t_name, name)) {
+		if (!mh_strcasecmp(ap->t_name, name)) {
 			c1->c_flags |= ap->t_on;
 			c1->c_flags &= ~ap->t_off;
 			return 0;
@@ -725,33 +724,32 @@ evalvar (struct mcomp *c1)
 
 
 static int
-ptoi (char *name, int *i)
+ptoi(char *name, int *i)
 {
 	char *cp;
 
-	if (*parptr++ != '=' || !*(cp = parse ())) {
-		advise (NULL, "missing argument to variable %s", name);
+	if (*parptr++ != '=' || !*(cp = parse())) {
+		advise(NULL, "missing argument to variable %s", name);
 		return 1;
 	}
 
-	*i = atoi (cp);
+	*i = atoi(cp);
 	return 0;
 }
 
 
 static int
-ptos (char *name, char **s)
+ptos(char *name, char **s)
 {
 	char c, *cp;
 
 	if (*parptr++ != '=') {
-		advise (NULL, "missing argument to variable %s", name);
+		advise(NULL, "missing argument to variable %s", name);
 		return 1;
 	}
 
 	if (*parptr != '"') {
-		for (cp = parptr;
-				*parptr && *parptr != ':' && *parptr != ',';
+		for (cp = parptr; *parptr && *parptr != ':' && *parptr != ',';
 				parptr++)
 			continue;
 	} else {
@@ -762,7 +760,7 @@ ptos (char *name, char **s)
 	}
 	c = *parptr;
 	*parptr = 0;
-	*s = getcpy (cp);
+	*s = getcpy(cp);
 	if ((*parptr = c) == '"')
 		parptr++;
 	return 0;
@@ -770,7 +768,7 @@ ptos (char *name, char **s)
 
 
 static char *
-parse (void)
+parse(void)
 {
 	int c;
 	char *cp;
@@ -778,11 +776,11 @@ parse (void)
 
 	for (cp = result; *parptr && (cp - result < NAMESZ); parptr++) {
 		c = *parptr;
-		if (isalnum (c)
+		if (isalnum(c)
 				|| c == '.'
 				|| c == '-'
 				|| c == '_'
-				|| c =='['
+				|| c == '['
 				|| c == ']')
 			*cp++ = c;
 		else
@@ -795,18 +793,19 @@ parse (void)
 
 
 static void
-process (char *folder, char *fname, int ofilen, int ofilec)
+process(char *folder, char *fname, int ofilen, int ofilec)
 {
 	char *cp = NULL;
 	FILE *fp = NULL;
 	struct mcomp *c1;
 
-	switch (setjmp (env)) {
+	switch (setjmp(env)) {
 		case OK:
 			if (fname) {
-				fp = mhl_action ? (*mhl_action) (fname) : fopen (fname, "r");
+				fp = mhl_action ? (*mhl_action) (fname) :
+						fopen(fname, "r");
 				if (fp == NULL) {
-					advise (fname, "unable to open");
+					advise(fname, "unable to open");
 					exitstat++;
 					return;
 				}
@@ -814,22 +813,23 @@ process (char *folder, char *fname, int ofilen, int ofilec)
 				fname = "(stdin)";
 				fp = stdin;
 			}
-			cp = folder ? concat (folder, ":", fname, NULL) : getcpy (fname);
+			cp = folder ? concat(folder, ":", fname, NULL) :
+					getcpy(fname);
 			if (ontty != PITTY)
-				SIGNAL (SIGINT, intrser);
-			mhlfile (fp, cp, ofilen, ofilec);  /* FALL THROUGH! */
+				SIGNAL(SIGINT, intrser);
+			mhlfile(fp, cp, ofilen, ofilec);  /* FALL THROUGH! */
 
 		default:
 			if (ontty != PITTY)
-				SIGNAL (SIGINT, SIG_IGN);
+				SIGNAL(SIGINT, SIG_IGN);
 			if (mhl_action == NULL && fp != stdin)
-				fclose (fp);
-			free (cp);
+				fclose(fp);
+			free(cp);
 			if (holder.c_text) {
-				free (holder.c_text);
+				free(holder.c_text);
 				holder.c_text = NULL;
 			}
-			free_queue (&msghd, &msgtl);
+			free_queue(&msghd, &msgtl);
 			for (c1 = fmthd; c1; c1 = c1->c_next)
 				c1->c_flags &= ~HDROUTPUT;
 			break;
@@ -838,7 +838,7 @@ process (char *folder, char *fname, int ofilen, int ofilec)
 
 
 static void
-mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
+mhlfile(FILE *fp, char *mname, int ofilen, int ofilec)
 {
 	int state;
 	struct mcomp *c1, *c2, *c3;
@@ -846,14 +846,15 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 
 	if (forwall) {
 		if (digest)
-			printf ("%s", ofilen == 1 ? delim3 : delim4);
+			printf("%s", ofilen == 1 ? delim3 : delim4);
 		else {
-			printf ("\n-------");
+			printf("\n-------");
 			if (ofilen == 1)
-				printf (" Forwarded Message%s", ofilec > 1 ? "s" : "");
+				printf(" Forwarded Message%s",
+						ofilec > 1 ? "s" : "");
 			else
-				printf (" Message %d", ofilen);
-			printf ("\n\n");
+				printf(" Message %d", ofilen);
+			printf("\n\n");
 		}
 	} else {
 		switch (ontty) {
@@ -861,76 +862,75 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 				if (ofilec > 1) {
 					if (ofilen > 1) {
 						if ((global.c_flags & CLEARSCR))
-							clear_screen ();
+							clear_screen();
 						else
-							printf ("\n\n\n");
+							printf("\n\n\n");
 					}
-					printf (">>> %s\n\n", mname);
+					printf(">>> %s\n\n", mname);
 				}
 				break;
 
 			case ISTTY:
-				strncpy (buf, "\n", sizeof(buf));
+				strncpy(buf, "\n", sizeof(buf));
 				if (ofilec > 1) {
-					if (SOprintf ("Press <return> to list \"%s\"...", mname)) {
+					if (SOprintf("Press <return> to list \"%s\"...", mname)) {
 						if (ofilen > 1)
-							printf ("\n\n\n");
-						printf ("Press <return> to list \"%s\"...", mname);
+							printf("\n\n\n");
+						printf("Press <return> to list \"%s\"...", mname);
 					}
-					fflush (stdout);
+					fflush(stdout);
 					buf[0] = 0;
-					read (fileno (stdout), buf, sizeof(buf));
+					read(fileno(stdout), buf, sizeof(buf));
 				}
 				if (strchr(buf, '\n')) {
 					if ((global.c_flags & CLEARSCR))
-						clear_screen ();
+						clear_screen();
 				}
 				else
-					printf ("\n");
+					printf("\n");
 				break;
 
 			default:
 				if (ofilec > 1) {
 					if (ofilen > 1) {
-						printf ("\n\n\n");
+						printf("\n\n\n");
 						if (clearflg > 0)
-							clear_screen ();
+							clear_screen();
 					}
-					printf (">>> %s\n\n", mname);
+					printf(">>> %s\n\n", mname);
 				}
 				break;
 		}
 	}
 
 	for (state = FLD;;) {
-		switch (state = m_getfld (state, name, buf, sizeof(buf), fp)) {
+		switch (state = m_getfld(state, name, buf, sizeof(buf), fp)) {
 			case FLD:
 			case FLDPLUS:
 				for (ip = ignores; *ip; ip++)
-					if (!mh_strcasecmp (name, *ip)) {
+					if (!mh_strcasecmp(name, *ip)) {
 						while (state == FLDPLUS)
-							state = m_getfld (state, name, buf, sizeof(buf), fp);
+							state = m_getfld(state, name, buf, sizeof(buf), fp);
 						break;
 					}
 				if (*ip)
 					continue;
 
 				for (c2 = fmthd; c2; c2 = c2->c_next)
-					if (!mh_strcasecmp (c2->c_name, name))
+					if (!mh_strcasecmp(c2->c_name, name))
 						break;
 				c1 = NULL;
 				if (!((c3 = c2 ? c2 : &global)->c_flags & SPLIT))
 					for (c1 = msghd; c1; c1 = c1->c_next)
-						if (!mh_strcasecmp (c1->c_name, c3->c_name)) {
-							c1->c_text =
-								mcomp_add (c1->c_flags, buf, c1->c_text);
+						if (!mh_strcasecmp(c1->c_name, c3->c_name)) {
+							c1->c_text = mcomp_add (c1->c_flags, buf, c1->c_text);
 							break;
 						}
 				if (c1 == NULL)
-					c1 = add_queue (&msghd, &msgtl, name, buf, 0);
+					c1 = add_queue(&msghd, &msgtl, name, buf, 0);
 				while (state == FLDPLUS) {
-					state = m_getfld (state, name, buf, sizeof(buf), fp);
-					c1->c_text = add (buf, c1->c_text);
+					state = m_getfld(state, name, buf, sizeof(buf), fp);
+					c1->c_text = add(buf, c1->c_text);
 				}
 				if (c2 == NULL)
 					c1->c_flags |= EXTRA;
@@ -941,38 +941,37 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 				row = column = 0;
 				for (c1 = fmthd; c1; c1 = c1->c_next) {
 					if (c1->c_flags & CLEARTEXT) {
-						putcomp (c1, c1, ONECOMP);
+						putcomp(c1, c1, ONECOMP);
 						continue;
 					}
-					if (!mh_strcasecmp (c1->c_name, "messagename")) {
-						holder.c_text = concat ("(Message ", mname, ")\n",
+					if (!mh_strcasecmp(c1->c_name, "messagename")) {
+						holder.c_text = concat("(Message ", mname, ")\n",
 											NULL);
-						putcomp (c1, &holder, ONECOMP);
-						free (holder.c_text);
+						putcomp(c1, &holder, ONECOMP);
+						free(holder.c_text);
 						holder.c_text = NULL;
 						continue;
 					}
-					if (!mh_strcasecmp (c1->c_name, "extras")) {
+					if (!mh_strcasecmp(c1->c_name, "extras")) {
 						for (c2 = msghd; c2; c2 = c2->c_next)
 							if (c2->c_flags & EXTRA)
-								putcomp (c1, c2, TWOCOMP);
+								putcomp(c1, c2, TWOCOMP);
 						continue;
 					}
-					if (dobody && !mh_strcasecmp (c1->c_name, "body")) {
-						holder.c_text = mh_xmalloc (sizeof(buf));
-						strncpy (holder.c_text, buf, sizeof(buf));
+					if (dobody && !mh_strcasecmp(c1->c_name, "body")) {
+						holder.c_text = mh_xmalloc(sizeof(buf));
+						strncpy(holder.c_text, buf, sizeof(buf));
 						while (state == BODY) {
-							putcomp (c1, &holder, BODYCOMP);
-							state = m_getfld (state, name, holder.c_text,
-										sizeof(buf), fp);
+							putcomp(c1, &holder, BODYCOMP);
+							state = m_getfld(state, name, holder.c_text, sizeof(buf), fp);
 						}
-						free (holder.c_text);
+						free(holder.c_text);
 						holder.c_text = NULL;
 						continue;
 					}
 					for (c2 = msghd; c2; c2 = c2->c_next)
-						if (!mh_strcasecmp (c2->c_name, c1->c_name)) {
-							putcomp (c1, c2, ONECOMP);
+						if (!mh_strcasecmp(c2->c_name, c1->c_name)) {
+							putcomp(c1, c2, ONECOMP);
 							if (!(c1->c_flags & SPLIT))
 								break;
 						}
@@ -980,9 +979,9 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 						for (c2 = msghd; c2; c2 = c2->c_next)
 							if (c2->c_flags & FACEDFLT) {
 								if (c2->c_face == NULL)
-									face_format (c2);
+									face_format(c2);
 								if ((holder.c_text = c2->c_face)) {
-									putcomp (c1, &holder, ONECOMP);
+									putcomp(c1, &holder, ONECOMP);
 									holder.c_text = NULL;
 								}
 								break;
@@ -992,24 +991,25 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 
 			case LENERR:
 			case FMTERR:
-				advise (NULL, "format error in message %s", mname);
+				advise(NULL, "format error in message %s",
+						mname);
 				exitstat++;
 				return;
 
 			default:
-				adios (NULL, "getfld() returned %d", state);
+				adios(NULL, "getfld() returned %d", state);
 		}
 	}
 }
 
 
 static int
-mcomp_flags (char *name)
+mcomp_flags(char *name)
 {
 	struct pair *ap;
 
 	for (ap = pairs; ap->p_name; ap++)
-		if (!mh_strcasecmp (ap->p_name, name))
+		if (!mh_strcasecmp(ap->p_name, name))
 			return (ap->p_flags);
 
 	return 0;
@@ -1017,17 +1017,17 @@ mcomp_flags (char *name)
 
 
 static char *
-mcomp_add (long flags, char *s1, char *s2)
+mcomp_add(long flags, char *s1, char *s2)
 {
 	char *dp;
 
 	if (!(flags & ADDRFMT))
-		return add (s1, s2);
+		return add(s1, s2);
 
-	if (s2 && *(dp = s2 + strlen (s2) - 1) == '\n')
+	if (s2 && *(dp = s2 + strlen(s2) - 1) == '\n')
 		*dp = 0;
 
-	return add (s1, add (",\n", s2));
+	return add(s1, add(",\n", s2));
 }
 
 
@@ -1039,7 +1039,7 @@ struct pqpair {
 
 
 static void
-mcomp_format (struct mcomp *c1, struct mcomp *c2)
+mcomp_format(struct mcomp *c1, struct mcomp *c2)
 {
 	int dat[5];
 	char *ap, *cp;
@@ -1056,93 +1056,94 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 	dat[2] = 0;
 	dat[3] = sizeof(buffer) - 1;
 	dat[4] = 0;
-	fmt_compile (c1->c_nfs, &c1->c_fmt);
+	fmt_compile(c1->c_nfs, &c1->c_fmt);
 
 	if (!(c1->c_flags & ADDRFMT)) {
-		FINDCOMP (cptr, "text");
+		FINDCOMP(cptr, "text");
 		if (cptr)
 			cptr->c_text = ap;
 		if ((cp = strrchr(ap, '\n')))  /* drop ending newline */
 			if (!cp[1])
 				*cp = 0;
 
-		fmt_scan (c1->c_fmt, buffer, sizeof(buffer) - 1, dat);
+		fmt_scan(c1->c_fmt, buffer, sizeof(buffer) - 1, dat);
 		/* Don't need to append a newline, dctime() already did */
-		c2->c_text = getcpy (buffer);
+		c2->c_text = getcpy(buffer);
 
-		free (ap);
+		free(ap);
 		return;
 	}
 
 	(q = &pq)->pq_next = NULL;
-	while ((cp = getname (ap))) {
-		if ((p = (struct pqpair *) calloc ((size_t) 1, sizeof(*p))) == NULL)
-			adios (NULL, "unable to allocate pqpair memory");
-
-		if ((mp = getm (cp, NULL, 0, AD_NAME, error)) == NULL) {
-			p->pq_text = getcpy (cp);
-			p->pq_error = getcpy (error);
+	while ((cp = getname(ap))) {
+		if ((p = (struct pqpair *)
+				calloc((size_t) 1, sizeof(*p))) == NULL)
+			adios(NULL, "unable to allocate pqpair memory");
+
+		if ((mp = getm(cp, NULL, 0, AD_NAME, error)) == NULL) {
+			p->pq_text = getcpy(cp);
+			p->pq_error = getcpy(error);
 		} else {
 			if ((c1->c_flags & FACEDFLT) && c2->c_face == NULL) {
 				char   *h, *o;
 				if ((h = mp->m_host) == NULL)
-					h = LocalName ();
-				if ((o = OfficialName (h)))
+					h = LocalName();
+				if ((o = OfficialName(h)))
 					h = o;
-				c2->c_face = concat ("address ", h, " ",
-					mp->m_mbox, NULL);
+				c2->c_face = concat("address ", h, " ",
+						mp->m_mbox, NULL);
 			}
-			p->pq_text = getcpy (mp->m_text);
-			mnfree (mp);
+			p->pq_text = getcpy(mp->m_text);
+			mnfree(mp);
 		}
 		q = (q->pq_next = p);
 	}
 
 	for (p = pq.pq_next; p; p = q) {
-		FINDCOMP (cptr, "text");
+		FINDCOMP(cptr, "text");
 		if (cptr)
 			cptr->c_text = p->pq_text;
-		FINDCOMP (cptr, "error");
+		FINDCOMP(cptr, "error");
 		if (cptr)
 			cptr->c_text = p->pq_error;
 
-		fmt_scan (c1->c_fmt, buffer, sizeof(buffer) - 1, dat);
+		fmt_scan(c1->c_fmt, buffer, sizeof(buffer) - 1, dat);
 		if (*buffer) {
 			if (c2->c_text)
-				c2->c_text = add (",\n", c2->c_text);
-			if (*(cp = buffer + strlen (buffer) - 1) == '\n')
+				c2->c_text = add(",\n", c2->c_text);
+			if (*(cp = buffer + strlen(buffer) - 1) == '\n')
 				*cp = 0;
-			c2->c_text = add (buffer, c2->c_text);
+			c2->c_text = add(buffer, c2->c_text);
 		}
 
-		free (p->pq_text);
+		free(p->pq_text);
 		if (p->pq_error)
-			free (p->pq_error);
+			free(p->pq_error);
 		q = p->pq_next;
-		free ((char *) p);
+		free((char *) p);
 	}
 
-	c2->c_text = add ("\n", c2->c_text);
+	c2->c_text = add("\n", c2->c_text);
 	free (ap);
 }
 
 
 static struct mcomp *
-add_queue (struct mcomp **head, struct mcomp **tail, char *name,
-	char *text, int flags)
+add_queue(struct mcomp **head, struct mcomp **tail, char *name,
+		char *text, int flags)
 {
 	struct mcomp *c1;
 
-	if ((c1 = (struct mcomp *) calloc ((size_t) 1, sizeof(*c1))) == NULL)
-		adios (NULL, "unable to allocate comp memory");
+	if ((c1 = (struct mcomp *) calloc((size_t) 1, sizeof(*c1))) == NULL)
+		adios(NULL, "unable to allocate comp memory");
 
 	c1->c_flags = flags & ~INIT;
-	if ((c1->c_name = name ? getcpy (name) : NULL))
-		c1->c_flags |= mcomp_flags (c1->c_name);
-	c1->c_text = text ? getcpy (text) : NULL;
+	if ((c1->c_name = name ? getcpy(name) : NULL))
+		c1->c_flags |= mcomp_flags(c1->c_name);
+	c1->c_text = text ? getcpy(text) : NULL;
 	if (flags & INIT) {
 		if (global.c_ovtxt)
-			c1->c_ovtxt = getcpy (global.c_ovtxt);
+			c1->c_ovtxt = getcpy(global.c_ovtxt);
 		c1->c_offset = global.c_offset;
 		c1->c_ovoff = global. c_ovoff;
 		c1->c_width = c1->c_length = 0;
@@ -1160,25 +1161,25 @@ add_queue (struct mcomp **head, struct mcomp **tail, char *name,
 
 
 static void
-free_queue (struct mcomp **head, struct mcomp **tail)
+free_queue(struct mcomp **head, struct mcomp **tail)
 {
 	struct mcomp *c1, *c2;
 
 	for (c1 = *head; c1; c1 = c2) {
 		c2 = c1->c_next;
 		if (c1->c_name)
-			free (c1->c_name);
+			free(c1->c_name);
 		if (c1->c_text)
-			free (c1->c_text);
+			free(c1->c_text);
 		if (c1->c_ovtxt)
-			free (c1->c_ovtxt);
+			free(c1->c_ovtxt);
 		if (c1->c_nfs)
-			free (c1->c_nfs);
+			free(c1->c_nfs);
 		if (c1->c_fmt)
-			free ((char *) c1->c_fmt);
+			free((char *) c1->c_fmt);
 		if (c1->c_face)
-			free (c1->c_face);
-		free ((char *) c1);
+			free(c1->c_face);
+		free((char *) c1);
 	}
 
 	*head = *tail = NULL;
@@ -1186,7 +1187,7 @@ free_queue (struct mcomp **head, struct mcomp **tail)
 
 
 static void
-putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
+putcomp(struct mcomp *c1, struct mcomp *c2, int flag)
 {
 	int count, cchdr;
 	unsigned char *cp;
@@ -1196,22 +1197,21 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	llim = c1->c_length ? c1->c_length : -1;
 	wid = c1->c_width ? c1->c_width : global.c_width;
 	ovoff = (c1->c_ovoff >= 0 ? c1->c_ovoff : global.c_ovoff)
-		+ c1->c_offset;
+			+ c1->c_offset;
 	if ((ovtxt = c1->c_ovtxt ? c1->c_ovtxt : global.c_ovtxt) == NULL)
 		ovtxt = "";
-	if (wid < ovoff + strlen (ovtxt) + 5)
-		adios (NULL, "component: %s width(%d) too small for overflow(%d)",
-			c1->c_name, wid, ovoff + strlen (ovtxt) + 5);
+	if (wid < ovoff + strlen(ovtxt) + 5)
+		adios(NULL, "component: %s width(%d) too small for overflow(%d)", c1->c_name, wid, ovoff + strlen(ovtxt) + 5);
 	onelp = NULL;
 
 	if (c1->c_flags & CLEARTEXT) {
-		putstr (c1->c_text);
-		putstr ("\n");
+		putstr(c1->c_text);
+		putstr("\n");
 		return;
 	}
 
 	if (c1->c_flags & FACEFMT)
-		switch (doface (c2)) {
+		switch (doface(c2)) {
 			case NOTOK:  /* error */
 			case OK:  /* async faceproc */
 				return;
@@ -1221,13 +1221,14 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 		}
 
 	if (c1->c_nfs && (c1->c_flags & (ADDRFMT | DATEFMT | FORMAT)))
-		mcomp_format (c1, c2);
+		mcomp_format(c1, c2);
 
 	if (c1->c_flags & CENTER) {
 		count = (c1->c_width ? c1->c_width : global.c_width)
-			- c1->c_offset - strlen (c2->c_text);
+				- c1->c_offset - strlen(c2->c_text);
 		if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT))
-			count -= strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;
+			count -= strlen(c1->c_text ? c1->c_text : c1->c_name)
+					+ 2;
 		lm = c1->c_offset + (count / 2);
 	} else {
 		if (c1->c_offset)
@@ -1237,19 +1238,19 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT)) {
 		if (c1->c_flags & UPPERCASE)  /* uppercase component also */
 			for (cp = (c1->c_text ? c1->c_text : c1->c_name); *cp; cp++)
-				if (islower (*cp))
-					*cp = toupper (*cp);
-		putstr (c1->c_text ? c1->c_text : c1->c_name);
+				if (islower(*cp))
+					*cp = toupper(*cp);
+		putstr(c1->c_text ? c1->c_text : c1->c_name);
 		if (flag != BODYCOMP) {
-			putstr (": ");
+			putstr(": ");
 			if (!(c1->c_flags & SPLIT))
 				c1->c_flags |= HDROUTPUT;
 
 		cchdr++;
 		if ((count = c1->c_cwidth -
-			strlen (c1->c_text ? c1->c_text : c1->c_name) - 2) > 0)
+			strlen(c1->c_text ? c1->c_text : c1->c_name) - 2) > 0)
 			while (count--)
-				putstr (" ");
+				putstr(" ");
 		} else
 			c1->c_flags |= HDROUTPUT;  /* for BODYCOMP */
 	}
@@ -1258,46 +1259,47 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 		&& !(c2->c_flags & NOCOMPONENT)) {
 		if (c1->c_flags & UPPERCASE)
 			for (cp = c2->c_name; *cp; cp++)
-				if (islower (*cp))
-					*cp = toupper (*cp);
-		putstr (c2->c_name);
-		putstr (": ");
+				if (islower(*cp))
+					*cp = toupper(*cp);
+		putstr(c2->c_name);
+		putstr(": ");
 		if (!(c1->c_flags & SPLIT))
 			c2->c_flags |= HDROUTPUT;
 
 		cchdr++;
-		if ((count = c1->c_cwidth - strlen (c2->c_name) - 2) > 0)
+		if ((count = c1->c_cwidth - strlen(c2->c_name) - 2) > 0)
 			while (count--)
-				putstr (" ");
+				putstr(" ");
 	}
 	if (c1->c_flags & UPPERCASE)
 		for (cp = c2->c_text; *cp; cp++)
-			if (islower (*cp))
-				*cp = toupper (*cp);
+			if (islower(*cp))
+				*cp = toupper(*cp);
 
 	count = 0;
 	if (cchdr) {
 		if (flag == TWOCOMP)
-			count = (c1->c_cwidth >= 0) ? c1->c_cwidth
-				: strlen (c2->c_name) + 2;
+			count = (c1->c_cwidth >= 0) ?
+					c1->c_cwidth : strlen(c2->c_name) + 2;
 		else
-			count = (c1->c_cwidth >= 0) ? c1->c_cwidth
-				: strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;
+			count = (c1->c_cwidth >= 0) ?
+					c1->c_cwidth : strlen(c1->c_text ?
+					c1->c_text : c1->c_name) + 2;
 	}
 	count += c1->c_offset;
 
-	if ((cp = oneline (c2->c_text, c1->c_flags)))
+	if ((cp = oneline(c2->c_text, c1->c_flags)))
 	   putstr(cp);
 	if (term == '\n')
-		putstr ("\n");
-	while ((cp = oneline (c2->c_text, c1->c_flags))) {
+		putstr("\n");
+	while ((cp = oneline(c2->c_text, c1->c_flags))) {
 		lm = count;
 		if (flag == BODYCOMP && !(c1->c_flags & NOCOMPONENT))
-			putstr (c1->c_text ? c1->c_text : c1->c_name);
+			putstr(c1->c_text ? c1->c_text : c1->c_name);
 		if (*cp)
-			putstr (cp);
+			putstr(cp);
 		if (term == '\n')
-			putstr ("\n");
+			putstr("\n");
 	}
 	if (flag == BODYCOMP && term == '\n')
 		c1->c_flags &= ~HDROUTPUT;  /* Buffer ended on a newline */
@@ -1305,7 +1307,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 
 
 static char *
-oneline (char *stuff, long flags)
+oneline(char *stuff, long flags)
 {
 	int spc;
 	char *cp, *ret;
@@ -1319,8 +1321,10 @@ oneline (char *stuff, long flags)
 	term = 0;
 	if (flags & COMPRESS) {
 		for (spc = 1, cp = ret; *onelp; onelp++)
-			if (isspace (*onelp)) {
-				if (*onelp == '\n' && (!onelp[1] || (flags & ADDRFMT))) {
+			if (isspace(*onelp)) {
+				if (*onelp == '\n' &&
+						(!onelp[1] ||
+						(flags & ADDRFMT))) {
 					term = '\n';
 					*onelp++ = 0;
 					break;
@@ -1353,26 +1357,26 @@ oneline (char *stuff, long flags)
 
 
 static void
-putstr (char *string)
+putstr(char *string)
 {
 	if (!column && lm > 0) {
 		while (lm > 0)
 			if (lm >= 8) {
-				putch ('\t');
+				putch('\t');
 				lm -= 8;
 			} else {
-				putch (' ');
+				putch(' ');
 				lm--;
 			}
 	}
 	lm = 0;
 	while (*string)
-		putch (*string++);
+		putch(*string++);
 }
 
 
 static void
-putch (char ch)
+putch(char ch)
 {
 	char buf[BUFSIZ];
 
@@ -1388,16 +1392,16 @@ putch (char ch)
 			if (ontty != ISTTY || row != global.c_length)
 				break;
 			if (global.c_flags & BELL)
-				putchar ('\007');
-			fflush (stdout);
+				putchar('\007');
+			fflush(stdout);
 			buf[0] = 0;
-			read (fileno (stdout), buf, sizeof(buf));
+			read(fileno(stdout), buf, sizeof(buf));
 			if (strchr(buf, '\n')) {
 				if (global.c_flags & CLEARSCR)
-					clear_screen ();
+					clear_screen();
 				row = 0;
 			} else {
-				putchar ('\n');
+				putchar('\n');
 				row = global.c_length / 3;
 			}
 			return;
@@ -1421,8 +1425,8 @@ putch (char ch)
 			** column contains a dash, then add a dash and a space.
 			*/
 			if (column == 0 && forwflg && (dashstuff >= 0) && ch == '-') {
-				putchar ('-');
-				putchar (' ');
+				putchar('-');
+				putchar(' ');
 			}
 			if (ch >= ' ')
 				column++;
@@ -1430,57 +1434,57 @@ putch (char ch)
 	}
 
 	if (column >= wid) {
-		putch ('\n');
+		putch('\n');
 		if (ovoff > 0)
 			lm = ovoff;
-		putstr (ovtxt ? ovtxt : "");
-		putch (ch);
+		putstr(ovtxt ? ovtxt : "");
+		putch(ch);
 		return;
 	}
 
-	putchar (ch);
+	putchar(ch);
 }
 
 
 static RETSIGTYPE
-intrser (int i)
+intrser(int i)
 {
 #ifndef RELIABLE_SIGNALS
-	SIGNAL (SIGINT, intrser);
+	SIGNAL(SIGINT, intrser);
 #endif
 
-	discard (stdout);
-	putchar ('\n');
-	longjmp (env, DONE);
+	discard(stdout);
+	putchar('\n');
+	longjmp(env, DONE);
 }
 
 
 static RETSIGTYPE
-pipeser (int i)
+pipeser(int i)
 {
 #ifndef RELIABLE_SIGNALS
-	SIGNAL (SIGPIPE, pipeser);
+	SIGNAL(SIGPIPE, pipeser);
 #endif
 
-	done (NOTOK);
+	done(NOTOK);
 }
 
 
 static RETSIGTYPE
-quitser (int i)
+quitser(int i)
 {
 #ifndef RELIABLE_SIGNALS
-	SIGNAL (SIGQUIT, quitser);
+	SIGNAL(SIGQUIT, quitser);
 #endif
 
-	putchar ('\n');
-	fflush (stdout);
-	done (NOTOK);
+	putchar('\n');
+	fflush(stdout);
+	done(NOTOK);
 }
 
 
 static void
-face_format (struct mcomp *c1)
+face_format(struct mcomp *c1)
 {
 	char *cp;
 	struct mailname *mp;
@@ -1488,17 +1492,18 @@ face_format (struct mcomp *c1)
 	if ((cp = c1->c_text) == NULL)
 		return;
 
-	if ((cp = getname (cp))) {
-		if ((mp = getm (cp, NULL, 0, AD_NAME, NULL))) {
+	if ((cp = getname(cp))) {
+		if ((mp = getm(cp, NULL, 0, AD_NAME, NULL))) {
 			char *h, *o;
 			if ((h = mp->m_host) == NULL)
-				h = LocalName ();
-			if ((o = OfficialName (h)))
+				h = LocalName();
+			if ((o = OfficialName(h)))
 				h = o;
-			c1->c_face = concat ("address ", h, " ", mp->m_mbox, NULL);
+			c1->c_face = concat("address ", h, " ", mp->m_mbox,
+					NULL);
 		}
 
-		while ((cp = getname (cp)))
+		while ((cp = getname(cp)))
 			continue;
 	}
 }
@@ -1519,7 +1524,7 @@ face_format (struct mcomp *c1)
 #endif
 
 static int
-doface (struct mcomp *c1)
+doface(struct mcomp *c1)
 {
 	int result, sd;
 	static int inited = OK;
@@ -1530,12 +1535,12 @@ doface (struct mcomp *c1)
 
 	if (inited == OK) {
 		char *cp;
-		char **ap = brkstring (cp = getcpy (faceproc), " ", "\n");
+		char **ap = brkstring(cp = getcpy(faceproc), " ", "\n");
 		struct addrinfo hints, *res;
 
 		if (ap[0] == NULL || ap[1] == NULL) {
 bad_faceproc: ;
-			free (cp);
+			free(cp);
 			return (inited = NOTOK);
 		}
 
@@ -1560,13 +1565,13 @@ bad_faceproc: ;
 	if (inited == NOTOK)
 		return NOTOK;
 
-	if ((sd = socket (ss.ss_family, socktype, protocol)) == NOTOK)
+	if ((sd = socket(ss.ss_family, socktype, protocol)) == NOTOK)
 		return NOTOK;
 
-	result = sendto (sd, c1->c_text, strlen (c1->c_text), 0,
-		(struct sockaddr *) &ss, socklen);
+	result = sendto(sd, c1->c_text, strlen(c1->c_text), 0,
+			(struct sockaddr *) &ss, socklen);
 
-	close (sd);
+	close(sd);
 
 	return (result != NOTOK ? OK : NOTOK);
 }
@@ -1578,7 +1583,7 @@ bad_faceproc: ;
 #if 0
 
 static int
-doface (struct mcomp *c1)
+doface(struct mcomp *c1)
 {
 	int i, len, vecp;
 	pid_t child_id;
@@ -1586,16 +1591,16 @@ doface (struct mcomp *c1)
 	char *bp, *cp;
 	char buffer[BUFSIZ], *vec[10];
 
-	if (pipe (pdi) == NOTOK)
+	if (pipe(pdi) == NOTOK)
 		return NOTOK;
-	if (pipe (pdo) == NOTOK) {
-		close (pdi[0]);
-		close (pdi[1]);
+	if (pipe(pdo) == NOTOK) {
+		close(pdi[0]);
+		close(pdi[1]);
 		return NOTOK;
 	}
 
 	for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
-		sleep (5);
+		sleep(5);
 
 	switch (child_id) {
 		case NOTOK:
@@ -1604,71 +1609,73 @@ doface (struct mcomp *c1)
 
 		case OK:
 			/* child process */
-			SIGNAL (SIGINT, SIG_IGN);
-			SIGNAL (SIGQUIT, SIG_IGN);
-			if (pdi[0] != fileno (stdin)) {
-				dup2 (pdi[0], fileno (stdin));
-				close (pdi[0]);
+			SIGNAL(SIGINT, SIG_IGN);
+			SIGNAL(SIGQUIT, SIG_IGN);
+			if (pdi[0] != fileno(stdin)) {
+				dup2(pdi[0], fileno(stdin));
+				close(pdi[0]);
 			}
-			close (pdi[1]);
-			close (pdo[0]);
-			if (pdo[1] != fileno (stdout)) {
-				dup2 (pdo[1], fileno (stdout));
-				close (pdo[1]);
+			close(pdi[1]);
+			close(pdo[0]);
+			if (pdo[1] != fileno(stdout)) {
+				dup2(pdo[1], fileno(stdout));
+				close(pdo[1]);
 			}
 			vecp = 0;
-			vec[vecp++] = r1bindex (faceproc, '/');
+			vec[vecp++] = r1bindex(faceproc, '/');
 			vec[vecp++] = "-e";
 			if (sleepsw != NOTOK) {
 				vec[vecp++] = "-s";
-				snprintf (buffer, sizeof(buffer), "%d", sleepsw);
+				snprintf(buffer, sizeof(buffer), "%d",
+						sleepsw);
 				vec[vecp++] = buffer;
 			}
 			vec[vecp] = NULL;
-			execvp (faceproc, vec);
-			fprintf (stderr, "unable to exec ");
-			perror (faceproc);
-			_exit (-1);  /* NOTREACHED */
+			execvp(faceproc, vec);
+			fprintf(stderr, "unable to exec ");
+			perror(faceproc);
+			_exit(-1);  /* NOTREACHED */
 
 		default:
 			/* parent process */
-			close (pdi[0]);
-			i = strlen (c1->c_text);
-			if (write (pdi[1], c1->c_text, i) != i)
-				adios ("pipe", "error writing to");
-			free (c1->c_text), c1->c_text = NULL;
-			close (pdi[1]);
-
-			close (pdo[1]);
+			close(pdi[0]);
+			i = strlen(c1->c_text);
+			if (write(pdi[1], c1->c_text, i) != i)
+				adios("pipe", "error writing to");
+			free(c1->c_text), c1->c_text = NULL;
+			close(pdi[1]);
+
+			close(pdo[1]);
 			cp = NULL, len = 0;
 			result = DONE;
-			while ((i = read (pdo[0], buffer, strlen (buffer))) > 0) {
+			while ((i=read(pdo[0], buffer, strlen(buffer))) > 0) {
 				if (cp) {
 					int j;
 					char *dp;
-					dp = mh_xrealloc (cp, (unsigned) (j = len + i));
+					dp = mh_xrealloc(cp, (unsigned) (j = len + i));
 					memcpy(dp + len, buffer, i);
 					cp = dp, len = j;
 				} else {
-					cp = mh_xmalloc ((unsigned) i);
+					cp = mh_xmalloc((unsigned) i);
 					memcpy(cp, buffer, i);
 					len = i;
 				}
 				if (result == DONE)
 					for (bp = buffer + i - 1; bp >= buffer; bp--)
-						if (!isascii (*bp) || iscntrl (*bp)) {
+						if (!isascii(*bp) ||
+								iscntrl(*bp)) {
 							result = OK;
 							break;
 						}
 			}
-			close (pdo[0]);
+			close(pdo[0]);
 
 /* no waiting for child... */
 
 			if (result == OK) {  /* binary */
-				if (write (1, cp, len) != len)
-					adios ("writing", "error");
-				free (cp);
+				if (write(1, cp, len) != len)
+					adios("writing", "error");
+				free(cp);
 			}
 			else  /* empty */
 				if ((c1->c_text = cp) == NULL)
@@ -1682,13 +1689,13 @@ doface (struct mcomp *c1)
 
 
 int
-mhlsbr (int argc, char **argv, FILE *(*action)())
+mhlsbr(int argc, char **argv, FILE *(*action)())
 {
 	SIGNAL_HANDLER istat = NULL, pstat = NULL, qstat = NULL;
 	char *cp = NULL;
 	struct mcomp *c1;
 
-	switch (setjmp (mhlenv)) {
+	switch (setjmp(mhlenv)) {
 		case OK:
 			cp = invo_name;
 			sleepsw = 0;  /* XXX */
@@ -1701,29 +1708,29 @@ mhlsbr (int argc, char **argv, FILE *(*action)())
 			** If signal is at default action, then start ignoring
 			** it, else let it set to its current action.
 			*/
-			if ((istat = SIGNAL (SIGINT, SIG_IGN)) != SIG_DFL)
-				SIGNAL (SIGINT, istat);
-			if ((qstat = SIGNAL (SIGQUIT, SIG_IGN)) != SIG_DFL)
-				SIGNAL (SIGQUIT, qstat);
-			pstat = SIGNAL (SIGPIPE, pipeser);
-			mhl (argc, argv);  /* FALL THROUGH! */
+			if ((istat = SIGNAL(SIGINT, SIG_IGN)) != SIG_DFL)
+				SIGNAL(SIGINT, istat);
+			if ((qstat = SIGNAL(SIGQUIT, SIG_IGN)) != SIG_DFL)
+				SIGNAL(SIGQUIT, qstat);
+			pstat = SIGNAL(SIGPIPE, pipeser);
+			mhl(argc, argv);  /* FALL THROUGH! */
 
 		default:
-			SIGNAL (SIGINT, istat);
-			SIGNAL (SIGQUIT, qstat);
-			SIGNAL (SIGPIPE, SIG_IGN);  /*
+			SIGNAL(SIGINT, istat);
+			SIGNAL(SIGQUIT, qstat);
+			SIGNAL(SIGPIPE, SIG_IGN);  /*
 					** should probably change to block
 					** instead
 					*/
 			if (ontty == PITTY)
-				m_pclose ();
-			SIGNAL (SIGPIPE, pstat);
+				m_pclose();
+			SIGNAL(SIGPIPE, pstat);
 			invo_name = cp;
 			if (holder.c_text) {
-				free (holder.c_text);
+				free(holder.c_text);
 				holder.c_text = NULL;
 			}
-			free_queue (&msghd, &msgtl);
+			free_queue(&msghd, &msgtl);
 			for (c1 = fmthd; c1; c1 = c1->c_next)
 				c1->c_flags &= ~HDROUTPUT;
 			return exitstat;
@@ -1734,25 +1741,25 @@ mhlsbr (int argc, char **argv, FILE *(*action)())
 #undef done
 
 static void
-mhladios (char *what, char *fmt, ...)
+mhladios(char *what, char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
-	advertise (what, NULL, fmt, ap);
+	advertise(what, NULL, fmt, ap);
 	va_end(ap);
-	mhldone (1);
+	mhldone(1);
 }
 
 
 static void
-mhldone (int status)
+mhldone(int status)
 {
 	exitstat = status;
 	if (mhl_action)
-		longjmp (mhlenv, DONE);
+		longjmp(mhlenv, DONE);
 	else
-		done (exitstat);
+		done(exitstat);
 }
 
 
@@ -1760,62 +1767,62 @@ static int m_pid = NOTOK;
 static int sd = NOTOK;
 
 static void
-m_popen (char *name)
+m_popen(char *name)
 {
 	int pd[2];
 
-	if (mhl_action && (sd = dup (fileno (stdout))) == NOTOK)
-		adios ("standard output", "unable to dup()");
+	if (mhl_action && (sd = dup(fileno(stdout))) == NOTOK)
+		adios("standard output", "unable to dup()");
 
-	if (pipe (pd) == NOTOK)
-		adios ("pipe", "unable to");
+	if (pipe(pd) == NOTOK)
+		adios("pipe", "unable to");
 
-	switch (m_pid = vfork ()) {
+	switch (m_pid = vfork()) {
 		case NOTOK:
-			adios ("fork", "unable to");
+			adios("fork", "unable to");
 
 		case OK:
-			SIGNAL (SIGINT, SIG_DFL);
-			SIGNAL (SIGQUIT, SIG_DFL);
+			SIGNAL(SIGINT, SIG_DFL);
+			SIGNAL(SIGQUIT, SIG_DFL);
 
-			close (pd[1]);
-			if (pd[0] != fileno (stdin)) {
-				dup2 (pd[0], fileno (stdin));
-				close (pd[0]);
+			close(pd[1]);
+			if (pd[0] != fileno(stdin)) {
+				dup2(pd[0], fileno(stdin));
+				close(pd[0]);
 			}
-			execlp (name, r1bindex (name, '/'), NULL);
-			fprintf (stderr, "unable to exec ");
-			perror (name);
-			_exit (-1);
+			execlp(name, r1bindex(name, '/'), NULL);
+			fprintf(stderr, "unable to exec ");
+			perror(name);
+			_exit(-1);
 
 		default:
-			close (pd[0]);
-			if (pd[1] != fileno (stdout)) {
-				dup2 (pd[1], fileno (stdout));
-				close (pd[1]);
+			close(pd[0]);
+			if (pd[1] != fileno(stdout)) {
+				dup2(pd[1], fileno(stdout));
+				close(pd[1]);
 			}
 	}
 }
 
 
 void
-m_pclose (void)
+m_pclose(void)
 {
 	if (m_pid == NOTOK)
 		return;
 
 	if (sd != NOTOK) {
-		fflush (stdout);
-		if (dup2 (sd, fileno (stdout)) == NOTOK)
-			adios ("standard output", "unable to dup2()");
+		fflush(stdout);
+		if (dup2(sd, fileno(stdout)) == NOTOK)
+			adios("standard output", "unable to dup2()");
 
-		clearerr (stdout);
-		close (sd);
+		clearerr(stdout);
+		close(sd);
 		sd = NOTOK;
 	}
 	else
-		fclose (stdout);
+		fclose(stdout);
 
-	pidwait (m_pid, OK);
+	pidwait(m_pid, OK);
 	m_pid = NOTOK;
 }