Removed special `folder' and `dtimenow' format escapes from scan listings.

[mmh] / uip / scan.c

diff --git a/uip/scan.c b/uip/scan.c
index 1b58eb5..ef13e39 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -31,7 +31,6 @@ static struct swit switches[] = {
 int
 main(int argc, char **argv)
 {
 int
 main(int argc, char **argv)
 {

-       int ontty;

        int width = 0;
        int i, state, msgnum;
        int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
        int width = 0;
        int i, state, msgnum;
        int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;

@@ -128,9 +127,8 @@ main(int argc, char **argv)
 
                m_unknown(in);
                for (msgnum = 1; ; ++msgnum) {
 
                m_unknown(in);
                for (msgnum = 1; ; ++msgnum) {

-                       state = scan(in, msgnum, -1, nfs, width, 0, 0,
-                                       NULL, 0L, 1);
-                       if (state != SCNMSG && state != SCNENC)
+                       state = scan(in, msgnum, -1, nfs, width, 0, 0, 1);
+                       if (state != SCNMSG)

                                break;
                }
                fclose(in);
                                break;
                }
                fclose(in);

@@ -188,8 +186,6 @@ main(int argc, char **argv)
                }
        }
 
                }
        }
 

-       ontty = isatty(fileno(stdout));
-

        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                if (is_selected(mp, msgnum)) {
                        if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                if (is_selected(mp, msgnum)) {
                        if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {

@@ -211,9 +207,8 @@ main(int argc, char **argv)
 
                        switch (state = scan(in, msgnum, 0, nfs, width,
                                                msgnum == mp->curmsg, unseen,
 
                        switch (state = scan(in, msgnum, 0, nfs, width,
                                                msgnum == mp->curmsg, unseen,

-                                               folder, 0L, 1)) {
+                                               1)) {

                        case SCNMSG:
                        case SCNMSG:

-                       case SCNENC:

                        case SCNERR:
                                break;
 
                        case SCNERR:
                                break;
 

@@ -225,8 +220,6 @@ main(int argc, char **argv)
                                break;
                        }
                        fclose(in);
                                break;
                        }
                        fclose(in);

-                       if (ontty)
-                               fflush(stdout);

                }
        }
 
                }
        }