X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Fslocal.c;h=869fa17f81a3a4ca51816059451d6e597e44af33;hb=e69044f7624abe5cb2cb796d528c0cc5f29515f7;hp=cc3c8727c15dca04bed8015623939d072b45e565;hpb=6fd2bf57267d5399994a4a4c4555c5197d50ce82;p=mmh

diff --git a/uip/slocal.c b/uip/slocal.c
index cc3c872..869fa17 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -222,13 +222,12 @@ main (int argc, char **argv)
 		    adios (NULL, "-%s unknown", cp);
 
 		case HELPSW: 
-		    snprintf (buf, sizeof(buf),
-			"%s [switches] [address info sender]", invo_name);
+		    snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
 		    print_help (buf, switches, 0);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case ADDRSW: 
 		    if (!(addr = *argp++))/* allow -xyz arguments */
@@ -284,20 +283,8 @@ main (int argc, char **argv)
 		    debug++;
 		    continue;
 	    }
-	}
-
-	switch (argp - (argv + 1)) {
-	    case 1: 
-		addr = cp;
-		break;
-
-	    case 2: 
-		info = cp;
-		break;
-
-	    case 3: 
-		sender = cp;
-		break;
+	} else {
+		adios (NULL, "only switch arguments are supported");
 	}
     }
 
@@ -1057,18 +1044,6 @@ usr_folder (int fd, char *string)
     /* use rcvstore to put message in folder */
     status = usr_pipe (fd, "rcvstore", rcvstoreproc, vec, 1);
 
-#if 0
-    /*
-     * Currently, verbose status messages are handled by usr_pipe().
-     */
-    if (verbose) {
-	if (status == 0)
-	    verbose_printf (", success.\n");
-	else
-	    verbose_printf (", failed.\n");
-    }
-#endif
-
     return status;
 }
 
@@ -1290,13 +1265,6 @@ you_lose:
 		/* get copy of envelope information ("From " line) */
 		envelope = getcpy (buffer);
 
-#if 0
-		/* First go ahead and put "From " line in message */
-		fputs (buffer, ffp);
-		if (ferror (ffp))
-		    goto fputs_error;
-#endif
-
 		/* Put the delivery date in message */
 		fputs (ddate, ffp);
 		if (ferror (ffp))