Created pluspath function to check for '+' prefix and change flag for

path() appropriately. This eliminates some duplicate prefix processing,
but not all. The path functions need to be restructed; this is the first
step.

diff --git a/h/prototypes.h b/h/prototypes.h
index 7e772e0201c42deb3e499897fb7aacba87b95efa..7e8948ed748f23d2b7a0409be7d6a57e59786bfa 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -89,6 +89,7 @@ char *path(char *, int);
 int peekc(FILE *ib);
 int pidwait (pid_t, int);
 int pidstatus (int, FILE *, char *);
+char *pluspath(char *);
 void print_help (char *, struct swit *, int);
 void print_sw (char *, struct swit *, char *);
 void print_version (char *);

diff --git a/sbr/path.c b/sbr/path.c
index 0ae27d39e1dcafb23e93a933d929dcc0b7ae7dc7..7475fa081b01113df129ef65af21979316aa68ab 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -26,6 +26,11 @@ static char *pwds;
 static char *expath(char *,int);
 static void compath(char *);
 
+char *
+pluspath(char *name)
+{
+       return path(name + 1, *name == '+' ? TFOLDER : TSUBCWF);
+}
 
 char *
 path(char *name, int flag)

diff --git a/uip/anno.c b/uip/anno.c
index 0d4413492fc6f018da6db78ba55d67d88b49eb9a..ca3497a40a0110825637c62e149b954ba90e2525 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -211,7 +211,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/burst.c b/uip/burst.c
index 908de0df8110bbdc53c2426af031e4af7d161aa8..319918bb35f6ed3670412ee4b5e1a4fc4753cb5c 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -111,7 +111,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else {
            msgs[msgp++] = cp;
        }

diff --git a/uip/comp.c b/uip/comp.c
index 8fced484def5a5be30089c3d19a2ecd1fcd8ef09..67cf83bb502199f9e23733d462d20b489cddf188 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -172,7 +172,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else {
            if (msg)
                adios (NULL, "only one message at a time!");

diff --git a/uip/dist.c b/uip/dist.c
index 70e515eb611d31aa7e27240cca6fa8ec4cb98c85..d8c261da4c9dbf78d22ff9db200f988322695fbc 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -180,7 +180,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else {
            if (msg)
                adios (NULL, "only one message at a time!");

diff --git a/uip/flist.c b/uip/flist.c
index 36be1ed29b673b1be43907fb3dc05a703e175b06..cb80978e3ed25969ac7a1c4deb9002ea9db78a35 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -232,7 +232,7 @@ main(int argc, char **argv)
            }
            if (*cp == '+' || *cp == '@') {
                foldersToDo[numfolders++] =
-                   path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+                   pluspath (cp);
            } else
                foldersToDo[numfolders++] = cp;
        }

diff --git a/uip/folder.c b/uip/folder.c
index 98c66ed627db5e72f169c82d15f07d6f2eccbe6a..f04ae2fa0f837bf6efef4da255a794c96047d5c0 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -259,7 +259,7 @@ main (int argc, char **argv)
            if (argfolder)
                adios (NULL, "only one folder at a time!");
            else
-               argfolder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               argfolder = pluspath (cp);
        } else {
            if (msg)
                adios (NULL, "only one (current) message at a time!");

diff --git a/uip/forw.c b/uip/forw.c
index 93870b1af0c5c91e9cf1bc9738adb7536de5ccf4..7645e3821f06485009226d2412ad8bceaee48612 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -285,7 +285,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else {
            msgs[msgp++] = cp;
        }

diff --git a/uip/inc.c b/uip/inc.c
index aee194aa39c6ab3539e8d3afe60494ddf2bdb696..a2ecb4406c987053ee428a4f600d702cf88ff0d9 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -457,7 +457,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else {
            adios (NULL, "usage: %s [+folder] [switches]", invo_name);
        }

diff --git a/uip/mark.c b/uip/mark.c
index e26ca6a5938e0579a354d248eb900a994f1d0f62..4799b238214270edbae4e80ad3fb3de02f521a93 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -137,7 +137,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 4882ecb2cc9975ccfcec065825f3afa7aad3e2c9..8906d7fea90d45df7dcbcf1a1b83dea27afc8bd5 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -3254,7 +3254,7 @@ use_forw:
                if (folder)
                    adios (NULL, "only one folder per #forw directive");
                else
-                   folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+                   folder = pluspath (cp);
            }
        }
 

