/*
* viamail.c -- send multiple files in a MIME message
*
- * $Id$
- *
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
#include <h/mime.h>
#include <h/mhparse.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
static struct swit switches[] = {
#define TOSW 0
{ "to mailpath", 0 },
{ NULL, 0 }
};
-extern int errno;
extern int debugsw;
extern int splitsw;
extern int verbsw;
int ebcdicsw = 0; /* hack for linking purposes */
-/* mhmisc.c */
-void set_endian (void);
-
-/* mhoutsbr.c */
-int writeBase64aux (FILE *, FILE *);
-
/*
* static prototypes
*/
case HELPSW:
snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
print_help (buf, switches, 1);
- done (1);
+ done (0);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case TOSW:
if (!(f1 = *argp++))
char *vec[MAXARGS];
struct stat st;
FILE *fp;
+ char *tfile = NULL;
umask (~m_gmprot ());
- strncpy (tmpfil, m_tmpfil (invo_name), sizeof(tmpfil));
- if ((fp = fopen (tmpfil, "w+")) == NULL)
- adios (tmpfil, "unable to open for writing");
- chmod (tmpfil, 0600);
+ tfile = m_mktemp2(NULL, invo_name, NULL, &fp);
+ if (tfile == NULL) adios("viamail", "unable to create temporary file");
+ chmod(tfile, 0600);
+ strncpy (tmpfil, tfile, sizeof(tmpfil));
if (!strchr(mailsw, '@'))
- mailsw = concat (mailsw, "@", LocalName (), NULL);
+ mailsw = concat (mailsw, "@", LocalName (0), NULL);
fprintf (fp, "To: %s\n", mailsw);
if (subjsw)
if (fromsw) {
if (!strchr(fromsw, '@'))
- fromsw = concat (fromsw, "@", LocalName (), NULL);
+ fromsw = concat (fromsw, "@", LocalName (0), NULL);
fprintf (fp, "From: %s\n", fromsw);
}
if (verbsw)
vec[vecp++] = "-verbose";
- switch (sendsbr (vec, vecp, tmpfil, &st, 0, (char *)0)) {
+ switch (sendsbr (vec, vecp, tmpfil, &st, 0, (char *)0, 0)) {
case DONE:
case NOTOK:
status++;
fclose (fp);
if (unlink (tmpfil) == -1)
advise (NULL, "unable to remove temp file %s", tmpfil);
- return done (status);
+ done (status);
+ return 1;
}