Remove unused variable, and make sure we free c_dispo_type.

[nmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index a023e9146d9fb0346c26fcce71647ac60240235c..a07889e48b424cced88deee44d9e1b93d0f3e6db 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -36,6 +36,7 @@ static struct comp **used_buf = 0;    /* stack for comp that use buffers */
 static int dat[5];                     /* aux. data for format routine    */
 
 char *scanl = 0;                       /* text of most recent scanline    */
 static int dat[5];                     /* aux. data for format routine    */
 
 char *scanl = 0;                       /* text of most recent scanline    */

+m_getfld_state_t gstate;               /* for access by msh */

 
 #define DIEWRERR() adios (scnmsg, "write error on")
 
 
 #define DIEWRERR() adios (scnmsg, "write error on")
 


@@ -60,8 +61,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
       int unseen, char *folder, long size, int noisy)
 {
     int i, compnum, encrypted, state;
       int unseen, char *folder, long size, int noisy)
 {
     int i, compnum, encrypted, state;

-    unsigned char *cp, *tmpbuf, *startbody;
-    char **nxtbuf;
+    char *cp, *tmpbuf, *startbody, **nxtbuf;

     char *saved_c_text = NULL;
     struct comp *cptr;
     struct comp **savecomp;
     char *saved_c_text = NULL;
     struct comp *cptr;
     struct comp **savecomp;


@@ -164,7 +164,8 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
      * and we're doing an "inc", open the output file.
      */
     bufsz = rlwidth;
      * and we're doing an "inc", open the output file.
      */
     bufsz = rlwidth;

-    if ((state = m_getfld (FLD, name, tmpbuf, &bufsz, inb)) == FILEEOF) {
+    m_getfld_state_reset (&gstate);
+    if ((state = m_getfld (&gstate, name, tmpbuf, &bufsz, inb)) == FILEEOF) {

        if (ferror(inb)) {
            advise("read", "unable to"); /* "read error" */
            return SCNFAT;
        if (ferror(inb)) {
            advise("read", "unable to"); /* "read error" */
            return SCNFAT;


@@ -187,7 +188,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 
     /* scan - main loop */
     for (compnum = 1; ;
 
     /* scan - main loop */
     for (compnum = 1; ;

-        bufsz = rlwidth, state = m_getfld (state, name, tmpbuf, &bufsz, inb)) {
+       bufsz = rlwidth, state = m_getfld (&gstate, name, tmpbuf, &bufsz, inb)) {

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


@@ -208,7 +209,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                        cptr->c_text = tmpbuf;
                        for (cp = tmpbuf + strlen (tmpbuf) - 1; 
                                        cp >= tmpbuf; cp--)
                        cptr->c_text = tmpbuf;
                        for (cp = tmpbuf + strlen (tmpbuf) - 1; 
                                        cp >= tmpbuf; cp--)

-                           if (isspace (*cp))
+                           if (isspace ((unsigned char) *cp))

                                *cp = 0;
                            else
                                break;
                                *cp = 0;
                            else
                                break;


@@ -219,7 +220,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 
                while (state == FLDPLUS) {
                    bufsz = rlwidth;
 
                while (state == FLDPLUS) {
                    bufsz = rlwidth;

-                   state = m_getfld (state, name, tmpbuf, &bufsz, inb);
+                   state = m_getfld (&gstate, name, tmpbuf, &bufsz, inb);

                    if (outnum)
                        FPUTS (tmpbuf);
                }
                    if (outnum)
                        FPUTS (tmpbuf);
                }


@@ -234,7 +235,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 
                if ((i = strlen(tmpbuf)) < rlwidth) {
                    bufsz = rlwidth - i;
 
                if ((i = strlen(tmpbuf)) < rlwidth) {
                    bufsz = rlwidth - i;

-                   state = m_getfld (state, name, tmpbuf + i, &bufsz, inb);
+                   state = m_getfld (&gstate, name, tmpbuf + i, &bufsz, inb);

                }
 
                if (! outnum) {
                }
 
                if (! outnum) {


@@ -269,17 +270,19 @@ body:;
 
                while (state == BODY) {
                    bufsz = rlwidth;
 
                while (state == BODY) {
                    bufsz = rlwidth;

-                   state = m_getfld(state, name, tmpbuf, &bufsz, inb);
+                   state = m_getfld (&gstate, name, tmpbuf, &bufsz, inb);

                    FPUTS(tmpbuf);
                }
                goto finished;
 
            case LENERR: 
            case FMTERR: 
                    FPUTS(tmpbuf);
                }
                goto finished;
 
            case LENERR: 
            case FMTERR: 

-               fprintf (stderr, 
-                       innum ? "??Format error (message %d) in "
-                             : "??Format error in ",
-                       outnum ? outnum : innum);
+               if (innum)
+                   fprintf (stderr, "??Format error (message %d) in ",
+                            outnum ? outnum : innum);
+               else
+                   fprintf (stderr, "??Format error in ");
+

                fprintf (stderr, "component %d\n", compnum);
 
                if (outnum) {
                fprintf (stderr, "component %d\n", compnum);
 
                if (outnum) {


@@ -343,7 +346,7 @@ finished:
        }
     }
 
        }
     }
 

-    fmt_scan (fmt, scanl, scanl_size, slwidth, dat);
+    fmt_scan (fmt, scanl, scanl_size, slwidth, dat, NULL);

 
     if (bodycomp)
        bodycomp->c_text = saved_c_text;
 
     if (bodycomp)
        bodycomp->c_text = saved_c_text;


@@ -356,10 +359,8 @@ finished:
 
     /* return dynamically allocated buffers to pool */
     while ((cptr = *savecomp++)) {
 
     /* return dynamically allocated buffers to pool */
     while ((cptr = *savecomp++)) {

-       *--nxtbuf = cptr->c_text;

        cptr->c_text = NULL;
     }
        cptr->c_text = NULL;
     }

-    *--nxtbuf = tmpbuf;

 
     if (outnum && (ferror(scnout) || fclose (scnout) == EOF))
        DIEWRERR();
 
     if (outnum && (ferror(scnout) || fclose (scnout) == EOF))
        DIEWRERR();


@@ -379,3 +380,23 @@ mh_fputs(char *s, FILE *stream)
     return (0);
 }
 
     return (0);
 }
 

+/* The following three functions allow access to the global gstate above. */
+void
+scan_finished () {
+    m_getfld_state_destroy (&gstate);
+}
+
+void
+scan_detect_mbox_style (FILE *f) {
+    m_unknown (&gstate, f);
+}
+
+void
+scan_eom_action (int (*action)()) {
+    m_eomsbr (gstate, action);
+}
+
+void
+scan_reset_m_getfld_state () {
+    m_getfld_state_reset (&gstate);
+}