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

diff --git a/uip/ap.c b/uip/ap.c
index a9f0775..41e990a 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -43,16 +43,16 @@ static int dat[5];
 /*
 ** prototypes
 */
-int sc_width (void);  /* from termsbr.c */
+int sc_width(void);  /* from termsbr.c */
 
 /*
 ** static prototypes
 */
-static int process (char *, int, int);
+static int process(char *, int, int);
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	int addrp = 0, normalize = AD_HOST;
 	int width = 0, status = 0;
@@ -63,49 +63,48 @@ main (int argc, char **argv)
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex (argv[0], '/');
+	invo_name = r1bindex(argv[0], '/');
 
 	/* read user profile/context */
 	context_read();
 
-	mts_init (invo_name);
-	arguments = getarguments (invo_name, argc, argv, 1);
+	mts_init(invo_name);
+	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
-			switch (smatch (++cp, switches)) {
+			switch (smatch(++cp, switches)) {
 				case AMBIGSW:
-					ambigsw (cp, switches);
-					done (1);
+					ambigsw(cp, switches);
+					done(1);
 
 				case UNKWNSW:
-					adios (NULL, "-%s unknown", cp);
+					adios(NULL, "-%s unknown", cp);
 
 				case HELPSW:
-					snprintf (buf, sizeof(buf), "%s [switches] addrs ...",
-						invo_name);
-					print_help (buf, switches, 1);
-					done (1);
+					snprintf(buf, sizeof(buf), "%s [switches] addrs ...", invo_name);
+					print_help(buf, switches, 1);
+					done(1);
 				case VERSIONSW:
-					print_version (invo_name);
-					done (1);
+					print_version(invo_name);
+					done(1);
 
 				case FORMSW:
 					if (!(form = *argp++) || *form == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					format = NULL;
 					continue;
 				case FMTSW:
 					if (!(format = *argp++) || *format == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					form = NULL;
 					continue;
 
 				case WIDTHSW:
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					width = atoi (cp);
+						adios(NULL, "missing argument to %s", argp[-2]);
+					width = atoi(cp);
 					continue;
 
 				case NORMSW:
@@ -117,27 +116,27 @@ main (int argc, char **argv)
 			}
 		}
 		if (addrp > NADDRS)
-			adios (NULL, "more than %d addresses", NADDRS);
+			adios(NULL, "more than %d addresses", NADDRS);
 		else
 			addrs[addrp++] = cp;
 	}
 	addrs[addrp] = NULL;
 
 	if (addrp == 0)
-		adios (NULL, "usage: %s [switches] addrs ...", invo_name);
+		adios(NULL, "usage: %s [switches] addrs ...", invo_name);
 
 	/* get new format string */
-	nfs = new_fs (form, format, FORMAT);
+	nfs = new_fs(form, format, FORMAT);
 
 	if (width == 0) {
-		if ((width = sc_width ()) < WIDTH / 2)
+		if ((width = sc_width()) < WIDTH / 2)
 			width = WIDTH / 2;
 		width -= 2;
 	}
 	if (width > WBUFSIZ)
 		width = WBUFSIZ;
 	fmt_norm = normalize;
-	fmt_compile (nfs, &fmt);
+	fmt_compile(nfs, &fmt);
 
 	dat[0] = 0;
 	dat[1] = 0;
@@ -146,9 +145,9 @@ main (int argc, char **argv)
 	dat[4] = 0;
 
 	for (addrp = 0; addrs[addrp]; addrp++)
-		status += process (addrs[addrp], width, normalize);
+		status += process(addrs[addrp], width, normalize);
 
-	done (status);
+	done(status);
 	return 1;
 }
 
@@ -160,7 +159,7 @@ struct pqpair {
 
 
 static int
-process (char *arg, int length, int norm)
+process(char *arg, int length, int norm)
 {
 	int status = 0;
 	register char *cp;
@@ -171,36 +170,37 @@ process (char *arg, int length, int norm)
 	register struct mailname *mp;
 
 	(q = &pq)->pq_next = NULL;
-	while ((cp = getname (arg))) {
-		if ((p = (struct pqpair *) calloc ((size_t) 1, sizeof(*p))) == NULL)
-			adios (NULL, "unable to allocate pqpair memory");
-		if ((mp = getm (cp, NULL, 0, norm, error)) == NULL) {
-			p->pq_text = getcpy (cp);
-			p->pq_error = getcpy (error);
+	while ((cp = getname(arg))) {
+		if ((p = (struct pqpair *)
+				calloc((size_t) 1, sizeof(*p))) == NULL)
+			adios(NULL, "unable to allocate pqpair memory");
+		if ((mp = getm(cp, NULL, 0, norm, error)) == NULL) {
+			p->pq_text = getcpy(cp);
+			p->pq_error = getcpy(error);
 			status++;
 		} else {
-			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 (fmt, buffer, length, dat);
-		fputs (buffer, stdout);
+		fmt_scan(fmt, buffer, length, dat);
+		fputs(buffer, stdout);
 
-		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);
 	}
 
 	return status;