Introduced FDEF and FCUR for speaking arguments to getfolder().

Maybe it would be better to two separate functions, but I cannot
imagine good names for them ... :-(

diff --git a/h/mh.h b/h/mh.h
index 2e3be95b2efcbe75211c25bf9f88386fa9e8911f..59b5c0f8ab1dc8c7dd3e12f1039ecf78e6825378 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -257,6 +257,9 @@ extern char *msg_delim;      /*  .. */
 #define TFILE    1        /* path() given a file    */
 #define TSUBCWF  2        /* path() given a @folder */
 
+#define FDEF     0        /* getfolder() want default */
+#define FCUR     1        /* getfolder() want current */
+
 #define OUTPUTLINELEN  72    /* default line length for headers */
 
 /*

diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 95f72afb28792a286a7ce424f4fb335e4ee61dce..957e44b4cd4443577b2639b5fa47a1bf40d0b39d 100644 (file)
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -66,7 +66,7 @@ exmaildir(char *folder)
 
        /* use current folder if none is specified */
        if (folder == NULL)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
 
        if (!(*folder != '/' && strncmp(folder, CWD, NCWD)
                        && strcmp(folder, DOT) && strcmp(folder, DOTDOT)

diff --git a/sbr/path.c b/sbr/path.c
index 8802eaa566e8e18c44c80a1df8fb81cfea61fbb1..b3a8fff58ac81de6ace96c9c331ab243626fb267 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -101,7 +101,8 @@ expath(char *name, int type)
 
        if (type == TSUBCWF) {
                /* @folder to +folder */
-               snprintf(buffer, sizeof(buffer), "%s/%s", getfolder(1), name);
+               snprintf(buffer, sizeof(buffer), "%s/%s",
+                               getfolder(FCUR), name);
                name = m_mailpath(buffer);
                packpath(name);
                snprintf(buffer, sizeof(buffer), "%s/", m_maildir(""));

diff --git a/uip/anno.c b/uip/anno.c
index b7c15636777fd1bbbcc41e8e636898fea18937ec..3a0fa8cbbb7e33dd7d4965dea03de847cb04dffc 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -213,7 +213,7 @@ main(int argc, char **argv)
        if (!msgs.size)
                app_msgarg(&msgs, "cur");
        if (!folder)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
        maildir = m_maildir(folder);
 
        if (chdir(maildir) == NOTOK)

diff --git a/uip/burst.c b/uip/burst.c
index a8f42d0cf3c56c5a80a92fafd32a5b825d53967b..032c5b5ca0fe7bf5d865f79bbb10fc43b833ef77 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -118,7 +118,7 @@ main(int argc, char **argv)
        if (!msgp)
                msgs[msgp++] = "cur";
        if (!folder)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
        maildir = m_maildir(folder);
 
        if (chdir(maildir) == NOTOK)

diff --git a/uip/comp.c b/uip/comp.c
index 7a4936296e6ac5da9e0e7d8dcac9b184b02383e2..9f0929d7104277dd6dcb17c650bdd2300d8090f4 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -148,7 +148,7 @@ main(int argc, char **argv)
                if (!msg)
                        msg = "cur";
                if (!folder)
-                       folder = getfolder(1);
+                       folder = getfolder(FCUR);
                maildir = m_maildir(folder);
 
                if (chdir(maildir) == NOTOK)

diff --git a/uip/dist.c b/uip/dist.c
index 5ff0d6cf90ccb8af90446d1237e15f15fc883adc..131cda9428371858889a77898b771a9cff10bbac 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -166,7 +166,7 @@ main(int argc, char **argv)
                if (!msg)
                        msg = "cur";
                if (!folder)
-                       folder = getfolder(1);
+                       folder = getfolder(FCUR);
                maildir = m_maildir(folder);
 
                if (chdir(maildir) == NOTOK)

diff --git a/uip/flist.c b/uip/flist.c
index 4bf3f82ccbf6d73a03215eb9b0f72c8c949ba5ed..5d9dfcc31481f1072c92075645642957f1eb89d3 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -240,7 +240,7 @@ main(int argc, char **argv)
                free(path("./", TFOLDER));
 
        /* get current folder */
-       strncpy(curfolder, getfolder(1), sizeof(curfolder));
+       strncpy(curfolder, getfolder(FCUR), sizeof(curfolder));
 
        /* get nmh base directory */
        nmhdir = m_maildir("");

diff --git a/uip/folder.c b/uip/folder.c
index 25ab068c4d26c02e52ec5c2131bf178ec3e7a4d6..4fa9424bd3ef15c98dc0e50dd232c15ac1cab5ab 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -273,15 +273,15 @@ main(int argc, char **argv)
                        } else {
                                adios(NULL, "no other folder");
                        }
-                       for (cp = getcpy(getfolder(1)); *ap; ap++)
+                       for (cp = getcpy(getfolder(FCUR)); *ap; ap++)
                                cp = add(*ap, add(" ", cp));
                        free(dp);
                        context_replace(stack, cp);  /* update folder stack */
                } else {
                        /* update folder stack */
                        context_replace(stack, (cp = context_find (stack)) ?
-                                       concat(getfolder(1), " ", cp, NULL) :
-                                       getcpy(getfolder(1)));
+                                       concat(getfolder(FCUR), " ", cp, NULL) :
+                                       getcpy(getfolder(FCUR)));
                }
        }
 
@@ -320,7 +320,7 @@ main(int argc, char **argv)
 
        /* Listing the folder stack */
        if (listsw) {
-               printf("%s", argfolder ? argfolder : getfolder(1));
+               printf("%s", argfolder ? argfolder : getfolder(FCUR));
                if ((cp = context_find(stack))) {
                        dp = getcpy(cp);
                        for (ap = brkstring(dp, " ", "\n"); *ap; ap++)

diff --git a/uip/forw.c b/uip/forw.c
index 13aaaa9992e03a085f3c415b448a0317482e3271..002bb675a86366e4f63bad8247ffc03ec67de647 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -265,7 +265,7 @@ main(int argc, char **argv)
                if (!msgp)
                        msgs[msgp++] = "cur";
                if (!folder)
-                       folder = getfolder(1);
+                       folder = getfolder(FCUR);
                maildir = m_maildir(folder);
 
                if (chdir(maildir) == NOTOK)

diff --git a/uip/inc.c b/uip/inc.c
index c06c57c827727a348252440501e270ce61a3b7da..d23bf32d399bbba9ed86bbecf02cfbce7203f521 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -303,7 +303,7 @@ main(int argc, char **argv)
        if (!context_find("path"))
                free(path("./", TFOLDER));
        if (!folder)
-               folder = getfolder(0);
+               folder = getfolder(FDEF);
        maildir = m_maildir(folder);
 
        if ((maildir_copy = strdup(maildir)) == (char *)0)

diff --git a/uip/mark.c b/uip/mark.c
index fa5c2cba64d77246c17f440b27b7ad9ac29db5e9..d56a1615f37dc73758102513a71768284b94f107 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -156,7 +156,7 @@ main(int argc, char **argv)
        if (!msgs.size)
                app_msgarg(&msgs, listsw ? "all" :"cur");
        if (!folder)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
        maildir = m_maildir(folder);
 
        if (chdir(maildir) == NOTOK)

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 23163f7eec032cb9ce2b0f450777a24a7bba6a82..94c1ce731efd5eafbcceb63b914cf078b4f7c469 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -721,7 +721,7 @@ use_forw:
 
                /* else, use the current folder */
                if (!folder)
-                       folder = add(getfolder(1), NULL);
+                       folder = add(getfolder(FCUR), NULL);
 
                if (!(mp = folder_read(folder)))
                        adios(NULL, "unable to read folder %s", folder);

diff --git a/uip/mhlist.c b/uip/mhlist.c
index f33e39b0470fc844acca676af60e8f1fc204c61c..5eb0937c9b80231d6e93fbc1a2064fdf7a9dad64 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -291,7 +291,7 @@ do_cache:
                if (!msgs.size)
                        app_msgarg(&msgs, "cur");
                if (!folder)
-                       folder = getfolder(1);
+                       folder = getfolder(FCUR);
                maildir = m_maildir(folder);
 
                if (chdir(maildir) == NOTOK)

diff --git a/uip/mhpath.c b/uip/mhpath.c
index bce976ddeda8ebaba48e74a48c128188e39dcbf5..2281ba0ed16aba1908ef9146b0f647803dc92223 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -72,7 +72,7 @@ main(int argc, char **argv)
                free(path("./", TFOLDER));
 
        if (!folder)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
        maildir = m_maildir(folder);
 
        /* If no messages are given, print folder pathname */

diff --git a/uip/mhshow.c b/uip/mhshow.c
index ba5c037e18ab8403a230b73733fd5af17c6ec1e2..bb7a8e71b8b03576e8a5e9e6270a5a1099d38b9f 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -363,7 +363,7 @@ do_cache:
                if (!msgs.size)
                        app_msgarg(&msgs, "cur");
                if (!folder)
-                       folder = getfolder(1);
+                       folder = getfolder(FCUR);
                maildir = m_maildir(folder);
 
                if (chdir(maildir) == NOTOK)

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 7be916328f9628e8a8077fb14344f2c30e2b47c3..f61a5c026fda929fb091066671102cfba70d7d5f 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -306,7 +306,7 @@ do_cache:
                if (!msgs.size)
                        app_msgarg(&msgs, "cur");
                if (!folder)
-                       folder = getfolder(1);
+                       folder = getfolder(FCUR);
                maildir = m_maildir(folder);
 
                if (chdir(maildir) == NOTOK)

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 027dac659f9e08daa09b166a75ecacd32c286674..0fa70cac4ae8624bad809ab11cff067d623b8c9d 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -556,7 +556,7 @@ store_content(CT ct, CT p)
                if (cp[1])
                        folder = pluspath(cp);
                else
-                       folder = getfolder(1);
+                       folder = getfolder(FCUR);
 
                /* Check if folder exists */
                create_folder(m_mailpath(folder), 0, exit);

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 17ca1ab78b5e330e4dcfb1c71d6254ed22fe632b..581349f651f56b9f5b199a61838e1193d0cf32c3 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -284,7 +284,7 @@ do_cache:
                if (!msgs.size)
                        app_msgarg(&msgs, "cur");
                if (!folder)
-                       folder = getfolder(1);
+                       folder = getfolder(FCUR);
                maildir = m_maildir(folder);
 
                if (chdir(maildir) == NOTOK)

diff --git a/uip/packf.c b/uip/packf.c
index d4df05cf949243efceaa07eaac4c82c485b7dcec..727298cde3b7e531dc99cbb951f2deca45b569db 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -128,7 +128,7 @@ main(int argc, char **argv)
                app_msgarg(&msgs, "all");
 
        if (!folder)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
        maildir = m_maildir(folder);
 
        if (chdir(maildir) == NOTOK)

diff --git a/uip/pick.c b/uip/pick.c
index 93a240068b4044069aee161b1ad1f608e35b1f16..69b9415009ff448624ba46bb34187c22259d3db3 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -199,7 +199,7 @@ main(int argc, char **argv)
                app_msgarg(&msgs, "all");
 
        if (!folder)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
        maildir = m_maildir(folder);
 
        if (chdir(maildir) == NOTOK)

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 06b8b694d69049fcc08800e101fbe05a9b89b793..a120c66584f06273592dc94eb36064967796e029 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -149,7 +149,7 @@ main(int argc, char **argv)
 
        /* if no folder is given, use default folder */
        if (!folder)
-               folder = getfolder(0);
+               folder = getfolder(FDEF);
        maildir = m_maildir(folder);
 
        /* check if folder exists */

diff --git a/uip/refile.c b/uip/refile.c
index a79e8be8128f195742e40e703a587adc9cfff4c3..f391f617f95bfd74fef6325e8bb2e22025887e4e 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -192,7 +192,7 @@ main(int argc, char **argv)
        if (!msgs.size)
                app_msgarg(&msgs, "cur");
        if (!folder)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
        strncpy(maildir, m_maildir(folder), sizeof(maildir));
 
        if (chdir(maildir) == NOTOK)

diff --git a/uip/repl.c b/uip/repl.c
index 61ba08cfe50a71954c74f3091dc452dafc25531d..006cabea96f17a251f066a3d5c660e1be15692ed 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -310,7 +310,7 @@ main(int argc, char **argv)
                if (!msg)
                        msg = "cur";
                if (!folder)
-                       folder = getfolder(1);
+                       folder = getfolder(FCUR);
                maildir = m_maildir(folder);
 
                if (chdir(maildir) == NOTOK)

diff --git a/uip/rmf.c b/uip/rmf.c
index 71fd017ff3e83f0d017c5da3ed8e6e8515f3cf6b..94198d0055f50f3e6ce5717005af70b01af247e9 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -84,7 +84,7 @@ main(int argc, char **argv)
        if (!context_find("path"))
                free(path("./", TFOLDER));
        if (!folder) {
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
                defolder++;
        }
        if (strcmp(m_mailpath(folder), pwd()) == 0)
@@ -100,9 +100,9 @@ main(int argc, char **argv)
                if (cp > newfolder)
                        *cp = '\0';
                else
-                       strncpy(newfolder, getfolder(0), sizeof(newfolder));
+                       strncpy(newfolder, getfolder(FDEF), sizeof(newfolder));
        } else {
-               strncpy(newfolder, getfolder(0), sizeof(newfolder));
+               strncpy(newfolder, getfolder(FDEF), sizeof(newfolder));
        }
 
        if (interactive) {

diff --git a/uip/rmm.c b/uip/rmm.c
index 7f773401009120fb8624d475f9def18ecc7621c1..aca436a1afa91bc34240302334bba5e138ed1863 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -83,7 +83,7 @@ main(int argc, char **argv)
        if (!msgs.size)
                app_msgarg(&msgs, "cur");
        if (!folder)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
        maildir = m_maildir(folder);
 
        if (chdir(maildir) == NOTOK)

diff --git a/uip/scan.c b/uip/scan.c
index b42d8a2671f3454a0d82254a2ecb4d0fe5a52512..4b0b3380091a387388fc6a6476abcbe0c104bd69 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -207,7 +207,7 @@ main(int argc, char **argv)
        if (!msgs.size)
                app_msgarg(&msgs, "all");
        if (!folder)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
        maildir = m_maildir(folder);
 
        if (chdir(maildir) == NOTOK)

diff --git a/uip/show.c b/uip/show.c
index b19f7627092d6ba009aacb8f3ff5028f9be14acf..ceb901884a4243a1303408353f94c2582b661dff 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -206,7 +206,7 @@ usage:
        }
 
        if (!folder)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
        maildir = m_maildir(folder);
 
        if (chdir(maildir) == NOTOK)

diff --git a/uip/sortm.c b/uip/sortm.c
index ffe14f864b207a4109aef09e137a06ec2f5f0305..5151889241ab5dcc2120316325d6f36d4ca89ec6 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -171,7 +171,7 @@ main(int argc, char **argv)
        if (!datesw)
                datesw = "date";
        if (!folder)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
        maildir = m_maildir(folder);
 
        if (chdir(maildir) == NOTOK)