X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhbuild.c;h=5ad0fc10ff84537d60a4a44dda39837c321d93f5;hb=5c86fbdc071e1c322ccf341855eaa813807776b4;hp=fd6cee0e17e8ae34622145543c300ae795f29169;hpb=3363e2624dce0eb8164cf8b3f1ab385c8ff72e88;p=mmh

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index fd6cee0..5ad0fc1 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -29,27 +29,15 @@
 #include <time.h>
 
 static struct swit switches[] = {
-#define HEADSW  0
-	{ "headers", 0 },
-#define NHEADSW  1
-	{ "noheaders", 0 },
-#define LISTSW  2
-	{ "list", 0 },
-#define NLISTSW  3
-	{ "nolist", 0 },
-#define VERBSW  4
+#define VERBSW  0
 	{ "verbose", 0 },
-#define NVERBSW  5
-	{ "noverbose", 0 },
-#define CONTENTIDSW  6
-	{ "contentid", 0 },
-#define NCONTENTIDSW  7
-	{ "nocontentid", 0 },
-#define VERSIONSW  8
-	{ "version", 0 },
-#define HELPSW  9
+#define NVERBSW  1
+	{ "noverbose", 2 },
+#define VERSIONSW  2
+	{ "Version", 0 },
+#define HELPSW  3
 	{ "help", 0 },
-#define DEBUGSW  10
+#define DEBUGSW  4
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -95,9 +83,6 @@ static CT build_mime(char *);
 int debugsw = 0;
 int verbosw = 0;
 
-int listsw   = 0;
-int contentidsw = 1;
-
 /*
 ** Temporary files
 */
@@ -113,9 +98,6 @@ static void unlink_done(int) NORETURN;
 int output_message(CT, char *);
 int output_message_fp(CT, FILE *, char*);
 
-/* mhlistsbr.c */
-int list_all_messages(CT *, int, int, int);
-
 /* mhmisc.c */
 void set_endian(void);
 
@@ -126,7 +108,6 @@ void free_content(CT);
 int
 main(int argc, char **argv)
 {
-	int headsw = 1;
 	char *cp, buf[BUFSIZ];
 	char buffer[BUFSIZ], *compfile = NULL;
 	char **argp, **arguments;
@@ -136,9 +117,7 @@ main(int argc, char **argv)
 
 	done = unlink_done;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -153,7 +132,6 @@ main(int argc, char **argv)
 				adios(NULL, "cannot specify both standard input and a file");
 			else
 				compfile = cp;
-			listsw = 0;  /* turn off -list if using std in/out */
 			verbosw = 0;  /* turn off -verbose listings */
 			break;
 		}
@@ -173,27 +151,6 @@ main(int argc, char **argv)
 				print_version(invo_name);
 				done(1);
 
-			case HEADSW:
-				headsw++;
-				continue;
-			case NHEADSW:
-				headsw = 0;
-				continue;
-
-			case LISTSW:
-				listsw++;
-				continue;
-			case NLISTSW:
-				listsw = 0;
-				continue;
-
-			case CONTENTIDSW:
-				contentidsw = 1;
-				continue;
-			case NCONTENTIDSW:
-				contentidsw = 0;
-				continue;
-
 			case VERBSW:
 				verbosw++;
 				continue;
@@ -213,9 +170,6 @@ main(int argc, char **argv)
 
 	set_endian();
 
-	if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0)
-		listsw  = 0;
-
 	/*
 	** Check if we've specified an additional profile
 	*/
@@ -313,21 +267,15 @@ main(int argc, char **argv)
 	output_message_fp(ct, fp_out, outfile);
 	fclose(fp_out);
 
-	/*
-	** List the message info
-	*/
-	if (listsw)
-		list_all_messages(cts, headsw, verbosw, debugsw);
-
 	/* Rename composition draft */
-	snprintf(buffer, sizeof(buffer), "%s.orig", m_backup(compfile));
+	snprintf(buffer, sizeof(buffer), "%s.orig", compfile);
 	if (rename(compfile, buffer) == NOTOK) {
-		adios(compfile, "unable to rename comp draft %s to", buffer);
+		adios(buffer, "unable to rename draft %s to", compfile);
 	}
 
 	/* Rename output file to take its place */
 	if (rename(outfile, compfile) == NOTOK) {
-		advise(outfile, "unable to rename output %s to", compfile);
+		advise(compfile, "unable to rename output %s to", outfile);
 		rename(buffer, compfile);
 		done(1);
 	}
@@ -632,7 +580,6 @@ user_content(FILE *in, char *file, char *buf, CT *ctp)
 	char buffer[BUFSIZ];
 	struct multipart *m;
 	struct part **pp;
-	struct stat st;
 	struct str2init *s2i;
 	CI ci;
 	CT ct;
@@ -760,8 +707,6 @@ rock_and_roll:
 			}
 		}
 
-		if (listsw)
-			ct->c_end = ftell(out);
 		fclose(out);
 
 		/* parse content type */
@@ -868,8 +813,6 @@ use_forw:
 				ce->ce_file = ci->ci_magic;
 				if (access(ce->ce_file, R_OK) == NOTOK)
 					adios("reading", "unable to access %s for", ce->ce_file);
-				if (listsw && stat(ce->ce_file, &st) != NOTOK)
-					ct->c_end = (long) st.st_size;
 				ci->ci_magic = NULL;
 			}
 			return OK;
@@ -984,9 +927,6 @@ use_forw:
 							"%s/%d", mp->foldpath,
 							msgnum);
 					pe->ce_file = getcpy(buffer);
-					if (listsw && stat(pe->ce_file, &st)
-							!= NOTOK)
-						p->c_end = (long) st.st_size;
 
 					if ((part = (struct part *) calloc(1, sizeof(*part))) == NULL)
 						adios(NULL, "out of memory");
@@ -1006,8 +946,6 @@ use_forw:
 			snprintf(buffer, sizeof(buffer), "%s/%d",
 					mp->foldpath, msgnum);
 			ce->ce_file = getcpy(buffer);
-			if (listsw && stat(ce->ce_file, &st) != NOTOK)
-				ct->c_end = (long) st.st_size;
 		}
 
 		folder_free(mp);  /* free folder/message structure */
@@ -1144,12 +1082,6 @@ compose_content(CT ct)
 			if (compose_content(p) == NOTOK)
 				return NOTOK;
 		}
-
-		if (listsw) {
-			ct->c_end = (partnum = strlen(prefix) + 2) + 2;
-			for (part = m->mp_parts; part; part = part->mp_next)
-				ct->c_end += part->mp_part->c_end + partnum;
-		}
 	}
 	break;
 
@@ -1287,14 +1219,6 @@ raw:
 				break;
 			}
 		}
-
-		/* Check size of file */
-		if (listsw && ct->c_end == 0L) {
-			struct stat st;
-
-			if (stat(ce->ce_file, &st) != NOTOK)
-				ct->c_end = (long) st.st_size;
-		}
 		break;
 	}
 
@@ -1614,9 +1538,9 @@ build_headers(CT ct)
 	add_header(ct, np, vp);
 
 	/*
-	** output the Content-ID, unless disabled by -nocontentid
+	** output the Content-ID
 	*/
-	if (contentidsw && ct->c_id) {
+	if (ct->c_id) {
 		np = getcpy(ID_FIELD);
 		vp = concat(" ", ct->c_id, NULL);
 		add_header(ct, np, vp);