projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We don't want to use copy() anymore; but kept it for concat() only
[mmh]
/
uip
/
inc.c
diff --git
a/uip/inc.c
b/uip/inc.c
index
186312e
..
54eb70e
100644
(file)
--- a/
uip/inc.c
+++ b/
uip/inc.c
@@
-163,7
+163,7
@@
main(int argc, char **argv)
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex(argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
/* read user profile/context */
context_read();
@@
-192,7
+192,7
@@
main(int argc, char **argv)
case AUDSW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s", argp[-2]);
case AUDSW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s", argp[-2]);
- audfile = getcpy(m_maildir(cp));
+ audfile = getcpy(expanddir(cp));
continue;
case NAUDSW:
audfile = NULL;
continue;
case NAUDSW:
audfile = NULL;
@@
-223,7
+223,7
@@
main(int argc, char **argv)
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- from = path(cp, TFILE);
+ from = getcpy(expanddir(cp));
/*
** If the truncate file is in default state,
/*
** If the truncate file is in default state,
@@
-265,7
+265,7
@@
main(int argc, char **argv)
if (folder)
adios(NULL, "only one folder at a time!");
else
if (folder)
adios(NULL, "only one folder at a time!");
else
- folder = pluspath(cp);
+ folder = getcpy(expandfol(cp));
} else {
adios(NULL, "usage: %s [+folder] [switches]",
invo_name);
} else {
adios(NULL, "usage: %s [+folder] [switches]",
invo_name);
@@
-286,9
+286,9
@@
main(int argc, char **argv)
if (from)
newmail = from;
else if ((newmail = getenv("MAILDROP")) && *newmail)
if (from)
newmail = from;
else if ((newmail = getenv("MAILDROP")) && *newmail)
- newmail = m_mailpath(newmail);
+ newmail = toabsdir(newmail);
else if ((newmail = context_find("maildrop")) && *newmail)
else if ((newmail = context_find("maildrop")) && *newmail)
- newmail = m_mailpath(newmail);
+ newmail = toabsdir(newmail);
else {
newmail = concat(MAILDIR, "/", MAILFIL, NULL);
}
else {
newmail = concat(MAILDIR, "/", MAILFIL, NULL);
}
@@
-300,11
+300,9
@@
main(int argc, char **argv)
newmail = cp;
newmail = cp;
- if (!context_find("path"))
- free(path("./", TFOLDER));
if (!folder)
if (!folder)
- folder = getfolder(0);
- maildir = m_maildir(folder);
+ folder = getdeffol();
+ maildir = toabsdir(folder);
if ((maildir_copy = strdup(maildir)) == (char *)0)
adios(maildir, "error allocating memory to copy maildir");
if ((maildir_copy = strdup(maildir)) == (char *)0)
adios(maildir, "error allocating memory to copy maildir");
@@
-508,7
+506,7
@@
main(int argc, char **argv)
if (msgnum == hghnum) {
admonish(NULL, "no messages incorporated");
} else {
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;
if (chgflag)
mp->curmsg = hghnum + 1;
mp->hghmsg = msgnum;