s/pfolder/curfolder/g

diff --git a/config/config.c b/config/config.c
index 245ecdeafa0daf08aa497e8b1ca192ad083589e9..7454666f1b20a357f7dc71bab44f23debc51a382 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -112,7 +112,7 @@ char *draftfolder = "+drafts";
 char *inbox = "Inbox";
 char *defaultfolder = "+inbox";
 
-char *pfolder = "Current-Folder";
+char *curfolder = "Current-Folder";
 char *usequence = "Unseen-Sequence";
 char *psequence = "Previous-Sequence";
 char *nsequence = "Sequence-Negation";

diff --git a/h/mh.h b/h/mh.h
index 4b846cf1a2cd1050c35c865453c1aec2ff3f321a..8ca6c4411f04e6320094e871fb76862d17d8258f 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -329,7 +329,7 @@ extern char *nmhprivcache;
 extern char *nsequence;
 extern char *packproc;
 extern char *postproc;
-extern char *pfolder;
+extern char *curfolder;
 extern char *psequence;
 extern char *rcvdistcomps;
 extern char *rcvstoreproc;

diff --git a/sbr/path.c b/sbr/path.c
index 41328964660c8e3504803d710351b33f8688640c..ca3595a15919fb96e13d09c3857aef7f8f2f8072 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -122,7 +122,7 @@ getdeffol(void)
 char *
 getcurfol(void)
 {
-       char *folder = context_find(pfolder);
+       char *folder = context_find(curfolder);
 
        if (!folder || !*folder) {
                folder = getdeffol();

diff --git a/uip/anno.c b/uip/anno.c
index ec3590c46a8a60e3dd84bc3fa315c5ebef0d207f..1d27a9e9586e09d29cf3f54385bfbc919fb100f6 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -242,7 +242,7 @@ main(int argc, char **argv)
                }
        }
 
-       context_replace(pfolder, folder);  /* update current folder  */
+       context_replace(curfolder, folder);  /* update current folder  */
        seq_setcur(mp, mp->lowsel);  /* update current message */
        seq_save(mp);  /* synchronize message sequences */
        folder_free(mp);  /* free folder/message structure */

diff --git a/uip/burst.c b/uip/burst.c
index b5414ad62914df7719586005cf756e1de4561f7e..ec507086950143c48043ed78862dcebd9ff5af5e 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -162,7 +162,7 @@ main(int argc, char **argv)
        }
 
        free((char *) smsgs);
-       context_replace(pfolder, folder);  /* update current folder */
+       context_replace(curfolder, folder);  /* update current folder */
 
        /*
        ** If -inplace is given, then the first message burst becomes

diff --git a/uip/dist.c b/uip/dist.c
index 991f5cd1f535b7500b18632b8c979c8be87abe25..27be4a54731131e2ee663a5b6ef735675d4dd1fd 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -192,7 +192,7 @@ main(int argc, char **argv)
                adios(msgnam, "unable to open message");
 
        if (!file) {
-               context_replace(pfolder, folder);  /* update current folder */
+               context_replace(curfolder, folder); /* update current folder */
                seq_setcur(mp, mp->lowsel);  /* update current message */
                seq_save(mp);  /* synchronize sequences  */
                context_save();  /* save the context file  */

diff --git a/uip/flist.c b/uip/flist.c
index d85ad61c31729fc651817b5d50ad04736698e85f..d2a0490338c4edb55d5ad2094572c336a60da2be 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -91,9 +91,9 @@ static int alphaOrder = FALSE;  /* want alphabetical order only */
 static int recurse = FALSE;  /* show nested folders? */
 static int showzero   = TRUE;  /* show folders even if no messages in seq? */
 static int Total = TRUE;  /* display info on number of messages in
-       * sequence found, and total num messages   */
+               * sequence found, and total num messages */
 
-static char curfolder[BUFSIZ];  /* name of the current folder */
+static char curfol[BUFSIZ];  /* name of the current folder */
 static char *nmhdir;  /* base nmh mail directory */
 
 /*
@@ -236,7 +236,7 @@ main(int argc, char **argv)
        }
 
        /* get current folder */
