X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/98e0149bd139b5eb98a89b418b08ec5e6861b7cb..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 1e9f3c60..069e3ce5 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -176,10 +176,9 @@ maildir_srt(const void *va, const void *vb)
     const struct Maildir_entry *a = va, *b = vb;
     if (a->mtime > b->mtime)
       return 1;
-    else if (a->mtime < b->mtime)
+    if (a->mtime < b->mtime)
       return -1;
-    else
-      return 0;
+    return 0;
 }
 
 int
@@ -413,25 +412,21 @@ main (int argc, char **argv)
      * a POP server?
      */
     if (inc_type == INC_POP) {
-	struct nmh_creds creds = { 0, 0, 0 };
-
 	if (auth_svc == NULL) {
 	    if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
 		adios (NULL, "must specify -authservice with -saslmech xoauth2");
 	    }
-	    nmh_get_credentials (host, user, sasl, &creds);
 	} else {
 	    if (user == NULL) {
 		adios (NULL, "must specify -user with -saslmech xoauth2");
 	    }
-	    creds.user = user;
 	}
 
 	/*
 	 * initialize POP connection
 	 */
-	if (pop_init (host, port, creds.user, creds.password, proxy, snoop,
-		      sasl, saslmech, tls, auth_svc) == NOTOK)
+	if (pop_init (host, port, user, proxy, snoop, sasl, saslmech,
+		      tls, auth_svc) == NOTOK)
 	    adios (NULL, "%s", response);
 
 	/* Check if there are any messages */
@@ -511,7 +506,7 @@ main (int argc, char **argv)
  	    qsort (Maildir, num_maildir_entries, sizeof(*Maildir), maildir_srt);
  	}
 
-	if ((cp = strdup(newmail)) == (char *)0)
+	if ((cp = strdup(newmail)) == NULL)
 	    adios (NULL, "error allocating memory to copy newmail");
 
 	newmail = cp;
@@ -527,7 +522,7 @@ main (int argc, char **argv)
 	folder = getfolder (0);
     maildir = m_maildir (folder);
 
-    if ((maildir_copy = strdup(maildir)) == (char *)0)
+    if ((maildir_copy = strdup(maildir)) == NULL)
         adios (maildir, "error allocating memory to copy maildir");
 
     if (!folder_exists(maildir)) {
@@ -653,7 +648,7 @@ go_to_it:
 		    adios (packfile, "write error on");
 		fseek (pf, start, SEEK_SET);
 	    } else {
-		cp = getcpy (m_name (msgnum));
+		cp = mh_xstrdup(m_name (msgnum));
 		if ((pf = fopen (cp, "w+")) == NULL)
 		    adios (cp, "unable to write");
 		chmod (cp, m_gmprot ());
@@ -771,7 +766,7 @@ go_to_it:
 		 */
 
 		(void)snprintf(b, sizeof (b), "%s/%d", maildir_copy, msgnum + 1);
-		(void)ext_hook("add-hook", b, (char *)0);
+		(void)ext_hook("add-hook", b, NULL);
 
 		if (aud)
 		    fputs (charstring_buffer (scanl), aud);
@@ -800,7 +795,7 @@ go_to_it:
 	    msgnum++;
 
 	    sp = Maildir[i].filename;
-	    cp = getcpy (m_name (msgnum));
+	    cp = mh_xstrdup(m_name (msgnum));
 	    pf = NULL;
 	    if (!trnflag || link(sp, cp) == -1) {
 		static char buf[65536];
@@ -852,7 +847,7 @@ go_to_it:
 		 */
 
 		(void)snprintf(b, sizeof (b), "%s/%d", maildir_copy, msgnum + 1);
-		(void)ext_hook("add-hook", b, (char *)0);
+		(void)ext_hook("add-hook", b, NULL);
 
 		if (aud)
 		    fputs (charstring_buffer (scanl), aud);