X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=8cb674461715672112290b8be91b747bbbf409d2;hb=4d9ffab89f18b962c7d440053079c5f9b00af659;hp=45f33c7f381a3ad858f3b846ebae1ba2985e721c;hpb=2c3b7da72126a21f05130e9ed6bb70f43624ce25;p=mmh

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 45f33c7..8cb6744 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -688,12 +688,6 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 
 	default:
 		if ((status = pidwait(pid, NOTOK))) {
-#ifdef ATTVIBUG
-			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)) {
@@ -704,9 +698,6 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 			}
 			status = -2;  /* maybe "reedit ? -2 : -1"? */
 			break;
-#ifdef ATTVIBUG
-			}
-#endif
 		}
 
 		reedit++;
@@ -842,56 +833,24 @@ static struct swit  sendswitches[] = {
 	{ "forward", 0 },
 #define NFORWSW  7
 	{ "noforward", 0 },
-#define MIMESW  8
-	{ "mime", 0 },
-#define NMIMESW  9
-	{ "nomime", 0 },
-#define MSGDSW  10
-	{ "msgid", 0 },
-#define NMSGDSW  11
-	{ "nomsgid", 0 },
-#define SPSHSW  12
+#define SPSHSW  8
 	{ "push", 0 },
-#define NSPSHSW  13
+#define NSPSHSW  9
 	{ "nopush", 0 },
-#define UNIQSW  14
-	{ "unique", -6 },
-#define NUNIQSW  15
-	{ "nounique", -8 },
-#define VERBSW  16
+#define VERBSW  10
 	{ "verbose", 0 },
-#define NVERBSW  17
+#define NVERBSW  11
 	{ "noverbose", 0 },
-#define WATCSW  18
+#define WATCSW  12
 	{ "watch", 0 },
-#define NWATCSW  19
+#define NWATCSW  13
 	{ "nowatch", 0 },
-#define WIDTHSW  20
+#define WIDTHSW  14
 	{ "width columns", 0 },
-#define SVERSIONSW  21
+#define SVERSIONSW  15
 	{ "version", 0 },
-#define SHELPSW  22
+#define SHELPSW  16
 	{ "help", 0 },
-#define BITSTUFFSW  23
-	{ "dashstuffing", -12 },
-#define NBITSTUFFSW  24
-	{ "nodashstuffing", -14 },
-#define MAILSW  25
-	{ "mail", -4 },
-#define SAMLSW  26
-	{ "saml", -4 },
-#define SSNDSW  27
-	{ "send", -4 },
-#define SOMLSW  28
-	{ "soml", -4 },
-#define CLIESW  29
-	{ "client host", -6 },
-#define SERVSW  30
-	{ "server host", 6 },
-#define SNOOPSW  31
-	{ "snoop", -5 },
-#define PORTSW  32
-	{ "port server-port-name/number", 4 },
 	{ NULL, 0 }
 };
 
@@ -900,7 +859,6 @@ extern int debugsw;  /* from sendsbr.c */
 extern int forwsw;
 extern int inplace;
 extern int pushsw;
-extern int unique;
 extern int verbsw;
 
 extern char *altmsg;  /*  .. */
@@ -956,7 +914,6 @@ sendit(char *sp, char **arg, char *file, int pushed)
 	debugsw = 0;
 	forwsw = 1;
 	inplace = 1;
-	unique = 0;
 
 	altmsg = NULL;
 	annotext = NULL;
@@ -992,12 +949,6 @@ sendit(char *sp, char **arg, char *file, int pushed)
 				pushed = 0;
 				continue;
 
-			case UNIQSW:
-				unique++;
-				continue;
-			case NUNIQSW:
-				unique = 0;
-				continue;
 			case FORWSW:
 				forwsw++;
 				continue;
@@ -1019,28 +970,14 @@ sendit(char *sp, char **arg, char *file, int pushed)
 			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",
@@ -1063,7 +1000,7 @@ sendit(char *sp, char **arg, char *file, int pushed)
 		dp = getcpy(cp);
 		for (ap = brkstring(dp, " ", "\n"); ap && *ap; ap++) {
 			vec[vecp++] = "-alias";
-			vec[vecp++] = *ap;
+			vec[vecp++] = getcpy(etcpath(*ap));
 		}
 	}