-       strncpy(curfolder, getcurfol(), sizeof(curfolder));
+       strncpy(curfol, getcurfol(), sizeof(curfol));
 
        /* get nmh base directory */
        nmhdir = toabsdir("+");
@@ -267,7 +267,8 @@ main(int argc, char **argv)
 
        GetFolderOrder();
        ScanFolders();
-       qsort(folders, nFolders, sizeof(struct Folder), (qsort_comp) CompareFolders);
+       qsort(folders, nFolders, sizeof(struct Folder),
+                       (qsort_comp) CompareFolders);
        PrintFolders();
        done(0);
        return 1;
@@ -323,9 +324,8 @@ ScanFolders(void)
 
        if (numfolders > 0) {
                /* Update context */
-               strncpy(curfolder, foldersToDo[numfolders - 1],
-                               sizeof(curfolder));
-               context_replace(pfolder, curfolder);/* update current folder */
+               strncpy(curfol, foldersToDo[numfolders - 1], sizeof(curfol));
+               context_replace(curfolder, curfol); /* update current folder */
                context_save();  /* save the context file */
 
                /*
@@ -337,20 +337,14 @@ ScanFolders(void)
                        BuildFolderList(foldersToDo[i], all ? 1 : 0);
        } else {
                if (all) {
-                       /*
-                       ** Do the readonly folders
-                       */
+                       /* Do the readonly folders */
                        do_readonly_folders();
 
-                       /*
-                       ** Now scan the entire nmh directory for folders
-                       */
+                       /* Now scan the entire nmh directory for folders */
                        BuildFolderList(".", 0);
                } else {
-                       /*
-                       ** Else scan current folder
-                       */
-                       BuildFolderList(curfolder, 0);
+                       /* Else scan current folder */
+                       BuildFolderList(curfol, 0);
                }
        }
 }
@@ -448,7 +442,8 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
                        if (AddFolder(name, showzero) &&
                                        (recurse || searchdepth) &&
                                        st.st_nlink > 2)
-                               BuildFolderListRecurse(name, &st, searchdepth - 1);
+                               BuildFolderListRecurse(name, &st,
+                                               searchdepth - 1);
                }
        }
        closedir(dir);
@@ -572,7 +567,10 @@ PrintFolders(void)
                        if (folders[i].nSeq[j] > maxseq)
                                maxseq = folders[i].nSeq[j];
 
-                       /* check if this sequence is private in any of the folders */
+                       /*
+                       ** check if this sequence is private in any of
+                       ** the folders
+                       */
                        if (folders[i].private[j])
                                has_private = 1;
                }
@@ -583,7 +581,7 @@ PrintFolders(void)
                for (j = 0; j < numsequences; j++) {
                        if (folders[i].nSeq[j] > 0 || showzero) {
                                /* Add `+' to end of name of current folder */
-                               if (strcmp(curfolder, folders[i].name))
+                               if (strcmp(curfol, folders[i].name))
                                        snprintf(tmpname, sizeof(tmpname),
                                                        "%s", folders[i].name);
                                else

diff --git a/uip/folder.c b/uip/folder.c
index 70f497d3def341f0dc8de916bea824b8fae63759..e21910969b3375143a5b9e688b113d22056351bc 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -311,7 +311,7 @@ main(int argc, char **argv)
                if (access(cp, F_OK) == NOTOK)
                        adios(cp, "unable to find folder");
                /* update current folder   */
-               context_replace(pfolder, argfolder);
+               context_replace(curfolder, argfolder);
                context_save();  /* save the context file   */
                argfolder = NULL;
        }
@@ -352,14 +352,14 @@ main(int argc, char **argv)
                        if (msg)
                                admonish(NULL, "no folder given for message %s", msg);
                        readonly_folders(); /* do any readonly folders */
-                       strncpy(folder, (cp = context_find(pfolder)) ?
+                       strncpy(folder, (cp = context_find(curfolder)) ?
                                        cp : "", sizeof(folder));
                        crawl_folders(".", get_folder_info_callback, NULL);
                } else {
                        strncpy(folder, argfolder, sizeof(folder));
                        if (get_folder_info(argfolder, msg)) {
                                /* update current folder */
-                               context_replace(pfolder, argfolder);
+                               context_replace(curfolder, argfolder);
                                context_save();
                        }
                        /*
@@ -382,7 +382,7 @@ main(int argc, char **argv)
 
                if (get_folder_info(folder, msg) && argfolder) {
                        /* update current folder */
-                       context_replace(pfolder, argfolder);
+                       context_replace(curfolder, argfolder);
                        }
        }
 

