projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed void casts for ignored return values of function calls.
[mmh]
/
uip
/
show.c
diff --git
a/uip/show.c
b/uip/show.c
index
fb517d1
..
757b001
100644
(file)
--- a/
uip/show.c
+++ b/
uip/show.c
@@
-112,7
+112,7
@@
usage:
adios(NULL, "only one file at a time!");
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s", argp[-2]);
adios(NULL, "only one file at a time!");
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s", argp[-2]);
- file = path(cp, TFILE);
+ file = getcpy(expanddir(cp));
continue;
case HEADSW:
continue;
case HEADSW:
@@
-164,7
+164,7
@@
usage:
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 if (mode != SHOW) {
goto usage;
} else {
} else if (mode != SHOW) {
goto usage;
} else {
@@
-203,8
+203,8
@@
usage:
}
if (!folder)
}
if (!folder)
- folder = getfolder(FCUR);
- maildir = m_maildir(folder);
+ folder = getcurfol();
+ maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK)
adios(maildir, "unable to change directory to");
if (chdir(maildir) == NOTOK)
adios(maildir, "unable to change directory to");
@@
-244,7
+244,7
@@
usage:
seq_setcur(mp, mp->hghsel); /* update current message */
seq_save(mp); /* synchronize sequences */
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)
context_save(); /* save the context file */
if (headersw && vecp == 2)
@@
-333,7
+333,7
@@
go_to_it: ;
if (!strcmp(mhbasename(proc), "mhl")
&& !file
&& chdir(maildir =
if (!strcmp(mhbasename(proc), "mhl")
&& !file
&& chdir(maildir =
- concat(m_maildir(""), "/", NULL)) != NOTOK) {
+ concat(toabsdir("+"), "/", NULL)) != NOTOK) {
mp->foldpath = concat(mp->foldpath, "/", NULL);
cp = isprefix(maildir, mp->foldpath)
? mp->foldpath + strlen(maildir)
mp->foldpath = concat(mp->foldpath, "/", NULL);
cp = isprefix(maildir, mp->foldpath)
? mp->foldpath + strlen(maildir)
@@
-375,7
+375,7
@@
is_nontext(char *msgnam)
int passno;
char c;
int passno;
char c;
- cp = add(buf, NULL);
+ cp = getcpy(buf);
while (state == FLDPLUS) {
state = m_getfld(state, name, buf,
sizeof(buf), fp);
while (state == FLDPLUS) {
state = m_getfld(state, name, buf,
sizeof(buf), fp);
@@
-481,7
+481,7
@@
out:
** Check Content-Transfer-Encoding field
*/
if (!mh_strcasecmp(name, ENCODING_FIELD)) {
** Check Content-Transfer-Encoding field
*/
if (!mh_strcasecmp(name, ENCODING_FIELD)) {
- cp = add(buf, NULL);
+ cp = getcpy(buf);
while (state == FLDPLUS) {
state = m_getfld(state, name, buf,
sizeof(buf), fp);
while (state == FLDPLUS) {
state = m_getfld(state, name, buf,
sizeof(buf), fp);