diff --git a/uip/mhlist.c b/uip/mhlist.c
index b130cf1aea76a6aa57dfe9ed6f0733034f6af6f8..1de53e33aa29d83b541f94c95ea9f92710f0b7bb 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -242,7 +242,7 @@ do_cache:
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/mhn.c b/uip/mhn.c
index cfeac947622e6a58c3dd0956356cd4470265f785..809568c5c675edbc80ac0c79ef5a8f38055c5ec3 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -427,7 +427,7 @@ do_cache:
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 00983d52b4d091554743ec39bd26ec1302610b0a..3974515d961016d72be74d013b96472c8413632a 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -67,7 +67,7 @@ main(int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/mhshow.c b/uip/mhshow.c
index df4cf51234e156e516c9156f51e3e8fb7e36ff6e..3e7e3a5f24537f15c88c3a56eef5edf19c0c308d 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -283,7 +283,7 @@ do_cache:
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 08891f53016830e4ac1d54238cec009f48bc0771..dc627247351f47bba65f10b2f9591b7381bf8749 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -229,7 +229,7 @@ do_cache:
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index bf5088e7ee4567b420a4385a84db6f88c608861b..23b4ef2ed2059ca95c913eee9eb82ca1b14be5ca 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -565,7 +565,7 @@ store_content (CT ct, CT p)
 
        /* Get the folder name */
        if (cp[1])
-           folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+           folder = pluspath (cp);
        else
            folder = getfolder (1);
 

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 140c7d90092b812abeeee927e04a7d62c68b2596..5e6494a201006f6212cc86d60a8c4d1068a614a6 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -230,7 +230,7 @@ do_cache:
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/msh.c b/uip/msh.c
index 257fc4216737b74e3d3da0e2505e58bac48d14f1..4b91790507d436ac4aadd3cb39ac16e006908b13 100644 (file)
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -351,7 +351,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        }
        else
            if (file)

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index f2c913cd1b9623587c3f34ece4cc89c0b43a593a..60f34130b5316cbe6abd5b38300bb68cd122c0fa 100644 (file)
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -593,7 +593,7 @@ filehak (char **args)
        if (cwd == NULL)
            cwd = getcpy (pwd ());
        chdir (m_maildir (""));
-       cp = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+       cp = pluspath (cp);
        if (access (m_maildir (cp), F_OK) == NOTOK)
            result = OK;
        free (cp);
@@ -703,7 +703,7 @@ foldcmd (char **args)
                return;
            }
            else
-               folder = fmsh ? path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF)
+               folder = fmsh ? pluspath (cp)
                            : cp + 1;
        }
        else

diff --git a/uip/packf.c b/uip/packf.c
index e074505701686b85b4728f7314899a5fff777dd4..9f9546670b1f80fa2b05698fb7f13cfdd5648cf7 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -98,7 +98,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+           folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/pick.c b/uip/pick.c
index 8fd294ee140fc85caf6e17e1641cc8fe87bc4065..dff628aec85ffde37f58a83953d278a567fbcd52 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -177,7 +177,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/popi.c b/uip/popi.c
index 3a03c0a5232a2cd32902d05b4e707b312e05bc2b..f522042ef37ea9c5d83a4fcf65b73b26411cf04d 100644 (file)
--- a/uip/popi.c
+++ b/uip/popi.c
@@ -191,7 +191,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        }
        else
            adios (NULL, "usage: %s [+folder] [switches]", invo_name);

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 7b15491f36292d74dbea558d88fb15c0700403c7..4e14afbbd01e490278dd0316a83f5dd0fb82ca2d 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -134,7 +134,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else {
            adios (NULL, "usage: %s [+folder] [switches]", invo_name);
        }

diff --git a/uip/refile.c b/uip/refile.c
index e77fe0b18230a372ac2c8526dd79338ef050bde0..0b3afe12b357a33df9c491eb7686f5ca10029aa3 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -163,7 +163,7 @@ main (int argc, char **argv)
            if (foldp > NFOLDERS)
                adios (NULL, "only %d folders allowed!", NFOLDERS);
            folders[foldp++].f_name =
-               path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/repl.c b/uip/repl.c
index e5fa527d6aee378764015a66f6c8aa74afb0a885..7a1aca18b6f287fbba22527575fae561772b2802 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -319,7 +319,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else {
            if (msg)
                adios (NULL, "only one message at a time!");

diff --git a/uip/rmf.c b/uip/rmf.c
index fb951ed08e1536bb7f51ee1f89381a7146ad249b..1cacbc472d0d266915aa1f1cb453a35ab4732646 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -78,7 +78,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else {
            adios (NULL, "usage: %s [+folder] [switches]", invo_name);
        }

diff --git a/uip/rmm.c b/uip/rmm.c
index 75b1c70e495d1f5cbd3676327348f8cf4f5a01ad..b1e887e7103591258b39de7073bc7dc330b8bd05 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -77,7 +77,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/scan.c b/uip/scan.c
index 4334efe5ed7e2bf684e21b17e6536838ecac92b5..05f8bf88c78aad6ad439fecc04eac7b04aefaff9 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -155,7 +155,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }

diff --git a/uip/show.c b/uip/show.c
index 31a05e93146373a2021a51bc59a63b1c44183f16..2db32d7ee867902e57d8c69c0fc8e672c575bd44 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -179,7 +179,7 @@ usage:
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else {
            if (mode != SHOW)
                goto usage;

diff --git a/uip/sortm.c b/uip/sortm.c
index 5faec79aeb2851329c664e27eb5f9dafda8ac4f4..d483d8686112140957fab5574900f642ba15d122 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -160,7 +160,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }