X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fspost.c;h=262e84db13196030d382bb5edfdb9171dbf57a58;hp=e87fcf1c26f80104a9526bc57917bc6253df8915;hb=f12a3e5036a986f579b80861f4421bcb86f84cee;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/uip/spost.c b/uip/spost.c
index e87fcf1..262e84d 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -123,7 +123,7 @@ static struct headers RHeaders[] = {
 	{ "Resent-Date", HNOP, MRDT },
 	{ "Resent-Subject", HSUB, 0 },
 	{ "Resent-To", HADR|HTRY, MVIS },
-	{ "Resent-cc", HADR|HTRY, MVIS },
+	{ "Resent-Cc", HADR|HTRY, MVIS },
 	{ "Resent-Bcc", HADR|HTRY|HBCC, MINV },
 	{ "Resent-Message-Id", HBAD, 0 },
 	{ "Resent-Fcc", HFCC, 0 },
@@ -142,7 +142,7 @@ static int rmflg = 1;  /* remove temporary file when done */
 static int watch = 0;  /* watch the delivery process */
 static int backflg = 0;  /* rename input file as *.bak when done */
 static int pushflg = 0;  /* if going to fork to sendmail */
-static int aliasflg = -1;  /* if going to process aliases */
+static int aliasflg = 0;  /* if going to process aliases */
 static int outputlinelen=72;
 
 static unsigned msgflags = 0;  /* what we've seen */
@@ -202,7 +202,7 @@ main(int argc, char **argv)
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex(argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 
 	/* foil search of user profile/context */
 	if (context_foil(NULL) == -1)
@@ -284,10 +284,6 @@ main(int argc, char **argv)
 				case ALIASW:
 					if (!(cp = *argp++) || *cp == '-')
 						adios(NULL, "missing argument to %s", argp[-2]);
-					if (aliasflg < 0) {
-						/* load default aka's */
-						alias(AliasFile);
-					}
 					aliasflg = 1;
 					if ((state = alias(cp)) != AK_OK)
 						adios(NULL, "aliasing error in file %s - %s", cp, akerror(state) );
@@ -325,9 +321,6 @@ main(int argc, char **argv)
 			msg = cp;
 	}
 
-	if (aliasflg < 0)
-		alias(AliasFile);  /* load default aka's */
-
 	if (!msg)
 		adios(NULL, "usage: %s [switches] file", invo_name);
 
@@ -795,7 +788,7 @@ make_bcc_file(void)
 		cpydgst(fd, fileno(out), tmpfil, bccfil);
 		close(fd);
 	} else {
-		vec[0] = r1bindex(mhlproc, '/');
+		vec[0] = mhbasename(mhlproc);
 
 		for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
 			sleep(5);
@@ -871,7 +864,7 @@ fcc(char *file, char *folder)
 		case OK:
 			snprintf(fold, sizeof(fold), "%s%s",
 				*folder == '+' || *folder == '@' ? "" : "+", folder);
-			execlp(fileproc, r1bindex(fileproc, '/'),
+			execlp(fileproc, mhbasename(fileproc),
 				"-link", "-file", file, fold, NULL);
 			_exit(-1);