Added docs/README-iCalendar.

[nmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 8678c2d886c364b9c16203517e6ff116e6a8fea3..c038622e64eae05f8f502a71b3b9e8423b706619 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -14,8 +14,6 @@
 #include <h/tws.h>
 #include <h/utils.h>
 
 #include <h/tws.h>
 #include <h/utils.h>
 

-m_getfld_state_t gstate;
-

 #define MAXSCANL 256           /* longest possible scan line */
 
 /*
 #define MAXSCANL 256           /* longest possible scan line */
 
 /*


@@ -38,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")
 


@@ -62,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;


@@ -211,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;


@@ -346,7 +344,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;


@@ -359,10 +357,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();


@@ -382,3 +378,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);
+}