Print this page
5166 sendmail package should be replaceable

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/mailx/names.c
          +++ new/usr/src/cmd/mailx/names.c
↓ open down ↓ 30 lines elided ↑ open up ↑
  31   31  /*
  32   32   * University Copyright- Copyright (c) 1982, 1986, 1988
  33   33   * The Regents of the University of California
  34   34   * All Rights Reserved
  35   35   *
  36   36   * University Acknowledgment- Portions of this document are derived from
  37   37   * software developed by the University of California, Berkeley, and its
  38   38   * contributors.
  39   39   */
  40   40  
  41      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  42      -
  43   41  /*
  44   42   * mailx -- a modified version of a University of California at Berkeley
  45   43   *      mail program
  46   44   *
  47   45   * Handle name lists.
  48   46   */
  49   47  
  50   48  #include "rcv.h"
  51   49  #include <locale.h>
  52   50  
↓ open down ↓ 547 lines elided ↑ open up ↑
 600  598           * We need at least 2 extra -- one for "mail" and one for
 601  599           * the terminating 0 pointer.
 602  600           * Additional spots may be needed to pass along -r and -f to 
 603  601           * the host mailer.
 604  602           */
 605  603  
 606  604          extra = 2;
 607  605  
 608  606          if (rflag != NOSTR)
 609  607                  extra += 2;
 610      -#ifdef SENDMAIL
 611  608          extra++;
 612  609          metoo = value("metoo") != NOSTR;
 613  610          if (metoo)
 614  611                  extra++;
 615  612          verbose = value("verbose") != NOSTR;
 616  613          if (verbose)
 617  614                  extra++;
 618  615          if (hflag)
 619  616                  extra += 2;
 620      -#endif /* SENDMAIL */
 621  617          top = (char **) salloc((t + extra) * sizeof (char *));
 622  618          ap = top;
 623      -        *ap++ = "mail";
      619 +        *ap++ = "sendmail";
 624  620          if (rflag != NOSTR) {
 625  621                  *ap++ = "-r";
 626  622                  *ap++ = rflag;
 627  623          }
 628      -#ifdef SENDMAIL
 629  624          *ap++ = "-i";
 630  625          if (metoo)
 631  626                  *ap++ = "-m";
 632  627          if (verbose)
 633  628                  *ap++ = "-v";
 634  629          if (hflag) {
 635  630                  *ap++ = "-h";
 636  631                  snprintf(hbuf, sizeof (hbuf), "%d", hflag);
 637  632                  *ap++ = savestr(hbuf);
 638  633          }
 639      -#endif /* SENDMAIL */
 640  634          while (n != NIL) {
 641  635                  if (n->n_type & GDEL) {
 642  636                          n = n->n_flink;
 643  637                          continue;
 644  638                  }
 645  639                  *ap++ = n->n_name;
 646  640                  n = n->n_flink;
 647  641          }
 648  642          *ap = NOSTR;
 649  643          return(top);
↓ open down ↓ 192 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX