#include <h/md5.h>
#include <errno.h>
#include <signal.h>
-#include <h/mts.h>
#include <h/tws.h>
#include <h/mime.h>
#include <h/mhparse.h>
#include <h/mhcachesbr.h>
#include <h/utils.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
static struct swit switches[] = {
#define CHECKSW 0
{ "check", 0 },
** static prototypes
*/
static int write_content(CT *, char *);
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
int
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex(argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
if (!(cp = *argp++) || (*cp == '-' && cp[1]))
adios(NULL, "missing argument to %s",
argp[-2]);
- file = *cp == '-' ? cp : path(cp, TFILE);
+ file = *cp == '-' ? cp : getcpy(expanddir(cp));
continue;
case OUTFILESW:
if (!(cp = *argp++) || (*cp == '-' && cp[1]))
adios(NULL, "missing argument to %s",
argp[-2]);
- outfile = *cp == '-' ? cp : path(cp, TFILE);
+ outfile = *cp == '-' ? cp : getcpy(expanddir(cp));
continue;
case VERBSW:
if (folder)
adios(NULL, "only one folder at a time!");
else
- folder = pluspath(cp);
+ folder = getcpy(expandfol(cp));
} else
app_msgarg(&msgs, cp);
}
/* Check for private cache location */
if (!(cache_private = context_find(nmhprivcache)))
cache_private = ".cache";
- cache_private = getcpy(m_maildir(cache_private));
+ cache_private = getcpy(toabsdir(cache_private));
/*
** Check for storage directory. If specified,
if ((cp = context_find(nmhstorage)) && *cp)
tmp = concat(cp, "/", invo_name, NULL);
else
- tmp = add(m_maildir(invo_name), NULL);
-
- if (!context_find("path"))
- free(path("./", TFOLDER));
+ tmp = getcpy(toabsdir(invo_name));
if (file && msgs.size)
adios(NULL, "cannot specify msg and file at same time!");
adios(NULL, "out of memory");
ctp = cts;
- if ((ct = parse_mime(file)));
+ if ((ct = parse_mime(file)))
*ctp++ = ct;
} else {
/*
** message(s) are coming from a folder
*/
if (!msgs.size)
- app_msgarg(&msgs, "cur");
+ app_msgarg(&msgs, seq_cur);
if (!folder)
- folder = getfolder(1);
- maildir = m_maildir(folder);
+ folder = getcurfol();
+ maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK)
adios(maildir, "unable to change directory to");
/* 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 */
}
-static RETSIGTYPE
+static void
pipeser(int i)
{
if (i == SIGQUIT) {