X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhlsbr.c;h=4c2558f742926234fd346763988aa8c545b2abb3;hb=3ef341abe440ece07f8deed59fb026ab020e805a;hp=04da52bb436296e54394fb82584ec72c9a145233;hpb=d2f12554a254e814dcdafb3828fc0d9936154eef;p=mmh diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 04da52b..4c2558f 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -2,8 +2,6 @@ /* * mhlsbr.c -- main routines for nmh message lister * - * $Id$ - * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for * complete copyright information. @@ -136,11 +134,11 @@ static struct mcomp *fmthd = NULL; static struct mcomp *fmttl = NULL; static struct mcomp global = { - NULL, NULL, "", NULL, NULL, 0, -1, 80, -1, 40, BELL, 0 + NULL, NULL, NULL, NULL, NULL, NULL, 0, -1, 80, -1, 40, BELL, NULL }; static struct mcomp holder = { - NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, NOCOMPONENT, 0 + NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, NOCOMPONENT, NULL }; struct pair { @@ -220,17 +218,17 @@ static int mhldebug = 0; static int ontty = NOTTY; static int row; -static int column; +static unsigned int column; static int lm; static int llim; static int ovoff; static int term; -static int wid; +static unsigned int wid; static char *ovtxt; -static char *onelp; +static unsigned char *onelp; static char *parptr; @@ -273,9 +271,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 face_format (struct mcomp *); static int doface (struct mcomp *); static void mhladios (char *, char *, ...); @@ -291,7 +289,6 @@ 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 */ -struct hostent *gethostbystring (); int @@ -620,7 +617,8 @@ mhl_format (char *file, int length, int width) 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) c1->c_nfs, (unsigned int) c1->c_fmt); + (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); @@ -792,10 +790,10 @@ parse (void) static void -process (char *folder, char *fname, int ofilen, int ofilec) +process (char *folder, char *volatile fname, int ofilen, int ofilec) { - char *cp; - FILE *fp; + char *cp = NULL; + FILE *fp = NULL; struct mcomp *c1; switch (setjmp (env)) { @@ -1185,7 +1183,7 @@ static void putcomp (struct mcomp *c1, struct mcomp *c2, int flag) { int count, cchdr; - char *cp; + unsigned char *cp; cchdr = 0; lm = 0; @@ -1277,9 +1275,9 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) if (cchdr) { if (flag == TWOCOMP) count = (c1->c_cwidth >= 0) ? c1->c_cwidth - : strlen (c2->c_name) + 2; + : (int) strlen (c2->c_name) + 2; else - count = (c1->c_cwidth >= 0) ? c1->c_cwidth + count = (c1->c_cwidth >= 0) ? (size_t) c1->c_cwidth : strlen (c1->c_text ? c1->c_text : c1->c_name) + 2; } count += c1->c_offset; @@ -1298,6 +1296,8 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) if (term == '\n') putstr ("\n"); } + if (flag == BODYCOMP && term == '\n') + c1->c_flags &= ~HDROUTPUT; /* Buffer ended on a newline */ } @@ -1444,12 +1444,10 @@ putch (char ch) } -static RETSIGTYPE +static void intrser (int i) { -#ifndef RELIABLE_SIGNALS - SIGNAL (SIGINT, intrser); -#endif + NMH_UNUSED (i); discard (stdout); putchar ('\n'); @@ -1457,23 +1455,19 @@ intrser (int i) } -static RETSIGTYPE +static void pipeser (int i) { -#ifndef RELIABLE_SIGNALS - SIGNAL (SIGPIPE, pipeser); -#endif + NMH_UNUSED (i); done (NOTOK); } -static RETSIGTYPE +static void quitser (int i) { -#ifndef RELIABLE_SIGNALS - SIGNAL (SIGQUIT, quitser); -#endif + NMH_UNUSED (i); putchar ('\n'); fflush (stdout); @@ -1515,26 +1509,22 @@ face_format (struct mcomp *c1) #include #include #include - -#ifdef HAVE_ARPA_INET_H -# include -#endif +#include static int doface (struct mcomp *c1) { int result, sd; - struct sockaddr_in in_socket; - struct sockaddr_in *isock = &in_socket; static int inited = OK; - static int addrlen; - static struct in_addr addr; - static unsigned short portno; + static struct sockaddr_storage ss; + static socklen_t socklen; + static int socktype; + static int protocol; if (inited == OK) { char *cp; char **ap = brkstring (cp = getcpy (faceproc), " ", "\n"); - struct hostent *hp; + struct addrinfo hints, *res; if (ap[0] == NULL || ap[1] == NULL) { bad_faceproc: ; @@ -1542,27 +1532,32 @@ bad_faceproc: ; return (inited = NOTOK); } - if (!(hp = gethostbystring (ap[0]))) + memset(&hints, 0, sizeof(hints)); +#ifdef AI_ADDRCONFIG + hints.ai_flags = AI_ADDRCONFIG; +#endif + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_DGRAM; + + if (getaddrinfo(ap[0], ap[1], &hints, &res) != 0) goto bad_faceproc; - memcpy((char *) &addr, hp->h_addr, addrlen = hp->h_length); - portno = htons ((unsigned short) atoi (ap[1])); - free (cp); + memcpy(&ss, res->ai_addr, res->ai_addrlen); + socklen = res->ai_addrlen; + socktype = res->ai_socktype; + protocol = res->ai_protocol; + freeaddrinfo(res); inited = DONE; } if (inited == NOTOK) return NOTOK; - isock->sin_family = AF_INET; - isock->sin_port = portno; - memcpy((char *) &isock->sin_addr, (char *) &addr, addrlen); - - if ((sd = socket (AF_INET, SOCK_DGRAM, 0)) == 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 *) isock, sizeof(*isock)); + (struct sockaddr *) &ss, socklen); close (sd); @@ -1683,8 +1678,8 @@ doface (struct mcomp *c1) int mhlsbr (int argc, char **argv, FILE *(*action)()) { - SIGNAL_HANDLER istat, pstat, qstat; - char *cp; + SIGNAL_HANDLER istat = NULL, pstat = NULL, qstat = NULL; + char *cp = NULL; struct mcomp *c1; switch (setjmp (mhlenv)) {