Alter HasSuffixC()'s char * to be const.

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index c61ea052a6ad467cd1d4898d84dc53c713e91bb4..497c868b2bbfb229ae8f603b7a9da5ffc3e0db7a 100644 (file)
--- 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:
        break;
 
     case OK:

-       buildvec = argsplit(buildmimeproc, &buildprogram, &i);
+        buildvec = argsplit(buildmimeproc, &buildprogram, &i);

        buildvec[i++] = "-auto";
        if (distfile)
            buildvec[i++] = "-dist";
        buildvec[i++] = "-auto";
        if (distfile)
            buildvec[i++] = "-dist";


@@ -129,9 +129,15 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
         */
 
        if (auth_svc) {
         */
 
        if (auth_svc) {

+#ifdef OAUTH_SUPPORT

                const char *errmsg;
                const char *errmsg;

-               if (!setup_oauth_params(vec, nvecsp, auth_svc, &errmsg))
-                       adios(NULL, "%s", errmsg);
+               if (setup_oauth_params(vec, nvecsp, auth_svc, &errmsg) != OK) {
+                       adios(NULL, errmsg);
+               }
+#else
+                adios(NULL, "send built without OAUTH_SUPPORT, "
+                      "so auth_svc %s is not supported", auth_svc);
+#endif /* OAUTH_SUPPORT */

        }
 
         /*
        }
 
         /*


@@ -292,8 +298,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     /* Only one part, nothing to split */
     if (nparts == 1) {
        free (cp);
     /* 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);
 
        fclose (in);
        return sendaux (vec, vecp, program, drft, st);


@@ -371,7 +376,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
        fclose (out);
 
        if (!pushsw && verbsw) {
        fclose (out);
 
        if (!pushsw && verbsw) {

-           printf ("\n");
+           putchar('\n');

            fflush (stdout);
        }
 
            fflush (stdout);
        }
 


@@ -399,8 +404,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     }
 
     free (cp);
     }
 
     free (cp);

-    if (dp)
-       free (dp);
+    mh_xfree(dp);

 
     fclose (in);       /* close the draft */
     return status;
 
     fclose (in);       /* close the draft */
     return status;


@@ -616,7 +620,7 @@ anno (int fd, struct stat *st)
                advise (NULL,
                            "unable to fork, so doing annotations by hand...");
            if (cwd == NULL)
                advise (NULL,
                            "unable to fork, so doing annotations by hand...");
            if (cwd == NULL)

-               cwd = getcpy (pwd ());
+               cwd = mh_xstrdup(pwd ());

 
        case OK:
            /* block a few signals */
 
        case OK:
            /* block a few signals */


@@ -695,7 +699,7 @@ annoaux (int fd)
     }
     else
        fd2 = NOTOK;
     }
     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)
        m_convert (mp, *ap);
     free (cp);
     if (fd2 != NOTOK)


@@ -764,7 +768,8 @@ handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc) {
                 }
                 break;
 #else
                 }
                 break;
 #else

-                adios(NULL, "sendfrom built without OAUTH_SUPPORT, "
+                NMH_UNUSED(auth_svc);
+                adios(NULL, "send built without OAUTH_SUPPORT, "

                       "so -saslmech xoauth2 is not supported");
 #endif /* OAUTH_SUPPORT */
             }
                       "so -saslmech xoauth2 is not supported");
 #endif /* OAUTH_SUPPORT */
             }


@@ -814,20 +819,22 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
                                            sizeof(errbuf)))
                adios(NULL, "Unable to retrieve oauth profile entries: %s",
                      errbuf);
                                            sizeof(errbuf)))
                adios(NULL, "Unable to retrieve oauth profile entries: %s",
                      errbuf);

-           
-           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(svc.client_id);

-           vec[(*vecp)++] = getcpy("-oauthclientsecret");
+           vec[(*vecp)++] = mh_xstrdup("-oauthclientsecret");

            vec[(*vecp)++] = getcpy(svc.client_secret);
            vec[(*vecp)++] = getcpy(svc.client_secret);

-           vec[(*vecp)++] = getcpy("-oauthauthendpoint");
+           vec[(*vecp)++] = mh_xstrdup("-oauthauthendpoint");

            vec[(*vecp)++] = getcpy(svc.auth_endpoint);
            vec[(*vecp)++] = getcpy(svc.auth_endpoint);

-           vec[(*vecp)++] = getcpy("-oauthredirect");
+           vec[(*vecp)++] = mh_xstrdup("-oauthredirect");

            vec[(*vecp)++] = getcpy(svc.redirect_uri);
            vec[(*vecp)++] = getcpy(svc.redirect_uri);

-           vec[(*vecp)++] = getcpy("-oauthtokenendpoint");
+           vec[(*vecp)++] = mh_xstrdup("-oauthtokenendpoint");

            vec[(*vecp)++] = getcpy(svc.token_endpoint);
            vec[(*vecp)++] = getcpy(svc.token_endpoint);

-           vec[(*vecp)++] = getcpy("-oauthscope");
+           vec[(*vecp)++] = mh_xstrdup("-oauthscope");

            vec[(*vecp)++] = getcpy(svc.scope);
         }
     }
            vec[(*vecp)++] = getcpy(svc.scope);
         }
     }


@@ -858,7 +865,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  ||
         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})";
 
             addrformat = distfile == NULL  ?  "%(addr{Sender})"  :  "%(addr{Resent-Sender})";
             hostformat = distfile == NULL  ?  "%(host{Sender})"  :  "%(host{Resent-Sender})";
 


@@ -884,10 +891,10 @@ get_from_header_info(const char *filename, const char **addr, const char **host,
         fclose(in);
 
         return OK;
         fclose(in);
 
         return OK;

-    } else {
-        *message = "unable to open";
-        return NOTOK;

     }
     }

+
+    *message = "unable to open";
+    return NOTOK;

 }
 
 
 }
 
 


@@ -954,12 +961,11 @@ get_message_header_info(FILE *in, char *format) {
     /* Trim trailing newline, if any. */
     retval = rtrim(charstring_buffer_copy((buffer)));
     charstring_free(buffer);
     /* Trim trailing newline, if any. */
     retval = rtrim(charstring_buffer_copy((buffer)));
     charstring_free(buffer);

-    if (strlen (retval) > 0) {
+    if (*retval)

         return retval;
         return retval;

-    } else {
-        free (retval);
-        return NULL;
-    }
+
+    free(retval);
+    return NULL;

 }
 
 
 }
 
 


@@ -989,7 +995,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. */
     }
 
     /* 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);
         int profile_vecp;
         char *file;
         char **profile_vec = argsplit(profile_entry, &file, &profile_vecp);