#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex(argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* foil search of user profile/context */
if (context_foil(NULL) == -1)
/* If no arguments, just incorporate new mail */
if (argc == 1) {
- execlp(incproc, r1bindex(incproc, '/'), NULL);
+ execlp(incproc, mhbasename(incproc), NULL);
adios(incproc, "unable to exec");
}
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch(++cp, switches)) {
- case AMBIGSW:
- ambigsw(cp, switches);
- done(1);
- case UNKWNSW:
- adios(NULL, "-%s unknown", cp);
-
- case HELPSW:
- snprintf(buf, sizeof(buf), "%s [addrs ... [switches]]", invo_name);
- print_help(buf, switches, 0);
- done(1);
- case VERSIONSW:
- print_version(invo_name);
- done(1);
-
- case FROMSW:
- if (!(from = *argp++) || *from == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- continue;
-
- case BODYSW:
- if (!(body = *argp++) || *body == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- continue;
-
- case CCSW:
- iscc++;
- continue;
-
- case SUBJSW:
- if (!(subject = *argp++) || *subject == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- continue;
-
- case RESNDSW:
- resent++;
- continue;
-
- case QUEUESW:
- queued++;
- continue;
+ case AMBIGSW:
+ ambigsw(cp, switches);
+ done(1);
+ case UNKWNSW:
+ adios(NULL, "-%s unknown", cp);
+
+ case HELPSW:
+ snprintf(buf, sizeof(buf),
+ "%s [addrs ... [switches]]",
+ invo_name);
+ print_help(buf, switches, 0);
+ done(1);
+ case VERSIONSW:
+ print_version(invo_name);
+ done(1);
+
+ case FROMSW:
+ if (!(from = *argp++) || *from == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
+
+ case BODYSW:
+ if (!(body = *argp++) || *body == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
+
+ case CCSW:
+ iscc++;
+ continue;
+
+ case SUBJSW:
+ if (!(subject = *argp++) || *subject == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
+
+ case RESNDSW:
+ resent++;
+ continue;
+
+ case QUEUESW:
+ queued++;
+ continue;
}
}
if (iscc)
fprintf(out, "%sTo: %s\n", resent ? "Resent-" : "", tolist);
if (cclist)
- fprintf(out, "%scc: %s\n", resent ? "Resent-" : "", cclist);
+ fprintf(out, "%sCc: %s\n", resent ? "Resent-" : "", cclist);
if (subject)
fprintf(out, "%sSubject: %s\n", resent ? "Resent-" : "", subject);
if (from)
fclose(out);
nvec = 0;
- vec[nvec++] = r1bindex(postproc, '/');
+ vec[nvec++] = mhbasename(postproc);
vec[nvec++] = tmpfil;
if (resent)
vec[nvec++] = "-dist";