X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fslocal.c;h=837f038d71ab2c55ca5b126c1f9c455bbfc6a0af;hb=a1c4e3d343ae3cf290466a81f470d74dbd839d05;hp=9d468025e5e7e0fc87091524d1fcb7239c4b0a8a;hpb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9;p=mmh

diff --git a/uip/slocal.c b/uip/slocal.c
index 9d46802..837f038 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -162,7 +162,7 @@ static int copy_message(int, char *, int);
 static void verbose_printf(char *fmt, ...);
 static void adorn(char *, char *, ...);
 static void debug_printf(char *fmt, ...);
-static char *trim(char *);
+static char *trimstr(char *);
 
 
 int
@@ -177,10 +177,6 @@ main(int argc, char **argv)
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(*argv);
 
-	/* foil search of user profile/context */
-	if (context_foil(NULL) == -1) {
-		done(1);
-	}
 	arguments = getarguments(invo_name, argc, argv, 0);
 	argp = arguments;
 
@@ -386,15 +382,15 @@ main(int argc, char **argv)
 	}
 
 	if (debug) {
-		debug_printf("addr=\"%s\"\n", trim(addr));
-		debug_printf("user=\"%s\"\n", trim(user));
-		debug_printf("info=\"%s\"\n", trim(info));
-		debug_printf("sender=\"%s\"\n", trim(sender));
+		debug_printf("addr=\"%s\"\n", trimstr(addr));
+		debug_printf("user=\"%s\"\n", trimstr(user));
+		debug_printf("info=\"%s\"\n", trimstr(info));
+		debug_printf("sender=\"%s\"\n", trimstr(sender));
 		debug_printf("envelope=\"%s\"\n",
-				envelope ? trim(envelope) : "");
-		debug_printf("mbox=\"%s\"\n", trim(mbox));
-		debug_printf("home=\"%s\"\n", trim(home));
-		debug_printf("ddate=\"%s\"\n", trim(ddate));
+				envelope ? trimstr(envelope) : "");
+		debug_printf("mbox=\"%s\"\n", trimstr(mbox));
+		debug_printf("home=\"%s\"\n", trimstr(home));
+		debug_printf("ddate=\"%s\"\n", trimstr(ddate));
 		debug_printf("now=%02d:%02d\n\n", now->tw_hour, now->tw_min);
 	}
 
@@ -487,7 +483,7 @@ usr_delivery(int fd, char *delivery, int su)
 		if (debug) {
 			for (i = 0; vec[i]; i++) {
 				debug_printf("vec[%d]: \"%s\"\n",
-						i, trim(vec[i]));
+						i, trimstr(vec[i]));
 			}
 		}
 
@@ -828,14 +824,14 @@ parse(int fd)
 		p->p_flags &= ~P_CHK;
 		if (debug) {
 			debug_printf("vars[%d]: name=\"%s\" value=\"%s\"\n",
-					p - vars, p->p_name, trim(p->p_value));
+					p - vars, p->p_name, trimstr(p->p_value));
 		}
 	}
 	if (debug) {
 		for (p = hdrs; p->p_name; p++) {
 			debug_printf("hdrs[%d]: name=\"%s\" value=\"%s\"\n",
 					p - hdrs, p->p_name,
-					p->p_value ? trim(p->p_value) : "");
+					p->p_value ? trimstr(p->p_value) : "");
 		}
 	}
 	return 0;
@@ -913,7 +909,7 @@ glob(int fd)
 	if (debug) {
 		for (p = vars; p->p_name; p++) {
 			debug_printf("vars[%d]: name=\"%s\" value=\"%s\"\n",
-					p - vars, p->p_name, trim(p->p_value));
+					p - vars, p->p_name, trimstr(p->p_value));
 		}
 	}
 }
@@ -1241,7 +1237,7 @@ fputs_error:
 ** Trim strings for pretty printing of debugging output
 */
 static char *
-trim(char *cp)
+trimstr(char *cp)
 {
 	char buffer[BUFSIZ*4];
 	unsigned char *bp, *sp;