X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=2416baf99f487e3dfa05b43669f18ccc1ab0769f;hp=043e05ed3bd29f17b2118d650827c3e1e0e19633;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/send.c b/uip/send.c
index 043e05e..2416baf 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -99,7 +99,7 @@ extern char *distfile;
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	int msgp = 0, distsw = 0, vecp = 1;
 	int mime = 0;
@@ -118,35 +118,35 @@ 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();
 
-	arguments = getarguments (invo_name, argc, argv, 1);
+	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
 	vec[vecp++] = "-library";
-	vec[vecp++] = getcpy (m_maildir (""));
+	vec[vecp++] = getcpy(m_maildir(""));
 
 	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\n", cp);
+					adios(NULL, "-%s unknown\n", cp);
 
 				case HELPSW:
-					snprintf (buf, sizeof(buf),
+					snprintf(buf, sizeof(buf),
 							"%s [file] [switches]",
 							invo_name);
-					print_help (buf, switches, 1);
-					done (1);
+					print_help(buf, switches, 1);
+					done(1);
 				case VERSIONSW:
 					print_version(invo_name);
-					done (1);
+					done(1);
 
 				case PUSHSW:
 					pushsw++;
@@ -214,23 +214,24 @@ main (int argc, char **argv)
 				case PORTSW:
 					vec[vecp++] = --cp;
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					vec[vecp++] = cp;
 					continue;
 
 				case ATTACHSW:
-					if (!(attach = *argp++) || *attach == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+					if (!(attach = *argp++) ||
+							*attach == '-')
+						adios(NULL, "missing argument to %s", argp[-2]);
 					continue;
 
 				case ATTACHFORMATSW:
 					if (! *argp || **argp == '-')
-						adios (NULL, "missing argument to %s", argp[-1]);
+						adios(NULL, "missing argument to %s", argp[-1]);
 					else {
-						attachformat = atoi (*argp);
+						attachformat = atoi(*argp);
 						if (attachformat < 0 ||
 							attachformat > ATTACHFORMATS - 1) {
-							advise (NULL, "unsupported attachformat %d",
+							advise(NULL, "unsupported attachformat %d",
 									attachformat);
 							continue;
 						}
@@ -246,7 +247,7 @@ main (int argc, char **argv)
 	/*
 	** check for "Aliasfile:" profile entry
 	*/
-	if ((cp = context_find ("Aliasfile"))) {
+	if ((cp = context_find("Aliasfile"))) {
 		char *dp = NULL;
 
 		for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap;
@@ -256,121 +257,118 @@ main (int argc, char **argv)
 		}
 	}
 
-	if (!context_find ("path"))
-		free (path ("./", TFOLDER));
+	if (!context_find("path"))
+		free(path("./", TFOLDER));
 
 	if (!msgp)
 		msgs[msgp++] = "cur";
-	maildir = m_maildir (draftfolder);
+	maildir = m_maildir(draftfolder);
 
-	if (chdir (maildir) == NOTOK)
-		adios (maildir, "unable to change directory to");
+	if (chdir(maildir) == NOTOK)
+		adios(maildir, "unable to change directory to");
 
 	/* read folder and create message structure */
-	if (!(mp = folder_read (draftfolder)))
-		adios (NULL, "unable to read draft folder %s", draftfolder);
+	if (!(mp = folder_read(draftfolder)))
+		adios(NULL, "unable to read draft folder %s", draftfolder);
 
 	/* check for empty folder */
 	if (mp->nummsg == 0)
-		adios (NULL, "no messages in draft folder %s", draftfolder);
+		adios(NULL, "no messages in draft folder %s", draftfolder);
 
 	/* parse all the message ranges/sequences and set SELECTED */
 	for (msgnum = 0; msgnum < msgp; msgnum++)
-		if (!m_convert (mp, msgs[msgnum]))
-			done (1);
-	seq_setprev (mp);  /* set the previous-sequence */
+		if (!m_convert(mp, msgs[msgnum]))
+			done(1);
+	seq_setprev(mp);  /* set the previous-sequence */
 
 	for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-		if (is_selected (mp, msgnum)) {
-			msgs[msgp++] = getcpy (m_name (msgnum));
-			unset_exists (mp, msgnum);
+		if (is_selected(mp, msgnum)) {
+			msgs[msgp++] = getcpy(m_name(msgnum));
+			unset_exists(mp, msgnum);
 		}
 	}
 
 	mp->msgflags |= SEQMOD;
-	seq_save (mp);
+	seq_save(mp);
 
-	if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
-		if ((cp = context_find ("signature")) && *cp)
-			m_putenv ("SIGNATURE", cp);
+	if ((cp = getenv("SIGNATURE")) == NULL || *cp == 0)
+		if ((cp = context_find("signature")) && *cp)
+			m_putenv("SIGNATURE", cp);
 #ifdef UCI
 		else {
-			snprintf (buf, sizeof(buf), "%s/.signature", mypath);
-			if ((fp = fopen (buf, "r")) != NULL &&
+			snprintf(buf, sizeof(buf), "%s/.signature", mypath);
+			if ((fp = fopen(buf, "r")) != NULL &&
 					fgets(buf, sizeof buf, fp) != NULL) {
-					fclose (fp);
-					if (cp = strchr (buf, '\n'))
+					fclose(fp);
+					if (cp = strchr(buf, '\n'))
 						*cp = 0;
-					m_putenv ("SIGNATURE", buf);
+					m_putenv("SIGNATURE", buf);
 			}
 		}
 #endif /* UCI */
 
 	for (msgnum = 0; msgnum < msgp; msgnum++)
-		if (stat (msgs[msgnum], &st) == NOTOK)
-			adios (msgs[msgnum], "unable to stat draft file");
+		if (stat(msgs[msgnum], &st) == NOTOK)
+			adios(msgs[msgnum], "unable to stat draft file");
 
-	if ((annotext = getenv ("mhannotate")) == NULL || *annotext == 0)
+	if ((annotext = getenv("mhannotate")) == NULL || *annotext == 0)
 		annotext = NULL;
-	if (annotext && ((cp = getenv ("mhinplace")) != NULL && *cp != 0))
-		inplace = atoi (cp);
-	if ((altmsg = getenv ("mhaltmsg")) == NULL || *altmsg == 0)
+	if (annotext && ((cp = getenv("mhinplace")) != NULL && *cp != 0))
+		inplace = atoi(cp);
+	if ((altmsg = getenv("mhaltmsg")) == NULL || *altmsg == 0)
 		altmsg = NULL;  /* used by dist interface - see below */
 
-	if ((cp = getenv ("mhdist"))
-			&& *cp
-			&& (distsw = atoi (cp))
-			&& altmsg) {
+	if ((cp = getenv("mhdist")) && *cp && (distsw = atoi (cp)) && altmsg) {
 		vec[vecp++] = "-dist";
-		distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL));
-		if (link (altmsg, distfile) == NOTOK) {
+		distfile = getcpy(m_mktemp2(altmsg, invo_name, NULL, NULL));
+		if (link(altmsg, distfile) == NOTOK) {
 			if (errno != EXDEV
 #ifdef EISREMOTE
 					&& errno != EISREMOTE
 #endif /* EISREMOTE */
 				)
-				adios (distfile, "unable to link %s to",
+				adios(distfile, "unable to link %s to",
 						altmsg);
-			free (distfile);
-			distfile = getcpy (m_mktemp2(NULL, invo_name,
+			free(distfile);
+			distfile = getcpy(m_mktemp2(NULL, invo_name,
 					NULL, NULL));
 			{
 				int in, out;
 				struct stat st;
 
-				if ((in = open (altmsg, O_RDONLY)) == NOTOK)
-					adios (altmsg, "unable to open");
+				if ((in = open(altmsg, O_RDONLY)) == NOTOK)
+					adios(altmsg, "unable to open");
 				fstat(in, &st);
-				if ((out = creat (distfile,
+				if ((out = creat(distfile,
 						(int) st.st_mode & 0777))
 						== NOTOK)
-					adios (distfile, "unable to write");
-				cpydata (in, out, altmsg, distfile);
-				close (in);
-				close (out);
+					adios(distfile, "unable to write");
+				cpydata(in, out, altmsg, distfile);
+				close(in);
+				close(out);
 			}
 		}
 	} else {
 		distfile = NULL;
 	}
 
-	if (altmsg == NULL || stat (altmsg, &st) == NOTOK) {
+	if (altmsg == NULL || stat(altmsg, &st) == NOTOK) {
 		st.st_mtime = 0;
 		st.st_dev = 0;
 		st.st_ino = 0;
 	}
 	if (pushsw)
-		push ();
+		push();
 
 	status = 0;
-	vec[0] = r1bindex (postproc, '/');
-	closefds (3);
+	vec[0] = r1bindex(postproc, '/');
+	closefds(3);
 
 	for (msgnum = 0; msgnum < msgp; msgnum++) {
-		switch (sendsbr (vec, vecp, msgs[msgnum], &st, 1, attach,
+		switch (sendsbr(vec, vecp, msgs[msgnum], &st, 1, attach,
 				attachformat)) {
 			case DONE:
-				done (++status);
+				done(++status);
 			case NOTOK:
 				status++;  /* fall */
 			case OK:
@@ -378,7 +376,7 @@ main (int argc, char **argv)
 		}
 	}
 
-	context_save ();  /* save the context file */
-	done (status);
+	context_save();  /* save the context file */
+	done(status);
 	return 1;
 }