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

[nmh] / uip / forwsbr.c

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 592f1eb26adfffddd99550ece339a9425c0c3878..3943071b651bc0f94b144c58831566826e8cbdee 100644 (file)
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -19,7 +19,7 @@
  */
 
 static char msgbuf[256];
  */
 
 static char msgbuf[256];

-#define COMPFREE(c) if (c->c_text) free(c->c_text)
+#define COMPFREE(c) mh_xfree(c->c_text)

 
 /*
  * A list of components we treat as addresses
 
 /*
  * A list of components we treat as addresses


@@ -48,13 +48,14 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
     int        in;
     int fmtsize, state;
     int i;
     int        in;
     int fmtsize, state;
     int i;

-    register char *nfs;
-    char *line, tmpfil[BUFSIZ], name[NAMESZ], **ap;
+    char *nfs;
+    char tmpfil[BUFSIZ], name[NAMESZ], **ap;
+    charstring_t line;

     FILE *tmp;
     FILE *tmp;

-    register struct comp *cptr;
+    struct comp *cptr;

     struct format *fmt;
     char *cp = NULL;
     struct format *fmt;
     char *cp = NULL;

-    m_getfld_state_t gstate;
+    m_getfld_state_t gstate = 0;

 
     /*
      * Open the message we'll be scanning for components
 
     /*
      * Open the message we'll be scanning for components


@@ -87,10 +88,9 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
      * these routines?
      */
 
      * these routines?
      */
 

-    m_getfld_state_init (&gstate);

     for (;;) {
        int msg_count = sizeof msgbuf;
     for (;;) {
        int msg_count = sizeof msgbuf;

-       state = m_getfld (gstate, name, msgbuf, &msg_count, tmp);
+       state = m_getfld (&gstate, name, msgbuf, &msg_count, tmp);

        switch (state) {
            case FLD:
            case FLDPLUS:
        switch (state) {
            case FLD:
            case FLDPLUS:


@@ -104,13 +104,14 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
                if (i != -1) {
                    while (state == FLDPLUS) {
                        msg_count = sizeof msgbuf;
                if (i != -1) {
                    while (state == FLDPLUS) {
                        msg_count = sizeof msgbuf;

-                       state = m_getfld (gstate, name, msgbuf, &msg_count, tmp);
+                       state = m_getfld (&gstate, name, msgbuf, &msg_count, tmp);

                        fmt_appendcomp(i, name, msgbuf);
                    }
                }
                        fmt_appendcomp(i, name, msgbuf);
                    }
                }

-               while (state == FLDPLUS)
+               while (state == FLDPLUS) {

                    msg_count = sizeof msgbuf;
                    msg_count = sizeof msgbuf;

-                   state = m_getfld (gstate, name, msgbuf, &msg_count, tmp);
+                   state = m_getfld (&gstate, name, msgbuf, &msg_count, tmp);
+               }

                break;
 
            case LENERR:
                break;
 
            case LENERR:


@@ -123,7 +124,6 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
                adios(NULL, "m_getfld() returned %d", state);
        }
     }
                adios(NULL, "m_getfld() returned %d", state);
        }
     }

-    m_getfld_state_destroy (&gstate);

 
     /*
      * Override any components just in case they were included in the
 
     /*
      * Override any components just in case they were included in the


@@ -136,6 +136,7 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
      */
 
 finished:
      */
 
 finished:

+    m_getfld_state_destroy (&gstate);

 
     cptr = fmt_findcomp ("digest");
     if (cptr) {
 
     cptr = fmt_findcomp ("digest");
     if (cptr) {


@@ -174,16 +175,18 @@ finished:
     }
 
     cp = m_mktemp2(NULL, invo_name, NULL, &tmp);
     }
 
     cp = m_mktemp2(NULL, invo_name, NULL, &tmp);

-    if (cp == NULL) adios("forw", "unable to create temporary file");
+    if (cp == NULL) {
+       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+    }

     strncpy (tmpfil, cp, sizeof(tmpfil));
     strncpy (tmpfil, cp, sizeof(tmpfil));

-    unlink (tmpfil);
+    (void) m_unlink (tmpfil);

     if ((in = dup (fileno (tmp))) == NOTOK)
        adios ("dup", "unable to");
 
     if ((in = dup (fileno (tmp))) == NOTOK)
        adios ("dup", "unable to");
 

-    line = mh_xmalloc ((unsigned) fmtsize);
-    fmt_scan (fmt, line, fmtsize - 1, fmtsize, dat);
-    fputs (line, tmp);
-    free (line);
+    line = charstring_create (fmtsize);
+    fmt_scan (fmt, line, fmtsize, dat, NULL);
+    fputs (charstring_buffer (line), tmp);
+    charstring_free (line);

     if (fclose (tmp))
        adios (tmpfil, "error writing");
 
     if (fclose (tmp))
        adios (tmpfil, "error writing");