Print this page
5166 sendmail package should be replaceable
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Reviewed by: Toomas Soome <tsoome@me.com>
*** 36,47 ****
* University Acknowledgment- Portions of this document are derived from
* software developed by the University of California, Berkeley, and its
* contributors.
*/
- #pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* mailx -- a modified version of a University of California at Berkeley
* mail program
*
* Handle name lists.
--- 36,45 ----
*** 605,633 ****
extra = 2;
if (rflag != NOSTR)
extra += 2;
- #ifdef SENDMAIL
extra++;
metoo = value("metoo") != NOSTR;
if (metoo)
extra++;
verbose = value("verbose") != NOSTR;
if (verbose)
extra++;
if (hflag)
extra += 2;
- #endif /* SENDMAIL */
top = (char **) salloc((t + extra) * sizeof (char *));
ap = top;
! *ap++ = "mail";
if (rflag != NOSTR) {
*ap++ = "-r";
*ap++ = rflag;
}
- #ifdef SENDMAIL
*ap++ = "-i";
if (metoo)
*ap++ = "-m";
if (verbose)
*ap++ = "-v";
--- 603,628 ----
extra = 2;
if (rflag != NOSTR)
extra += 2;
extra++;
metoo = value("metoo") != NOSTR;
if (metoo)
extra++;
verbose = value("verbose") != NOSTR;
if (verbose)
extra++;
if (hflag)
extra += 2;
top = (char **) salloc((t + extra) * sizeof (char *));
ap = top;
! *ap++ = "sendmail";
if (rflag != NOSTR) {
*ap++ = "-r";
*ap++ = rflag;
}
*ap++ = "-i";
if (metoo)
*ap++ = "-m";
if (verbose)
*ap++ = "-v";
*** 634,644 ****
if (hflag) {
*ap++ = "-h";
snprintf(hbuf, sizeof (hbuf), "%d", hflag);
*ap++ = savestr(hbuf);
}
- #endif /* SENDMAIL */
while (n != NIL) {
if (n->n_type & GDEL) {
n = n->n_flink;
continue;
}
--- 629,638 ----