X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/61e09274bb3338efbd9c50f797751853c99dba3b..17b9beb40640e8731143f61e3b94756f3e77d20c:/uip/post.c

diff --git a/uip/post.c b/uip/post.c
index 716f70e3..239ecdfc 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -1071,7 +1071,7 @@ get_header (char *header, struct headers *table)
     struct headers *h;
 
     for (h = table; h->value; h++)
-	if (!mh_strcasecmp (header, h->value))
+	if (!strcasecmp (header ? header : "", h->value ? h->value : ""))
 	    return (h - table);
 
     return NOTOK;
@@ -1172,9 +1172,11 @@ insert (struct mailname *np)
 	    : &netaddrs;
 	    mp->m_next;
 	    mp = mp->m_next)
-	if (!mh_strcasecmp (np->m_host, mp->m_next->m_host)
-		&& !mh_strcasecmp (np->m_mbox, mp->m_next->m_mbox)
-		&& np->m_bcc == mp->m_next->m_bcc)
+	if (!strcasecmp (np->m_host ? np->m_host : "",
+			 mp->m_next->m_host ? mp->m_next->m_host : "") &&
+	    !strcasecmp (np->m_mbox ? np->m_mbox : "",
+			 mp->m_next->m_mbox ? mp->m_next->m_mbox : "") &&
+	    np->m_bcc == mp->m_next->m_bcc)
 	    return 0;
 
     mp->m_next = np;
@@ -1506,7 +1508,8 @@ post (char *file, int bccque, int talk, char *envelope)
     sigon ();
 
     if (sm_mts == MTS_SENDMAIL_PIPE) {
-	char *sargv[16], **argp;
+	char **argp, *program;
+	int argc;
 
 	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
 	    sleep (5);
@@ -1519,17 +1522,16 @@ post (char *file, int bccque, int talk, char *envelope)
 		    adios (file, "can't reopen for sendmail");
 		}
 
-		argp = sargv;
-		*argp++ = "sendmail";
-		*argp++ = "-t"; /* read msg for recipients */
-		*argp++ = "-i"; /* don't stop on "." */
+		argp = argsplit(sendmail, &program, &argc);
+		argp[argc++] = "-t"; /* read msg for recipients */
+		argp[argc++] = "-i"; /* don't stop on "." */
 		if (whomsw)
-		    *argp++ = "-bv";
+		    argp[argc++] = "-bv";
 		if (snoop)
-		    *argp++ = "-v";
-		*argp = NULL;
+		    argp[argc++] = "-v";
+		argp[argc] = NULL;
 
-		execv (sendmail, sargv);
+		execv (program, argp);
 		adios (sendmail, "can't exec");
 
 	    default: