*** efax-08a/efax.c	Wed Oct 21 11:52:17 1998
--- efax-08a-orig/efax.c	Wed Oct 21 11:34:28 1998
***************
*** 42,48 ****
    "  -e cmd  exec \"/bin/sh -c cmd\" for voice calls\n"
    "  -f fnt  use (PBM) font file fnt for headers\n"
    "  -g cmd  exec \"/bin/sh -c cmd\" for data calls\n"
-   "  -A cmd  exec \"/bin/sh -c cmd\" for Activity Detected\n"
    "  -h hdr  use page header hdr (use %%d's for current page/total pages)\n"
    "  -i str  send modem command ATstr at start\n"
    "  -j str  send modem command ATstr after set fax mode\n"
--- 42,47 ----
***************
*** 1783,1789 ****
  
  int answer ( TFILE *f, char **lkfile, 
  	    int wait, int share, int softaa, 
! 	    char *getty, char *vcmd, char *acmd, char *Acmd )
  {
    int err=0, c ;
    int crate=19200, hsc=-1, i ;
--- 1782,1788 ----
  
  int answer ( TFILE *f, char **lkfile, 
  	    int wait, int share, int softaa, 
! 	    char *getty, char *vcmd, char *acmd )
  {
    int err=0, c ;
    int crate=19200, hsc=-1, i ;
***************
*** 1799,1821 ****
      msg ( "Iwaiting for activity") ;
      tdata ( f, -1 ) ;
      msg ( "Iactivity detected") ;
- /*--------- by M.A. ------------*/
- 
-      if ( Acmd && *Acmd ) {
-         char buf [ MAXGETTY ] ;
-         if ( ckfmt ( Acmd, 6 ) ) {
-         } else {
-           sprintf ( buf, Acmd, f->fd, f->fd, f->fd, f->fd, f->fd, f->fd ) ;
-           msg ( "Iexec'ing /bin/sh -c \"%s\"" , buf ) ;
-           execl ( "/bin/sh" , "sh" , "-c" , buf , (void*) 0 ) ;
-           err = msg ( "ES2exec failed:" ) ;
-         }
-       } else {
-         err = msg ( "E2no ANCTIVITY command defined for ACTIV. DETECT." ) ;
-       }
- 
- 
- /* ----------- by M.A. ------------*/
    }
    
    if ( ! err && share ) {
--- 1798,1803 ----
***************
*** 1973,1979 ****
    TFILE faxdev = { -1, 0,0,0,0, {0}, {0}, 0, 0 } ;
  
    int softaa=0, share=0, wait=0, reverse=1, ignerr=0, noretry=0 ;
!   char *getty = "", *vcmd = "", *acmd=ANSCMD, *Acmd="" ;
  
    cap local = { DEFCAP } ;
    char localid  [ IDLEN + 1 ] = DEFID ;
--- 1955,1961 ----
    TFILE faxdev = { -1, 0,0,0,0, {0}, {0}, 0, 0 } ;
  
    int softaa=0, share=0, wait=0, reverse=1, ignerr=0, noretry=0 ;
!   char *getty = "", *vcmd = "", *acmd=ANSCMD ;
  
    cap local = { DEFCAP } ;
    char localid  [ IDLEN + 1 ] = DEFID ;
***************
*** 1998,2004 ****
  
    while ( ! err && ! doneargs &&
  	 ( c = nextopt ( argc,argv,
! 			"A:a:c:d:e:f:g:h:i:j:k:l:o:p:q:r:st:v:wx:T" ) ) != -1 ) {
      switch (c) {
      case 'a': 
        acmd = nxtoptarg ;
--- 1980,1986 ----
  
    while ( ! err && ! doneargs &&
  	 ( c = nextopt ( argc,argv,
! 			"a:c:d:e:f:g:h:i:j:k:l:o:p:q:r:st:v:wx:T" ) ) != -1 ) {
      switch (c) {
      case 'a': 
        acmd = nxtoptarg ;
***************
*** 2037,2045 ****
      case 'e': 
        vcmd = nxtoptarg ; 
        break ;
-     case 'A':
- 	Acmd=nxtoptarg;
-       break;
      case 'g': 
        getty = nxtoptarg ; 
        break ;
--- 2019,2024 ----
***************
*** 2139,2145 ****
        err = dial ( &faxdev, phnum, 0 ) ;
      } else {
        err = answer ( &faxdev, lkfile, wait, share, softaa, 
! 		    getty, vcmd, acmd, Acmd ) ;
        if ( err == 1 ) locked = 1 ;
      }
  
--- 2118,2124 ----
        err = dial ( &faxdev, phnum, 0 ) ;
      } else {
        err = answer ( &faxdev, lkfile, wait, share, softaa, 
! 		    getty, vcmd, acmd ) ;
        if ( err == 1 ) locked = 1 ;
      }