X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhstore.c;h=fa30e035fa24c24ce84d4cf2b58dba1f16df2c40;hb=2667af48dccbcb9e25709dea50451dd58d40aeae;hp=ff7724cd3d5c8de037684251037400c8fd6aa0a9;hpb=1a0dcd0a540e3af64ff63d84839336bf8c85ec40;p=mmh

diff --git a/uip/mhstore.c b/uip/mhstore.c
index ff7724c..fa30e03 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -47,16 +47,21 @@ static struct swit switches[] = {
     { "version", 0 },
 #define	HELPSW                 12
     { "help", 0 },
+#define	CLOBBERSW              13
+    { "clobber always|auto|suffix|ask|never", 0 },
 
 /*
  * switches for debugging
  */
-#define	DEBUGSW                13
+#define	DEBUGSW                14
     { "debug", -5 },
     { NULL, 0 }
 };
 
 
+int save_clobber_policy (const char *);
+extern int files_not_clobbered;
+
 /* mhparse.c */
 extern char *tmp;	/* directory to place temp files */
 
@@ -88,7 +93,6 @@ CT parse_mime (char *);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
-void set_endian (void);
 void flush_errors (void);
 
 /* mhstoresbr.c */
@@ -102,7 +106,7 @@ void freects_done (int) NORETURN;
 /*
  * static prototypes
  */
-static RETSIGTYPE pipeser (int);
+static void pipeser (int);
 
 
 int
@@ -146,10 +150,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case AUTOSW:
 		autosw++;
@@ -214,6 +218,14 @@ do_cache:
 	    case NVERBSW: 
 		verbosw = 0;
 		continue;
+            case CLOBBERSW:
+		if (!(cp = *argp++) || *cp == '-')
+		    adios (NULL, "missing argument to %s", argp[-2]);
+                if (save_clobber_policy (cp)) {
+                  adios (NULL, "invalid argument, %s, to %s", argp[-1],
+                         argp[-2]);
+                }
+		continue;
 	    case DEBUGSW:
 		debugsw = 1;
 		continue;
@@ -232,8 +244,6 @@ do_cache:
     parts[npart] = NULL;
     types[ntype] = NULL;
 
-    set_endian ();
-
     /*
      * Check if we've specified an additional profile
      */
@@ -378,12 +388,12 @@ do_cache:
 	context_save ();		  /* save the context file  */
     }
 
-    done (0);
+    done (files_not_clobbered);
     return 1;
 }
 
 
-static RETSIGTYPE
+static void
 pipeser (int i)
 {
     if (i == SIGQUIT) {