diff --git a/uip/forw.c b/uip/forw.c
index 3f940f7b8034528ccabf78d0ce031e7907fc4ea1..3ce0b216f0a18f1e130671cc67c7a86362558123 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -349,7 +349,7 @@ main(int argc, char **argv)
                        context_replace(buf, getcpy(value));
                }
 
-               context_replace(pfolder, folder);  /* update current folder */
+               context_replace(curfolder, folder); /* update current folder */
                seq_setcur(mp, mp->lowsel);  /* update current message */
                seq_save(mp);  /* synchronize sequences */
                context_save();  /* save the context file */

diff --git a/uip/inc.c b/uip/inc.c
index 2a866e925867497638a42f80b770fd2465aa64e1..54eb70ef60cdb4d9997515493b1f59bf0ede8c39 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -506,7 +506,7 @@ main(int argc, char **argv)
        if (msgnum == hghnum) {
                admonish(NULL, "no messages incorporated");
        } else {
-               context_replace(pfolder, folder);  /* update current folder */
+               context_replace(curfolder, folder); /* update current folder */
                if (chgflag)
                        mp->curmsg = hghnum + 1;
                mp->hghmsg = msgnum;

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 1fb683428a6d95f14957163c1fe92464057c662e..30ac8f6ca5825e7fc62205622c863d1745e1c5c2 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -201,7 +201,7 @@ query:
        ctxpath = getcpy(toabsdir(context = "context"));
 
        /* Initialize current folder to default */
-       context_replace(pfolder, defaultfolder);
+       context_replace(curfolder, defaultfolder);
        context_save();
 
        /*

diff --git a/uip/mark.c b/uip/mark.c
index 5fd27f665632e4367b6bb8e0ce75c6415a424948..2914a44f960adabf86ccc169fa2eb7b1c98ae8f7 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -221,7 +221,7 @@ main(int argc, char **argv)
        }
 
        seq_save(mp);  /* synchronize message sequences */
-       context_replace(pfolder, folder);  /* update current folder */
+       context_replace(curfolder, folder);  /* update current folder */
        context_save();  /* save the context file */
        folder_free(mp);  /* free folder/message structure */
        done(0);

diff --git a/uip/mhlist.c b/uip/mhlist.c
index b87e522132d550cd9499c391ce6294aa53ed5834..c12a6b98c9569ccecc291a32df01e24a32011e59 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -361,7 +361,7 @@ do_cache:
 
        /* If reading from a folder, do some updating */
        if (mp) {
-               context_replace(pfolder, folder);  /* update current folder */
+               context_replace(curfolder, folder); /* update current folder */
                seq_setcur(mp, mp->hghsel);  /* update current message */
                seq_save(mp);  /* synchronize sequences  */
                context_save();  /* save the context file  */

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 3510120737fa1efb041f7d7514fcac1062747929..07a05a9bfa62047905d3907df2acb14a783d0ce5 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -446,8 +446,8 @@ do_cache:
 
        /* If reading from a folder, do some updating */
        if (mp) {
-               context_replace(pfolder, folder);  /* update current folder */
-               seq_setcur(mp, mp->hghsel);       /* update current message */
+               context_replace(curfolder, folder); /* update current folder */
+               seq_setcur(mp, mp->hghsel);        /* update current message */
                seq_save(mp);                      /* synchronize sequences */
                context_save();                    /* save the context file */
        }

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 1fbd50e2cc875c17f52beef5007c57c2ca1dc7e2..8ce7d6200f71b15d764db23ff66cdc2ffae6168c 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -375,7 +375,7 @@ do_cache:
 
        /* If reading from a folder, do some updating */
        if (mp) {
-               context_replace(pfolder, folder);  /* update current folder */
+               context_replace(curfolder, folder); /* update current folder */
                seq_setcur(mp, mp->hghsel);  /* update current message */
                seq_save(mp);  /* synchronize sequences  */
                context_save();  /* save the context file  */

diff --git a/uip/mhtest.c b/uip/mhtest.c
index df5985fac4ab45682f0d285cbf849928043acbd2..1f6846bc29f4e585b5a6979e6c8f4fe2285840d1 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -353,7 +353,7 @@ do_cache:
 
        /* If reading from a folder, do some updating */
        if (mp) {
-               context_replace(pfolder, folder);  /* update current folder */
+               context_replace(curfolder, folder); /* update current folder */
                seq_setcur(mp, mp->hghsel);  /* update current message */
                seq_save(mp);  /* synchronize sequences  */
                context_save();  /* save the context file  */

diff --git a/uip/new.c b/uip/new.c
index fc87b3a62e25b48d7cc6baa0430ac789fdccb0b0..c4026ba48d20057bfdb383fe05bb34616d5abad7 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -513,7 +513,7 @@ main(int argc, char **argv)
        }
        sequences[i] = NULL;
 
-       folder = doit(context_find(pfolder), folders, sequences);
+       folder = doit(context_find(curfolder), folders, sequences);
        if (folder == NULL) {
                done(0);
                return 1;
@@ -527,11 +527,11 @@ main(int argc, char **argv)
                ** has in memory.  So, we'll be lame, too.  I'm not sure if i
                ** should just change context_replace...
                */
-               context_replace(pfolder, "defeat_context_replace_optimization");
+               context_replace(curfolder, "defeat_context_replace_optimization");
        }
 
        /* update current folder */
-       context_replace(pfolder, folder->n_name);
+       context_replace(curfolder, folder->n_name);
 
        if (run_mode == FNEXT || run_mode == FPREV) {
                printf("%s  %s\n", folder->n_name, folder->n_field);

diff --git a/uip/packf.c b/uip/packf.c
index b48a92d6bc454b237f40f5d366d463322260ce7b..9bb61f50ab1bdf7d67d6caee1d14dd3dac4f5270 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -169,7 +169,7 @@ main(int argc, char **argv)
        /* close and unlock maildrop file */
        mbx_close(file, md);
 
-       context_replace(pfolder, folder);  /* update current folder */
+       context_replace(curfolder, folder);  /* update current folder */
        if (mp->hghsel != mp->curmsg)
                seq_setcur(mp, mp->lowsel);
        seq_save(mp);

diff --git a/uip/pick.c b/uip/pick.c
index 2efac4204821ef7905dacc5236d85dce1be7077e..e8720df50b20a56392d1ef8826dd381ee05ebe0c 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -288,7 +288,7 @@ main(int argc, char **argv)
                printf("%d hit%s\n", mp->numsel, mp->numsel == 1 ? "" : "s");
        }
 
-       context_replace(pfolder, folder);  /* update current folder */
+       context_replace(curfolder, folder);  /* update current folder */
        seq_save(mp);  /* synchronize message sequences */
        context_save();  /* save the context file */
        folder_free(mp);  /* free folder/message structure */

diff --git a/uip/refile.c b/uip/refile.c
index 32b7f15f7addfa963003e5f74ccca1919fce0934..b85186a3b06d0d460c61e4e2c8a3f5d927fc8fd3 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -231,7 +231,7 @@ main(int argc, char **argv)
        ** directory.  This should be moved to folder_delmsgs().
        */
        if (rmmproc) {
-               context_replace(pfolder, folder);
+               context_replace(curfolder, folder);
                context_save();
                fflush(stdout);
        }
@@ -253,7 +253,7 @@ main(int argc, char **argv)
                seq_setcur(mp, mp->hghsel);
        seq_save(mp);  /* synchronize message sequences */
 
-       context_replace(pfolder, folder);  /* update current folder   */
+       context_replace(curfolder, folder);  /* update current folder   */
        context_save();  /* save the context file   */
        folder_free(mp);  /* free folder structure   */
        done(0);

diff --git a/uip/repl.c b/uip/repl.c
index 058b536757e29e33479f704d225787c0cf5348cc..ff936bc0a745ff7f7feb3f2c5420c7b5ca6498cd 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -329,7 +329,7 @@ main(int argc, char **argv)
                if (mp->numsel > 1)
                        adios(NULL, "only one message at a time!");
 
-               context_replace(pfolder, folder);  /* update current folder */
+               context_replace(curfolder, folder); /* update current folder */
                seq_setcur(mp, mp->lowsel);  /* update current message  */
                seq_save(mp);  /* synchronize sequences   */
                context_save();  /* save the context file   */

diff --git a/uip/rmf.c b/uip/rmf.c
index 7d81a39b0dabcb5052073106c3e94e301130803c..00104cfd233440834a11714ea207b875d04d4b53 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -111,11 +111,11 @@ main(int argc, char **argv)
        }
 
        if (rmf(folder) == OK) {
-               char *cfolder = context_find(pfolder);
+               char *cfolder = context_find(curfolder);
                if (cfolder && strcmp(cfolder, newfolder)) {
                        printf("[+%s now current]\n", newfolder);
                        /* update current folder */
-                       context_replace(pfolder, newfolder);
+                       context_replace(curfolder, newfolder);
                }
        }
        context_save();  /* save the context file */

diff --git a/uip/rmm.c b/uip/rmm.c
index e599f6fdfa63a5158630e45669ca6a7cf638e83c..c1b1608c2ea931d4b5aec8f0e132f843bc908dc7 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -109,7 +109,7 @@ main(int argc, char **argv)
        ** folder_delmsgs().
        */
        if (rmmproc) {
-               context_replace(pfolder, folder);
+               context_replace(curfolder, folder);
                context_save();
                fflush(stdout);
        }
@@ -118,7 +118,7 @@ main(int argc, char **argv)
        folder_delmsgs(mp, unlink_msgs, 0);
 
        seq_save(mp);  /* synchronize message sequences  */
-       context_replace(pfolder, folder);  /* update current folder   */
+       context_replace(curfolder, folder);  /* update current folder   */
        context_save();  /* save the context file   */
        folder_free(mp);  /* free folder structure   */
        done(0);

diff --git a/uip/scan.c b/uip/scan.c
index 1276d5b17b6bfad3e55f3f8fbf202df9cf23ba2f..5cac62641839e3ff16761ca7f4b9bf0c5d8406a3 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -223,7 +223,7 @@ main(int argc, char **argv)
                        done(1);
        seq_setprev(mp);  /* set the Previous-Sequence */
 
-       context_replace(pfolder, folder);  /* update current folder */
+       context_replace(curfolder, folder);  /* update current folder */
        seq_save(mp);  /* synchronize message sequences */
        context_save();  /* save the context file */
 

diff --git a/uip/show.c b/uip/show.c
index 977b0e41ffd131bc914805fbdd917b701303bed9..757b0018e337f9b6806df3ff82e697ac7658b4c1 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -244,7 +244,7 @@ usage:
 
        seq_setcur(mp, mp->hghsel);  /* update current message  */
        seq_save(mp);  /* synchronize sequences   */
-       context_replace(pfolder, folder);  /* update current folder   */
+       context_replace(curfolder, folder);  /* update current folder   */
        context_save();  /* save the context file   */
 
        if (headersw && vecp == 2)

diff --git a/uip/sortm.c b/uip/sortm.c
index 5132c1f50e497b1c96f0adde78e96c5434c987fc..0caab302ff47ee2ca9cc4b8953573f31328ae46a 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -277,7 +277,7 @@ main(int argc, char **argv)
 
        rename_msgs(mp, dlist);
 
-       context_replace(pfolder, folder);  /* update current folder */
+       context_replace(curfolder, folder);  /* update current folder */
        seq_save(mp);  /* synchronize message sequences */
        context_save();  /* save the context file */
        folder_free(mp);  /* free folder/message structure */