X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=82af31e8bf349e38a969892135b6c29978c44d95;hp=aefe67f54b00f7905bb2976c57a6fa9ca82ef1b7;hb=5b792c4424571f05bc2008e3109797d18d7d00d1;hpb=8e5be81f784682822f5e868c1bf3c8624682bd23

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index aefe67f..82af31e 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -704,76 +704,74 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 	fflush(stdout);
 
 	switch (pid = vfork()) {
-		case NOTOK:
-			advise("fork", "unable to");
-			status = NOTOK;
-			break;
-
-		case OK:
-			if (cwd)
-				chdir(cwd);
-			if (altmsg) {
-				if (mp)
-					m_putenv("mhfolder", mp->foldpath);
-				m_putenv("editalt", altpath);
-			}
-
-			vecp = 0;
-			vec[vecp++] = mhbasename(*ed);
-			if (arg)
-				while (*arg)
-					vec[vecp++] = *arg++;
-			vec[vecp++] = file;
-			vec[vecp] = NULL;
-
-			execvp(*ed, vec);
-			fprintf(stderr, "unable to exec ");
-			perror(*ed);
-			_exit(-1);
+	case NOTOK:
+		advise("fork", "unable to");
+		status = NOTOK;
+		break;
+
+	case OK:
+		if (cwd)
+			chdir(cwd);
+		if (altmsg) {
+			if (mp)
+				m_putenv("mhfolder", mp->foldpath);
+			m_putenv("editalt", altpath);
+		}
 
-		default:
-			if ((status = pidwait(pid, NOTOK))) {
+		vecp = 0;
+		vec[vecp++] = mhbasename(*ed);
+		if (arg)
+			while (*arg)
+				vec[vecp++] = *arg++;
+		vec[vecp++] = file;
+		vec[vecp] = NULL;
+
+		execvp(*ed, vec);
+		fprintf(stderr, "unable to exec ");
+		perror(*ed);
+		_exit(-1);
+
+	default:
+		if ((status = pidwait(pid, NOTOK))) {
 #ifdef ATTVIBUG
-				if ((cp = mhbasename(*ed)) &&
-						strcmp(cp, "vi") == 0 &&
-						(status & 0x00ff) == 0)
-					status = 0;
-				else {
+			if ((cp = mhbasename(*ed)) && strcmp(cp, "vi") == 0 &&
+					(status & 0x00ff) == 0)
+				status = 0;
+			else {
 #endif
-				if (((status & 0xff00) != 0xff00)
-					&& (!reedit || (status & 0x00ff))) {
-					if (!use && (status & 0xff00) && (rename(file, cp = m_backup (file)) != NOTOK)) {
-						advise(NULL, "problems with edit--draft left in %s", cp);
-					} else {
-						advise(NULL, "problems with edit--%s preserved", file);
-					}
+			if (((status & 0xff00) != 0xff00)
+				&& (!reedit || (status & 0x00ff))) {
+				if (!use && (status & 0xff00) && (rename(file, cp = m_backup (file)) != NOTOK)) {
+					advise(NULL, "problems with edit--draft left in %s", cp);
+				} else {
+					advise(NULL, "problems with edit--%s preserved", file);
 				}
-				status = -2;  /* maybe "reedit ? -2 : -1"? */
-				break;
+			}
+			status = -2;  /* maybe "reedit ? -2 : -1"? */
+			break;
 #ifdef ATTVIBUG
-				}
-#endif
 			}
+#endif
+		}
 
-			reedit++;
+		reedit++;
 #ifdef HAVE_LSTAT
-			if (altmsg && mp && !is_readonly(mp) && (slinked ?
-					lstat (linkpath, &st) != NOTOK &&
-					S_ISREG(st.st_mode) &&
-					copyf(linkpath, altpath) == NOTOK :
-					stat(linkpath, &st) != NOTOK &&
-					st.st_nlink == 1 &&
-					(unlink(altpath) == NOTOK ||
-					link(linkpath, altpath) == NOTOK)))
-				advise(linkpath, "unable to update %s from", altmsg);
+		if (altmsg && mp && !is_readonly(mp) && (slinked ?
+				lstat (linkpath, &st) != NOTOK &&
+				S_ISREG(st.st_mode) &&
+				copyf(linkpath, altpath) == NOTOK :
+				stat(linkpath, &st) != NOTOK &&
+				st.st_nlink == 1 &&
+				(unlink(altpath) == NOTOK ||
+				link(linkpath, altpath) == NOTOK)))
+			advise(linkpath, "unable to update %s from", altmsg);
 #else /* HAVE_LSTAT */
-			if (altmsg && mp && !is_readonly(mp) &&
-					stat(linkpath, &st) != NOTOK &&
-					st.st_nlink == 1 &&
-					(unlink(altpath) == NOTOK ||
-					link(linkpath, altpath) == NOTOK))
-				advise(linkpath, "unable to update %s from",
-						altmsg);
+		if (altmsg && mp && !is_readonly(mp) &&
+				stat(linkpath, &st) != NOTOK &&
+				st.st_nlink == 1 &&
+				(unlink(altpath) == NOTOK ||
+				link(linkpath, altpath) == NOTOK))
+			advise(linkpath, "unable to update %s from", altmsg);
 #endif /* HAVE_LSTAT */
 	}
 
@@ -858,28 +856,28 @@ sendfile(char **arg, char *file, int pushsw)
 	for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
 		sleep(5);
 	switch (child_id) {
-		case NOTOK:
-			advise(NULL, "unable to fork, so sending directly...");
-		case OK:
-			vecp = 0;
-			vec[vecp++] = invo_name;
-			if (pushsw)
-				vec[vecp++] = "-push";
-			if (arg)
-				while (*arg)
-					vec[vecp++] = *arg++;
-			vec[vecp++] = file;
-			vec[vecp] = NULL;
-
-			execvp(sendproc, vec);
-			fprintf(stderr, "unable to exec ");
-			perror(sendproc);
-			_exit(-1);
-
-		default:
-			if (pidwait(child_id, OK) == 0)
-				done(0);
-			return 1;
+	case NOTOK:
+		advise(NULL, "unable to fork, so sending directly...");
+	case OK:
+		vecp = 0;
+		vec[vecp++] = invo_name;
+		if (pushsw)
+			vec[vecp++] = "-push";
+		if (arg)
+			while (*arg)
+				vec[vecp++] = *arg++;
+		vec[vecp++] = file;
+		vec[vecp] = NULL;
+
+		execvp(sendproc, vec);
+		fprintf(stderr, "unable to exec ");
+		perror(sendproc);
+		_exit(-1);
+
+	default:
+		if (pidwait(child_id, OK) == 0)
+			done(0);
+		return 1;
 	}
 }
 
@@ -939,41 +937,42 @@ check_draft(char *msgnam)
 		return 0;
 	for (state = FLD;;)
 		switch (state = m_getfld(state, name, buf, sizeof(buf), fp)) {
-			case FLD:
-			case FLDPLUS:
-			case FLDEOF:
-				/*
-				** If draft already contains any of the
-				** Content-XXX fields, then assume it already
-				** been converted.
-				*/
-				if (uprf(name, XXX_FIELD_PRF)) {
-					fclose(fp);
-					return 0;
-				}
-				while (state == FLDPLUS)
-					state = m_getfld(state, name, buf,
-							sizeof(buf), fp);
-				break;
+		case FLD:
+		case FLDPLUS:
+		case FLDEOF:
+			/*
+			** If draft already contains any of the
+			** Content-XXX fields, then assume it already
+			** been converted.
+			*/
+			if (uprf(name, XXX_FIELD_PRF)) {
+				fclose(fp);
+				return 0;
+			}
+			while (state == FLDPLUS)
+				state = m_getfld(state, name, buf,
+						sizeof(buf), fp);
+			break;
 
-			case BODY:
-				do {
-					char *bp;
+		case BODY:
+			do {
+				char *bp;
 
-					for (bp = buf; *bp; bp++)
-						if (*bp != ' ' && *bp != '\t' && *bp != '\n') {
-							fclose(fp);
-							return 1;
-						}
+				for (bp = buf; *bp; bp++)
+					if (*bp != ' ' && *bp != '\t' &&
+							*bp != '\n') {
+						fclose(fp);
+						return 1;
+					}
 
-					state = m_getfld(state, name, buf,
-							sizeof(buf), fp);
-				} while (state == BODY);
-				/* and fall... */
+				state = m_getfld(state, name, buf,
+						sizeof(buf), fp);
+			} while (state == BODY);
+			/* and fall... */
 
-			default:
-				fclose(fp);
-				return 0;
+		default:
+			fclose(fp);
+			return 0;
 		}
 }
 
