X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fviamail.c;h=ccca115390a50a9a9fec55c1d70021a9caade9f2;hp=1d876cbba76aa81875f33e8d72dc8fca6356916d;hb=51cb63baa791f6ba84c0a7f8538ecfd00b013bcb;hpb=b067ff5c465a5d243ce5a19e562085a9a1a97215 diff --git a/uip/viamail.c b/uip/viamail.c index 1d876cb..ccca115 100644 --- a/uip/viamail.c +++ b/uip/viamail.c @@ -34,8 +34,6 @@ static struct swit switches[] = { { "description text", 0 }, #define COMMENTSW 5 { "comment text", 0 }, -#define DELAYSW 6 - { "delay seconds", 0 }, #define VERBSW 7 { "verbose", 0 }, #define NVERBSW 8 @@ -50,7 +48,6 @@ static struct swit switches[] = { }; extern int debugsw; -extern int splitsw; extern int verbsw; int ebcdicsw = 0; /* hack for linking purposes */ @@ -64,13 +61,12 @@ int writeBase64aux (FILE *, FILE *); /* * static prototypes */ -static int via_mail (char *, char *, char *, char *, char *, int, char *); +static int via_mail (char *, char *, char *, char *, char *, char *); int main (int argc, char **argv) { - int delay = 0; char *f1 = NULL, *f2 = NULL, *f3 = NULL; char *f4 = NULL, *f5 = NULL, *f7 = NULL; char *cp, buf[BUFSIZ]; @@ -125,18 +121,6 @@ main (int argc, char **argv) if (!(f5 = *argp++)) adios (NULL, "missing argument to %s", argp[-2]); continue; - case DELAYSW: - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - - /* - * If there is an error, just reset the - * delay parameter to -1. We will set - * a default delay later. - */ - if (sscanf (cp, "%d", &delay) != 1) - delay = -1; - continue; case FROMSW: if (!(f7 = *argp++)) adios (NULL, "missing argument to %s", argp[-2]); @@ -161,7 +145,7 @@ main (int argc, char **argv) if (!f1) adios (NULL, "missing -viamail \"mailpath\" switch"); - via_mail (f1, f2, f3, f4, f5, delay, f7); + via_mail (f1, f2, f3, f4, f5, f7); return 0; /* dead code to satisfy the compiler */ } @@ -172,7 +156,7 @@ main (int argc, char **argv) static int via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw, - char *cmntsw, int delay, char *fromsw) + char *cmntsw, char *fromsw) { int status, vecp = 1; char tmpfil[BUFSIZ]; @@ -225,11 +209,6 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw, if (fstat (fileno (fp), &st) == NOTOK) adios ("failed", "fstat of %s", tmpfil); - if (delay < 0) - splitsw = 10; - else - splitsw = delay; - status = 0; vec[0] = r1bindex (postproc, '/'); if (verbsw)