static struct swit switches[] = {
#define BODYSW 0
- { "body text", 0 },
+ { "bodytext text", 0 },
#define CCSW 1
{ "cc addrs ...", 0 },
#define FROMSW 2
{
pid_t child_id;
int status, iscc = 0, nvec;
- unsigned int i;
- int somebody;
char *cp, *tolist = NULL, *cclist = NULL, *subject = NULL;
char *from = NULL, *body = NULL, **argp, **arguments;
char *vec[5], buf[BUFSIZ];
FILE *out;
char *tfile = NULL;
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
- /* foil search of user profile/context */
- if (context_foil(NULL) == -1)
- done(1);
-
/* Without arguments, exit. */
if (argc == 1) {
adios(NULL, "no interactive mail shell. Use inc/scan/show instead.");
}
+ context_read();
+
arguments = getarguments(invo_name, argc, argv, 0);
argp = arguments;
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(1);
+ /* sysexits.h EX_USAGE */
+ exit(1);
case UNKWNSW:
adios(NULL, "-%s unknown", cp);
"%s addrs... [switches]",
invo_name);
print_help(buf, switches, 0);
- done(1);
+ exit(0);
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(0);
case FROMSW:
if (!(from = *argp++) || *from == '-')
if (body) {
fprintf(out, "%s", body);
- if (*body && *(body + strlen(body) - 1) != '\n')
+ if (*body && body[strlen(body) - 1] != '\n')
fputs("\n", out);
} else {
- for (somebody = 0; (i = fread(buf, sizeof(*buf), sizeof(buf),
- stdin)) > 0; somebody++)
- if (fwrite(buf, sizeof(*buf), i, out) != i)
+ int empty = 1;
+
+ while (fgets(buf, sizeof buf, stdin)) {
+ if (buf[0]=='.' && buf[1]=='\n') {
+ /* A period alone on a line means EOF. */
+ break;
+ }
+ empty = 0;
+ if (fputs(buf, out) == EOF) {
adios(tmpfil, "error writing");
- if (!somebody) {
+ }
+ }
+ if (empty) {
unlink(tmpfil);
- done(1);
+ adios(NULL, "not sending message with empty body");
}
}
fclose(out);
if (in == -1 || out == -1) {
fprintf(stderr, "Letter left at %s.\n",
tmpfil);
- done(status ? 1 : 0);
+ /* sysexits.h exit-status from spost */
+ exit(status ? 1 : 0);
}
cpydata(in, out, tmpfil, "dead.letter");
close(in);
fprintf(stderr, "Letter saved in dead.letter\n");
}
unlink(tmpfil);
- done(status ? 1 : 0);
+ /* sysexits.h exit status from spost */
+ exit(status ? 1 : 0);
}
return 0; /* dead code to satisfy the compiler */
intrser(int i)
{
unlink(tmpfil);
- done(i != 0 ? 1 : 0);
+ exit(i != 0 ? 1 : 0);
}