X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=79f7c6f919af735baa1b297ebea2971dc5ae3da9;hb=4d4f3e6367922ac4237d87ccfb070dbbcb6ff6be;hp=e958ef37ed16feb978cfafdb44a3d82ccc2a29dc;hpb=dba36faad141d652c7b84d26295537c76fd2b5be;p=mmh

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index e958ef3..79f7c6f 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -608,9 +608,6 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 
 #ifdef HAVE_LSTAT
 	int slinked = 0;
-#if 0
-	int oumask;  /* PJS: for setting permissions on symlinks. */
-#endif
 #endif /* HAVE_LSTAT */
 
 	/* Was there a previous edit session? */
@@ -648,15 +645,7 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 		unlink(linkpath);
 #ifdef HAVE_LSTAT
 		if (link(altpath, linkpath) == NOTOK) {
-#if 0
-			/* I don't think permission on symlinks matters /JLR */
-			/* PJS: else symlinks are world 'r' */
-			oumask = umask(0044);
-#endif
 			symlink(altpath, linkpath);
-#if 0
-			umask(oumask);  /* PJS: else symlinks are world 'r' */
-#endif
 			slinked = 1;
 		} else {
 			slinked = 0;
@@ -853,56 +842,28 @@ 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
+#define UNIQSW  10
 	{ "unique", -6 },
-#define NUNIQSW  15
+#define NUNIQSW  11
 	{ "nounique", -8 },
-#define VERBSW  16
+#define VERBSW  12
 	{ "verbose", 0 },
-#define NVERBSW  17
+#define NVERBSW  13
 	{ "noverbose", 0 },
-#define WATCSW  18
+#define WATCSW  14
 	{ "watch", 0 },
-#define NWATCSW  19
+#define NWATCSW  15
 	{ "nowatch", 0 },
-#define WIDTHSW  20
+#define WIDTHSW  16
 	{ "width columns", 0 },
-#define SVERSIONSW  21
+#define SVERSIONSW  17
 	{ "version", 0 },
-#define SHELPSW  22
+#define SHELPSW  18
 	{ "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 }
 };
 
@@ -930,9 +891,6 @@ sendit(char *sp, char **arg, char *file, int pushed)
 #ifndef lint
 	int distsw = 0;
 #endif
-#ifdef UCI
-	FILE *fp;
-#endif
 
 	/*
 	** Make sure these are defined.  In particular, we need
@@ -1033,28 +991,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",
@@ -1081,21 +1025,9 @@ sendit(char *sp, char **arg, char *file, int pushed)
 		}
 	}
 
-	if ((cp = getenv("SIGNATURE")) == NULL || *cp == 0)
+	if (!(cp = getenv("SIGNATURE")) || !*cp)
 		if ((cp = context_find("signature")) && *cp)
 			m_putenv("SIGNATURE", cp);
-#ifdef UCI
-		else {
-			snprintf(buf, sizeof(buf), "%s/.signature", mypath);
-			if ((fp = fopen(buf, "r")) != NULL &&
-					fgets(buf, sizeof(buf), fp) != NULL) {
-				fclose(fp);
-				if (cp = strchr(buf, '\n'))
-					*cp = 0;
-				m_putenv("SIGNATURE", buf);
-			}
-		}
-#endif /* UCI */
 
 	if ((annotext = getenv("mhannotate")) == NULL || *annotext == 0)
 		annotext = NULL;