X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhl.c;h=321c5f989cde23edceaf994eeb9cd4a3b1d9d254;hb=517661967774d60716ecff152c642b417195f900;hp=c1c53551fde34066d054386907254f152cb4f977;hpb=1577ee015a08dd21f0f57f8a8f9a9396c31e884d;p=mmh diff --git a/uip/mhl.c b/uip/mhl.c index c1c5355..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 *); @@ -1223,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);