s/nfs/fmtstr/

and s/c_nfs/c_fstr/ in uip/mhl.c

diff --git a/uip/ap.c b/uip/ap.c
index aaa8762..623e003 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -43,7 +43,7 @@ main(int argc, char **argv)
 {
        int addrp = 0, normalize = AD_HOST;
        int status = 0;
-       char *cp, *form = NULL, *nfs;
+       char *cp, *form = NULL, *fmtstr;
        char buf[BUFSIZ], **argp;
        char **arguments, *addrs[NADDRS];
 
@@ -100,10 +100,10 @@ main(int argc, char **argv)
                adios(NULL, "usage: %s [switches] addrs ...", invo_name);
 
        /* get new format string */
-       nfs = new_fs(form, FORMAT);
+       fmtstr = new_fs(form, FORMAT);
 
        fmt_norm = normalize;
-       fmt_compile(nfs, &fmt);
+       fmt_compile(fmtstr, &fmt);
 
        dat[0] = 0;
        dat[1] = 0;

diff --git a/uip/comp.c b/uip/comp.c
index d950833..a9d2543 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -43,7 +43,7 @@ main(int argc, char **argv)
        char *folder = NULL, *msg = NULL, buf[BUFSIZ];
        char drft[BUFSIZ], **argp, **arguments;
        struct msgs *mp = NULL;
-       char *nfs;
+       char *fmtstr;
 
 
 #ifdef LOCALE
@@ -164,12 +164,12 @@ main(int argc, char **argv)
                close(out);
 
        } else {
-               nfs = new_fs(form, components);
+               fmtstr = new_fs(form, components);
                strncpy(drft, m_draft(seq_beyond), sizeof(drft));
                if ((out = creat(drft, m_gmprot())) == NOTOK) {
                        adios(drft, "unable to create");
                }
-               if (write(out, nfs, strlen(nfs)) != strlen(nfs)) {
+               if (write(out, fmtstr, strlen(fmtstr)) != strlen(fmtstr)) {
                        adios(drft, "error writing");
                }
                close(out);

diff --git a/uip/dist.c b/uip/dist.c
index 4e83a7b..869a906 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -45,7 +45,7 @@ main(int argc, char **argv)
        char *form = NULL, *msg = NULL, buf[BUFSIZ], drft[BUFSIZ];
        char **argp, **arguments;
        struct msgs *mp = NULL;
-       char *nfs;
+       char *fmtstr;
 
 #ifdef LOCALE
        setlocale(LC_ALL, "");
@@ -139,8 +139,8 @@ main(int argc, char **argv)
        if ((out = creat(drft, m_gmprot())) == NOTOK)
                adios(drft, "unable to create");
 
-       nfs = new_fs(form, distcomps);
-       if (write(out, nfs, strlen(nfs)) != strlen(nfs)) {
+       fmtstr = new_fs(form, distcomps);
+       if (write(out, fmtstr, strlen(fmtstr)) != strlen(fmtstr)) {
                adios(drft, "error writing");
        }
        close(out);

diff --git a/uip/dp.c b/uip/dp.c
index fa3a201..d64a0b9 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -38,7 +38,7 @@ int
 main(int argc, char **argv)
 {
        int datep = 0, status = 0;
-       char *cp, *form = NULL, *nfs;
+       char *cp, *form = NULL, *fmtstr;
        char buf[BUFSIZ], **argp, **arguments;
        char *dates[NDATES];
 
@@ -89,9 +89,9 @@ main(int argc, char **argv)
                adios(NULL, "usage: %s [switches] dates ...", invo_name);
 
        /* get new format string */
-       nfs = new_fs(form, FORMAT);
+       fmtstr = new_fs(form, FORMAT);
 
-       fmt_compile(nfs, &fmt);
+       fmt_compile(fmtstr, &fmt);
 
        dat[0] = 0;
        dat[1] = 0;

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 923a46e..a7fe9f4 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -44,7 +44,7 @@ main(int argc, char **argv)
 {
        int ncomps;
        char *cp, *form = NULL;
-       char buf[BUFSIZ], *nfs, **argp, **arguments;
+       char buf[BUFSIZ], *fmtstr, **argp, **arguments;
        struct format *fmt;
 
 #ifdef LOCALE
@@ -93,8 +93,8 @@ main(int argc, char **argv)
        /*
        ** Get new format string.  Must be before chdir().
        */
-       nfs = new_fs(form, FORMAT);
-       ncomps = fmt_compile(nfs, &fmt);
+       fmtstr = new_fs(form, FORMAT);
+       ncomps = fmt_compile(fmtstr, &fmt);
 
        fmt_dump(fmt);
        done(0);

diff --git a/uip/forw.c b/uip/forw.c
index b9c3c14..031c191 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -73,7 +73,7 @@ main(int argc, char **argv)
        char *folder = NULL;
        char *form = NULL, buf[BUFSIZ], value[10];
        char **argp, **arguments, *msgs[MAXARGS];
-       char *nfs;
+       char *fmtstr;
 
 #ifdef MHE
        int buildsw = 0;
@@ -237,8 +237,8 @@ main(int argc, char **argv)
                cpydata(in, out, form, drft);
                close(in);
        } else {
-               nfs = new_fs(form, forwcomps);
-               if (write(out, nfs, strlen(nfs)) != strlen(nfs)) {
+               fmtstr = new_fs(form, forwcomps);
+               if (write(out, fmtstr, strlen(fmtstr)) != strlen(fmtstr)) {
                        adios(drft, "error writing");
                }
        }
@@ -297,7 +297,7 @@ build_form(char *form, char *digest, int volume, int issue)
 {
        int in;
        int fmtsize;
-       register char *nfs;
+       register char *fmtstr;
        char *line, tmpfil[BUFSIZ];
        FILE *tmp;
        register struct comp *cptr;
@@ -306,11 +306,11 @@ build_form(char *form, char *digest, int volume, int issue)
        char *cp = NULL;
 
        /* Get new format string */
-       nfs = new_fs(form, NULL);
-       fmtsize = strlen(nfs) + 256;
+       fmtstr = new_fs(form, NULL);
+       fmtsize = strlen(fmtstr) + 256;
 
        /* Compile format string */
-       fmt_compile(nfs, &fmt);
+       fmt_compile(fmtstr, &fmt);
 
        FINDCOMP(cptr, "digest");
        if (cptr)

diff --git a/uip/inc.c b/uip/inc.c
index 6546cea..05df0f0 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -134,7 +134,7 @@ main(int argc, char **argv)
        char *cp, *maildir = NULL, *folder = NULL;
        char *form = NULL;
        char *audfile = NULL, *from = NULL;
-       char buf[BUFSIZ], **argp, *nfs, **arguments;
+       char buf[BUFSIZ], **argp, *fmtstr, **arguments;
        struct msgs *mp = NULL;
        struct stat st, s1;
        FILE *aud = NULL;
@@ -364,7 +364,7 @@ main(int argc, char **argv)
 #endif /* MHE */
 
        /* Get new format string */
-       nfs = new_fs(form, FORMAT);
+       fmtstr = new_fs(form, FORMAT);
 
        if (noisy) {
                printf("Incorporating new mail into %s...\n\n", folder);
@@ -389,7 +389,7 @@ main(int argc, char **argv)
 
                /* create scanline for new message */
                switch (incerr = scan(in, msgnum + 1, msgnum + 1,
-                               noisy ? nfs : NULL, width,
+                               noisy ? fmtstr : NULL, width,
                                msgnum == hghnum && chgflag, 1)) {
                case SCNFAT:
                case SCNEOF:

diff --git a/uip/mhl.c b/uip/mhl.c
index 4c2f06e..3d8ad8d 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -91,7 +91,7 @@ struct mcomp {
        char *c_name;  /* component name */
        char *c_text;  /* component text */
        char *c_ovtxt; /* text overflow indicator */
-       char *c_nfs;   /* iff FORMAT */
+       char *c_fstr;   /* iff FORMAT */
        struct format *c_fmt;  /*  .. */
        int c_offset;  /* left margin indentation */
        int c_ovoff;   /* overflow indentation */
@@ -444,7 +444,7 @@ mhl_format(char *file, int width)
                ino = st.st_ino;
        }
 
-       global.c_ovtxt = global.c_nfs = NULL;
+       global.c_ovtxt = global.c_fstr = NULL;
        global.c_fmt = NULL;
        global.c_offset = 0;
        global.c_ovoff = -1;
@@ -516,13 +516,13 @@ mhl_format(char *file, int width)
                                if (evalvar(c1))
                                        adios(NULL, "format file syntax error: %s", bp);
                        }
-                       if (!c1->c_nfs && global.c_nfs) {
+                       if (!c1->c_fstr && global.c_fstr) {
                                if ((c1->c_flags & DATEFMT) &&
                                                (global.c_flags & DATEFMT)) {
-                                       c1->c_nfs = getcpy(global.c_nfs);
+                                       c1->c_fstr = getcpy(global.c_fstr);
                                } else if ((c1->c_flags & ADDRFMT) &&
                                                (global.c_flags & ADDRFMT)) {
-                                       c1->c_nfs = getcpy(global.c_nfs);
+                                       c1->c_fstr = getcpy(global.c_fstr);
                                }
                        }
                        continue;
@@ -536,7 +536,7 @@ mhl_format(char *file, int width)
        if (mhldebug) {
                for (c1 = fmthd; c1; c1 = c1->c_next) {
                        fprintf(stderr, "c1: name=\"%s\" text=\"%s\" ovtxt=\"%s\"\n", c1->c_name, c1->c_text, c1->c_ovtxt);
-                       fprintf(stderr, "\tnfs=0x%x fmt=0x%x\n", (unsigned int)(unsigned long) c1->c_nfs, (unsigned int)(unsigned long) c1->c_fmt);
+                       fprintf(stderr, "\tfstr=0x%x fmt=0x%x\n", (unsigned int)(unsigned long) c1->c_fstr, (unsigned int)(unsigned long) c1->c_fmt);
                        fprintf(stderr, "\toffset=%d ovoff=%d width=%d cwidth=%d\n", c1->c_offset, c1->c_ovoff, c1->c_width, c1->c_cwidth);
                        fprintf (stderr, "\tflags=%s\n", snprintb(buffer, sizeof(buffer), (unsigned) c1->c_flags, LBITS));
                }
@@ -571,23 +571,23 @@ evalvar(struct mcomp *c1)
                return ptos(name, &c1->c_ovtxt);
 
        if (!mh_strcasecmp(name, "formatfield")) {
-               char *nfs;
+               char *fmtstr;
 
                if (ptos(name, &cp))
                        return 1;
                cp = concat("=", cp, NULL);
-               nfs = new_fs(cp, NULL);
+               fmtstr = new_fs(cp, NULL);
                free(cp);
-               c1->c_nfs = getcpy(nfs);
+               c1->c_fstr = getcpy(fmtstr);
                c1->c_flags |= FORMAT;
                return 0;
        }
 
        if (!mh_strcasecmp(name, "decode")) {
-               char *nfs;
+               char *fmtstr;
 
-               nfs = new_fs("=%(decode{text})", NULL);
-               c1->c_nfs = getcpy(nfs);
+               fmtstr = new_fs("=%(decode{text})", NULL);
+               c1->c_fstr = getcpy(fmtstr);
                c1->c_flags |= FORMAT;
                return 0;
        }
@@ -895,7 +895,7 @@ mcomp_format(struct mcomp *c1, struct mcomp *c2)
        dat[2] = 0;
        dat[3] = sizeof(buffer) - 1;
        dat[4] = 0;
-       fmt_compile(c1->c_nfs, &c1->c_fmt);
+       fmt_compile(c1->c_fstr, &c1->c_fmt);
 
        if (!(c1->c_flags & ADDRFMT)) {
                FINDCOMP(cptr, "text");
@@ -1003,8 +1003,8 @@ free_queue(struct mcomp **head, struct mcomp **tail)
                        free(c1->c_text);
                if (c1->c_ovtxt)
                        free(c1->c_ovtxt);
-               if (c1->c_nfs)
-                       free(c1->c_nfs);
+               if (c1->c_fstr)
+                       free(c1->c_fstr);
                if (c1->c_fmt)
                        free((char *) c1->c_fmt);
                free((char *) c1);
@@ -1037,7 +1037,7 @@ putcomp(struct mcomp *c1, struct mcomp *c2, int flag)
                return;
        }
 
-       if (c1->c_nfs && (c1->c_flags & (ADDRFMT | DATEFMT | FORMAT)))
+       if (c1->c_fstr && (c1->c_flags & (ADDRFMT | DATEFMT | FORMAT)))
                mcomp_format(c1, c2);
 
        if (c1->c_flags & CENTER) {

diff --git a/uip/scan.c b/uip/scan.c
index 6fbd579..0c17268 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -36,7 +36,7 @@ main(int argc, char **argv)
        int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
        char *cp, *maildir, *file = NULL, *folder = NULL;
        char *form = NULL, buf[BUFSIZ];
-       char **argp, *nfs, **arguments;
+       char **argp, *fmtstr, **arguments;
        struct msgs_array msgs = { 0, 0, NULL };
        struct msgs *mp;
        FILE *in;
@@ -106,7 +106,7 @@ main(int argc, char **argv)
        /*
        ** Get new format string.  Must be before chdir().
        */
-       nfs = new_fs(form, FORMAT);
+       fmtstr = new_fs(form, FORMAT);
 
        /*
        ** We are scanning a maildrop file
@@ -127,7 +127,7 @@ main(int argc, char **argv)
 
                m_unknown(in);
                for (msgnum = 1; ; ++msgnum) {
-                       state = scan(in, msgnum, -1, nfs, width, 0, 0);
+                       state = scan(in, msgnum, -1, fmtstr, width, 0, 0);
                        if (state != SCNMSG)
                                break;
                }
@@ -205,7 +205,7 @@ main(int argc, char **argv)
                                }
                        }
 
-                       switch (state = scan(in, msgnum, 0, nfs, width,
+                       switch (state = scan(in, msgnum, 0, fmtstr, width,
                                        msgnum == mp->curmsg, unseen)) {
                        case SCNMSG:
                        case SCNERR:

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 69f385a..fdfe4cd 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -67,7 +67,7 @@ int sc_width(void);  /* from termsbr.c */
 #endif
 
 int
-scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
+scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
        int unseen)
 {
        int i, compnum, state;
@@ -101,7 +101,7 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                        umask(~m_gmprot());
 
                /* Compile format string */
-               ncomps = fmt_compile(nfs, &fmt) + 1;
+               ncomps = fmt_compile(fmtstr, &fmt) + 1;
 
                FINDCOMP(bodycomp, "body");
                FINDCOMP(datecomp, "date");
@@ -328,7 +328,7 @@ finished:
        if (bodycomp)
                bodycomp->c_text = saved_c_text;
 
-       if (nfs)
+       if (fmtstr)
                fputs(scanl, stdout);
 
        /* return dynamically allocated buffers to pool */