X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhl.c;h=321c5f989cde23edceaf994eeb9cd4a3b1d9d254;hb=517661967774d60716ecff152c642b417195f900;hp=38926b6d3019791dac72a4ac11c9af40e495e2bf;hpb=0c4214ea2aec6497d0d67b436bbee9bc1d225f1e;p=mmh

diff --git a/uip/mhl.c b/uip/mhl.c
index 38926b6..321c5f9 100644
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -105,11 +105,11 @@ static struct mcomp *fmthd = NULL;
 static struct mcomp *fmttl = NULL;
 
 static struct mcomp global = {
-	NULL, NULL, "", NULL, NULL, 0, -1, 80, -1, 0, 0
+	NULL, NULL, NULL, NULL, NULL, 0, -1, 80, -1, 0, NULL
 };
 
 static struct mcomp holder = {
-	NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NOCOMPONENT, 0
+	NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NOCOMPONENT, NULL
 };
 
 struct pair {
@@ -231,9 +231,9 @@ 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 intrser(int);
+static void pipeser(int);
+static void quitser(int);
 static void mhladios(char *, char *, ...);
 static void mhldone(int);
 static void m_popen(char *);
@@ -407,7 +407,7 @@ static void
 mhl_format(char *file, int width)
 {
 	int i;
-	char *bp, *cp, **ip;
+	char *bp, *cp;
 	char *ap, buffer[BUFSIZ], name[NAMESZ];
 	struct mcomp *c1;
 	struct stat st;
@@ -443,7 +443,7 @@ mhl_format(char *file, int width)
 		global.c_width = i;
 	global.c_cwidth = -1;
 	global.c_flags = 0;
-	*(ip = ignores) = NULL;
+	*ignores = NULL;
 
 	while (vfgets(fp, &ap) == OK) {
 		bp = ap;
@@ -470,25 +470,20 @@ mhl_format(char *file, int width)
 			** it to the end of the current "ignores" list.
 			*/
 			if (!mh_strcasecmp(name, "ignores")) {
-				char **tmparray, **p;
+				char **tmparray;
 				int n = 0;
 
 				/* split the fields */
 				tmparray = brkstring(getcpy(++parptr), ",",
 						NULL);
-
-				/* count number of fields split */
-				p = tmparray;
-				while (*p++)
-					n++;
-
 				/*
 				** copy pointers to split fields
 				** to ignores array
 				*/
-				ip = copyip(tmparray, ip,
-						MAXARGS - num_ignores);
-				num_ignores += n;
+				while (tmparray[n] && num_ignores<MAXARGS-1) {
+					ignores[num_ignores++] = tmparray[n++];
+				}
+				ignores[num_ignores] = NULL;
 				continue;
 			}
 			parptr = bp;
@@ -1228,37 +1223,25 @@ putch(char ch)
 }
 
 
-static RETSIGTYPE
+static void
 intrser(int i)
 {
-#ifndef RELIABLE_SIGNALS
-	SIGNAL(SIGINT, intrser);
-#endif
-
 	discard(stdout);
 	putchar('\n');
 	longjmp(env, DONE);
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
-#ifndef RELIABLE_SIGNALS
-	SIGNAL(SIGPIPE, pipeser);
-#endif
-
 	done(NOTOK);
 }
 
 
-static RETSIGTYPE
+static void
 quitser(int i)
 {
-#ifndef RELIABLE_SIGNALS
-	SIGNAL(SIGQUIT, quitser);
-#endif
-
 	putchar('\n');
 	fflush(stdout);
 	done(NOTOK);