X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5e4d1f2f9dc08f2b6bc3d6a463e8a1dd3ec29974..9322ba2854211794c27fae9468768b80b767c211:/uip/sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index ddce3a45..6409aeca 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -88,7 +88,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
 	break;
 
     case OK:
-	buildvec = argsplit(buildmimeproc, &buildprogram, &i);
+        buildvec = argsplit(buildmimeproc, &buildprogram, &i);
 	buildvec[i++] = "-auto";
 	if (distfile)
 	    buildvec[i++] = "-dist";
@@ -286,7 +286,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 
     nparts = 1;
     pos = start;
-    while (fgets (buffer, sizeof(buffer) - 1, in)) {
+    while (fgets (buffer, sizeof buffer, in)) {
 	long len;
 
 	if ((pos += (len = strlen (buffer))) > CPERMSG) {
@@ -298,8 +298,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     /* Only one part, nothing to split */
     if (nparts == 1) {
 	free (cp);
-	if (dp)
-	    free (dp);
+        mh_xfree(dp);
 
 	fclose (in);
 	return sendaux (vec, vecp, program, drft, st);
@@ -357,7 +356,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 	for (;;) {
 	    long len;
 
-	    if (!fgets (buffer, sizeof(buffer) - 1, in)) {
+	    if (!fgets (buffer, sizeof buffer, in)) {
 		if (partno == nparts)
 		    break;
 		adios (NULL, "premature eof");
@@ -377,7 +376,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 	fclose (out);
 
 	if (!pushsw && verbsw) {
-	    printf ("\n");
+	    putchar('\n');
 	    fflush (stdout);
 	}
 
@@ -405,8 +404,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     }
 
     free (cp);
-    if (dp)
-	free (dp);
+    mh_xfree(dp);
 
     fclose (in);	/* close the draft */
     return status;
@@ -524,6 +522,7 @@ alert (char *file, int out)
 	case NOTOK:
 	    /* oops -- fork error */
 	    advise ("fork", "unable to");
+	    /* FALLTHRU */
 
 	case OK:
 	    /* child process -- send it */
@@ -622,7 +621,8 @@ anno (int fd, struct stat *st)
 		advise (NULL,
 			    "unable to fork, so doing annotations by hand...");
 	    if (cwd == NULL)
-		cwd = getcpy (pwd ());
+		cwd = mh_xstrdup(pwd ());
+	    /* FALLTHRU */
 
 	case OK:
 	    /* block a few signals */
@@ -701,7 +701,7 @@ annoaux (int fd)
     }
     else
 	fd2 = NOTOK;
-    for (ap = brkstring (cp = getcpy (cp), " ", NULL); *ap; ap++)
+    for (ap = brkstring (cp = mh_xstrdup(cp), " ", NULL); *ap; ap++)
 	m_convert (mp, *ap);
     free (cp);
     if (fd2 != NOTOK)
@@ -770,6 +770,7 @@ handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc) {
                 }
                 break;
 #else
+                NMH_UNUSED(auth_svc);
                 adios(NULL, "send built without OAUTH_SUPPORT, "
                       "so -saslmech xoauth2 is not supported");
 #endif /* OAUTH_SUPPORT */
@@ -821,21 +822,21 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
 		adios(NULL, "Unable to retrieve oauth profile entries: %s",
 		      errbuf);
 
-	    vec[(*vecp)++] = getcpy("-authservice");
-	    vec[(*vecp)++] = getcpy(auth_svc);
-	    vec[(*vecp)++] = getcpy("-oauthcredfile");
-	    vec[(*vecp)++] = getcpy(mh_oauth_cred_fn(auth_svc));
-	    vec[(*vecp)++] = getcpy("-oauthclientid");
+	    vec[(*vecp)++] = mh_xstrdup("-authservice");
+	    vec[(*vecp)++] = mh_xstrdup(auth_svc);
+	    vec[(*vecp)++] = mh_xstrdup("-oauthcredfile");
+	    vec[(*vecp)++] = mh_xstrdup(mh_oauth_cred_fn(auth_svc));
+	    vec[(*vecp)++] = mh_xstrdup("-oauthclientid");
 	    vec[(*vecp)++] = getcpy(svc.client_id);
-	    vec[(*vecp)++] = getcpy("-oauthclientsecret");
+	    vec[(*vecp)++] = mh_xstrdup("-oauthclientsecret");
 	    vec[(*vecp)++] = getcpy(svc.client_secret);
-	    vec[(*vecp)++] = getcpy("-oauthauthendpoint");
+	    vec[(*vecp)++] = mh_xstrdup("-oauthauthendpoint");
 	    vec[(*vecp)++] = getcpy(svc.auth_endpoint);
-	    vec[(*vecp)++] = getcpy("-oauthredirect");
+	    vec[(*vecp)++] = mh_xstrdup("-oauthredirect");
 	    vec[(*vecp)++] = getcpy(svc.redirect_uri);
-	    vec[(*vecp)++] = getcpy("-oauthtokenendpoint");
+	    vec[(*vecp)++] = mh_xstrdup("-oauthtokenendpoint");
 	    vec[(*vecp)++] = getcpy(svc.token_endpoint);
-	    vec[(*vecp)++] = getcpy("-oauthscope");
+	    vec[(*vecp)++] = mh_xstrdup("-oauthscope");
 	    vec[(*vecp)++] = getcpy(svc.scope);
         }
     }
@@ -866,7 +867,7 @@ get_from_header_info(const char *filename, const char **addr, const char **host,
         char *hostformat = "%(host{Envelope-From})";
 
         if ((*addr = get_message_header_info (in, addrformat)) == NULL  ||
-            strlen (*addr) == 0) {
+            !**addr) {
             addrformat = distfile == NULL  ?  "%(addr{Sender})"  :  "%(addr{Resent-Sender})";
             hostformat = distfile == NULL  ?  "%(host{Sender})"  :  "%(host{Resent-Sender})";
 
@@ -892,10 +893,10 @@ get_from_header_info(const char *filename, const char **addr, const char **host,
         fclose(in);
 
         return OK;
-    } else {
-        *message = "unable to open";
-        return NOTOK;
     }
+
+    *message = "unable to open";
+    return NOTOK;
 }
 
 
@@ -962,12 +963,11 @@ get_message_header_info(FILE *in, char *format) {
     /* Trim trailing newline, if any. */
     retval = rtrim(charstring_buffer_copy((buffer)));
     charstring_free(buffer);
-    if (strlen (retval) > 0) {
+    if (*retval)
         return retval;
-    } else {
-        free (retval);
-        return NULL;
-    }
+
+    free(retval);
+    return NULL;
 }
 
 
@@ -997,7 +997,7 @@ merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp)
     }
 
     /* Use argsplit() to do the real work of splitting the args in the profile entry. */
-    if (profile_entry  &&  strlen(profile_entry) > 0) {
+    if (profile_entry && *profile_entry) {
         int profile_vecp;
         char *file;
         char **profile_vec = argsplit(profile_entry, &file, &profile_vecp);