@@ -1131,106 +1130,108 @@ sendit(char *sp, char **arg, char *file, int pushed)
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
 			switch (smatch(++cp, sendswitches)) {
-				case AMBIGSW:
-					ambigsw(cp, sendswitches);
-					return;
-				case UNKWNSW:
-					advise(NULL, "-%s unknown\n", cp);
-					return;
+			case AMBIGSW:
+				ambigsw(cp, sendswitches);
+				return;
+			case UNKWNSW:
+				advise(NULL, "-%s unknown\n", cp);
+				return;
 
-				case SHELPSW:
-					snprintf(buf, sizeof(buf),
-							"%s [switches]", sp);
-					print_help(buf, sendswitches, 1);
-					return;
-				case SVERSIONSW:
-					print_version(invo_name);
+			case SHELPSW:
+				snprintf(buf, sizeof(buf),
+						"%s [switches]", sp);
+				print_help(buf, sendswitches, 1);
+				return;
+			case SVERSIONSW:
+				print_version(invo_name);
+				return;
+
+			case SPSHSW:
+				pushed++;
+				continue;
+			case NSPSHSW:
+				pushed = 0;
+				continue;
+
+			case UNIQSW:
+				unique++;
+				continue;
+			case NUNIQSW:
+				unique = 0;
+				continue;
+			case FORWSW:
+				forwsw++;
+				continue;
+			case NFORWSW:
+				forwsw = 0;
+				continue;
+
+			case VERBSW:
+				verbsw++;
+				vec[vecp++] = --cp;
+				continue;
+			case NVERBSW:
+				verbsw = 0;
+				vec[vecp++] = --cp;
+				continue;
+
+			case DEBUGSW:
+				debugsw++;  /* fall */
+			case NFILTSW:
+			case FRMTSW:
+			case NFRMTSW:
+			case BITSTUFFSW:
+			case NBITSTUFFSW:
+			case MIMESW:
+			case NMIMESW:
+			case MSGDSW:
+			case NMSGDSW:
+			case WATCSW:
+			case NWATCSW:
+			case MAILSW:
+			case SAMLSW:
+			case SSNDSW:
+			case SOMLSW:
+			case SNOOPSW:
+				vec[vecp++] = --cp;
+				continue;
+
+			case ALIASW:
+			case FILTSW:
+			case WIDTHSW:
+			case CLIESW:
+			case SERVSW:
+			case PORTSW:
+				vec[vecp++] = --cp;
+				if (!(cp = *argp++) || *cp == '-') {
+					advise(NULL, "missing argument to %s",
+							argp[-2]);
 					return;
+				}
+				vec[vecp++] = cp;
+				continue;
 
-				case SPSHSW:
-					pushed++;
-					continue;
-				case NSPSHSW:
-					pushed = 0;
-					continue;
-
-				case UNIQSW:
-					unique++;
-					continue;
-				case NUNIQSW:
-					unique = 0;
-					continue;
-				case FORWSW:
-					forwsw++;
-					continue;
-				case NFORWSW:
-					forwsw = 0;
-					continue;
-
-				case VERBSW:
-					verbsw++;
-					vec[vecp++] = --cp;
-					continue;
-				case NVERBSW:
-					verbsw = 0;
-					vec[vecp++] = --cp;
-					continue;
-
-				case DEBUGSW:
-					debugsw++;  /* fall */
-				case NFILTSW:
-				case FRMTSW:
-				case NFRMTSW:
-				case BITSTUFFSW:
-				case NBITSTUFFSW:
-				case MIMESW:
-				case NMIMESW:
-				case MSGDSW:
-				case NMSGDSW:
-				case WATCSW:
-				case NWATCSW:
-				case MAILSW:
-				case SAMLSW:
-				case SSNDSW:
-				case SOMLSW:
-				case SNOOPSW:
-					vec[vecp++] = --cp;
-					continue;
-
-				case ALIASW:
-				case FILTSW:
-				case WIDTHSW:
-				case CLIESW:
-				case SERVSW:
-				case PORTSW:
-					vec[vecp++] = --cp;
-					if (!(cp = *argp++) || *cp == '-') {
-						advise(NULL, "missing argument to %s", argp[-2]);
-						return;
-					}
-					vec[vecp++] = cp;
-					continue;
-
-				case SNDATTACHSW:
-					if (!(attach = *argp++) ||
-							*attach == '-') {
-						advise(NULL, "missing argument to %s", argp[-2]);
-						return;
-					}
-					continue;
+			case SNDATTACHSW:
+				if (!(attach = *argp++) || *attach == '-') {
+					advise(NULL, "missing argument to %s",
+							argp[-2]);
+					return;
+				}
+				continue;
 
-				case SNDATTACHFORMAT:
-					if (! *argp || **argp == '-')
-						adios(NULL, "missing argument to %s", argp[-1]);
-					else {
-						attachformat = atoi(*argp);
-						if (attachformat < 0 || attachformat > ATTACHFORMATS - 1) {
-							advise(NULL, "unsupported attachformat %d", attachformat);
-							continue;
-						}
+			case SNDATTACHFORMAT:
+				if (! *argp || **argp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-1]);
+				else {
+					attachformat = atoi(*argp);
+					if (attachformat < 0 || attachformat > ATTACHFORMATS - 1) {
+						advise(NULL, "unsupported attachformat %d", attachformat);
+						continue;
 					}
-					++argp;
-					continue;
+				}
+				++argp;
+				continue;
 			}
 		}
 		advise(NULL, "usage: %s [switches]", sp);