[comp.sources.unix] v24i028: Elm mail system, release 2.3, patches, Part04/11

rsalz@uunet.uu.net (Rich Salz) (03/06/91)

Submitted-by: Syd Weinstein <syd@DSI.COM>
Posting-number: Volume 24, Issue 28
Archive-name: elm2.3patches/part04

Subject: elm 2.3 Patch #4
Summary: This is an official patch for elm 2.3 system.  Please apply it.
Priority: MEDIUM


Some bug fixes plus the 8 bit support code and configuration support:

Fix encoding to encode lines that start with [ and are not
valid Elm keywords.  It was confusing decode.
~From: Syd via a report from Lenny Tropiano

Add a new configuration internal variable to support
remembering correctly hostcomp for Configure -d
~From: Chip Salzenberg

Make 8 bit work and add some better defaults to the
configure script.
~From: Syd via patch idea from Robert Claeson <prc@erbe.se>

Fix typo in Instruct and Configure
~From: David Kozinn <monymsys!david>

Fix boundry check on argument count in fastmail
~From: Syd reported by Eric J. Peterson


Fix:	From rn, say "| patch -p -N -d DIR", where DIR is your elm source
	directory.  Outside of rn, say "cd DIR; patch -p -N <thisarticle".
	If you don't have the patch program, apply the following by hand,
	or get patch (version 2.0, latest patchlevel).

	After patching:
		sh Configure
		make
		make install

	If patch indicates that patchlevel is the wrong version, you may need
	to apply one or more previous patches, or the patch may already
	have been applied.  See the patchlevel.h file to find out what has or
	has not been applied.  In any event, don't continue with the patch.

	If you are missing previous patches they can be obtained from our:
	archive server.

	Syd Weinstein
	elm@DSI.COM

	The patches are available from the dsinc archive server
	Send the following message to archive-server@DSI.COM for
	a list of available patches:

	Subject: patch list
	send index elm

Index: hdrs/patchlevel.h
Prereq: 3
*** ../elm2.3/hdrs/patchlevel.h	Thu Jun 21 23:59:55 1990
--- hdrs/patchlevel.h	Fri Jun 22 00:10:55 1990
***************
*** 1 ****
! #define PATCHLEVEL 3
--- 1 ----
! #define PATCHLEVEL 4

Index: README
*** ../elm2.3/README	Sat Apr 28 22:40:39 1990
--- README	Tue Jun 26 20:33:26 1990
***************
*** 20,26 ****
  archive server.  Mail archive-server@DSI.COM for details on how to
  use the archive server program.  Ask it for help.
  
! Limitations/Problems you might encounter in installing Elm:
  
  	On some Unix 5.3.2 systems, if only a runtime version of the
  O/S has been installed, not all the include files exist for compiling
--- 20,26 ----
  archive server.  Mail archive-server@DSI.COM for details on how to
  use the archive server program.  Ask it for help.
  
! Limitations/Problems you might encounter in compiling and installing Elm:
  
  	On some Unix 5.3.2 systems, if only a runtime version of the
  O/S has been installed, not all the include files exist for compiling
***************
*** 37,42 ****
--- 37,46 ----
  	On SCO Xenix, if you are all mail is from user anonymous,
  this is because the mail delivery agent should be
  /usr/lib/mail/execmail instead of /usr/bin/rmail or /bin/rmail.
+ 
+ 	On Next's it is necessary to answer -bsd for the
+ Any additional cc flags? question and -lsys_s for the
+ Any additional libraries? question within Configure.
  
  	On some systems, especially those based on the AT&T Port to
  286's the -O flag of the compiler produces improper code causing

Index: Instruct
*** ../elm2.3/Instruct	Sat Jun  9 23:48:13 1990
--- Instruct	Tue Jun 26 20:22:19 1990
***************
*** 1,7 ****
  				Instructions
  				------------
  
! 		        Last Update: $Date: 90/06/09 21:17:05 $
  
  
  	This file contains instructions on how to create and install
--- 1,7 ----
  				Instructions
  				------------
  
! 		        Last Update: $Date: 90/06/26 20:22:06 $
  
  
  	This file contains instructions on how to create and install
***************
*** 51,57 ****
  
    answer        checkalias     filter         messages      printmail
    arepdaemon    elm            frm            newalias      readmsg
!   autoreply     fastmail       listalais      newmail
  
  next, you can install all the software on your system by;
  
--- 51,57 ----
  
    answer        checkalias     filter         messages      printmail
    arepdaemon    elm            frm            newalias      readmsg
!   autoreply     fastmail       listalias      newmail
  
  next, you can install all the software on your system by;
  

Index: Patchlist
*** ../elm2.3/Patchlist	Fri Jun 22 00:00:07 1990
--- Patchlist	Tue Jun 26 20:45:38 1990
***************
*** 1,3 ****
--- 1,23 ----
+ 	Elm 2.3 Patch 4 - 8 Bit Changes
+ 	Tue Jun 26 20:45:13 EDT 1990 (Creation date, not posting date)
+ Fix encoding to encode lines that start with [ and are not
+ valid Elm keywords.  It was confusing decode.
+ From: Syd via a report from Lenny Tropiano
+ 
+ Add a new configuration internal variable to support
+ remembering correctly hostcomp for Configure -d
+ From: Chip Salzenberg
+ 
+ Make 8 bit work and add some better defaults to the
+ configure script.
+ From: Syd via patch idea from Robert Claeson <prc@erbe.se>
+ 
+ Fix typo in Instruct and Configure
+ From: David Kozinn <monymsys!david>
+ 
+ Fix boundry check on argument count in fastmail
+ From: Syd reported by Eric J. Peterson
+ 
  	Elm 2.3 Patch 3 - Release cleanup - Part III of III
  	Thu Jun 21 23:35:40 EDT 1990 (Creation date, not posting date)
  Fix symbol for NO_XHEADER

Index: Configure
Prereq: 4.1.1.5
*** ../elm2.3/Configure	Thu Jun 21 23:59:57 1990
--- Configure	Tue Jun 26 20:57:50 1990
***************
*** 8,14 ****
  # and edit it to reflect your system.  Some packages may include samples
  # of config.h for certain machines, so you might look for one of those.)
  #
! # $Header: /files/home/users/syd/elm.rel/RCS/Configure,v 4.1.1.5 90/06/21 23:31:37 syd Exp $
  #
  # Yes, you may rip this off to use in other distribution packages.
  # (Note: this Configure script was generated automatically.  Rather than
--- 8,14 ----
  # and edit it to reflect your system.  Some packages may include samples
  # of config.h for certain machines, so you might look for one of those.)
  #
! # $Header: /files/home/users/syd/elm.rel/RCS/Configure,v 4.1.1.7 90/06/26 20:57:24 syd Exp $
  #
  # Yes, you may rip this off to use in other distribution packages.
  # (Note: this Configure script was generated automatically.  Rather than
***************
*** 53,59 ****
  d_havetlib=''
  termlib=''
  d_mkdir=''
- d_portable=''
  d_rename=''
  d_sigvec=''
  d_sigvectr=''
--- 53,58 ----
***************
*** 130,136 ****
--- 129,137 ----
  make=''
  date=''
  csh=''
+ pmake=''
  c_date=''
+ d_ascii=''
  d_calendar=''
  calendar=''
  d_cuserid=''
***************
*** 141,146 ****
--- 142,148 ----
  d_douname=''
  d_phostname=''
  d_host_comp=''
+ ign_hname=''
  d_havedbm=''
  dbm=''
  d_index=''
***************
*** 158,163 ****
--- 160,166 ----
  d_usedomain=''
  d_nocheckvalid=''
  d_pidcheck=''
+ d_portable=''
  d_ptem=''
  d_remlock=''
  maxattempts=''
***************
*** 212,217 ****
--- 215,221 ----
  rmttape=''
  roff=''
  tmpdir=''
+ use_pmake=''
  xencf=''
  xenlf=''
  d_xenix=''
***************
*** 258,264 ****
  attrlist="$attrlist i186 __m88k__ m88k DGUX __DGUX__"
  d_newshome="/usr/NeWS"
  defvoidused=7
! pth="/usr/ucb /bin /usr/bin /usr/local /usr/local/bin /usr/lbin /usr/plx /usr/5bin /vol/local/bin /etc /usr/lib /lib /usr/local/lib /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/bin /bsd4.3/usr/ucb /usr/convex /usr/mmdf/bin"
  
  : check for out bin directory
  if test ! -d ../bin; then
--- 262,268 ----
  attrlist="$attrlist i186 __m88k__ m88k DGUX __DGUX__"
  d_newshome="/usr/NeWS"
  defvoidused=7
! pth="/usr/ucb /bin /usr/bin /usr/local /usr/local/bin /usr/lbin /usr/5bin /vol/local/bin /etc /usr/lib /lib /usr/local/lib /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/bin /bsd4.3/usr/ucb /usr/convex /usr/mmdf/bin ${BSDBASE-/bsd}/usr/ucb ${BSDBASE-/bsd}/bin ${BSDBASE-/bsd}/usr/bin"
  
  : check for out bin directory
  if test ! -d ../bin; then
***************
*** 522,527 ****
--- 526,532 ----
  more
  nroff
  pg
+ pmake
  pr
  rmail
  sendmail
***************
*** 695,701 ****
  
  : see if date exists, if so, init c_date
  if $test ! "x$date" = "x" ; then
!     c_date=`$date`
  else
      c_date='date was unavailable at configuration'
  fi
--- 700,706 ----
  
  : see if date exists, if so, init c_date
  if $test ! "x$date" = "x" ; then
!     c_date=`LANGUAGE= $date`
  else
      c_date='date was unavailable at configuration'
  fi
***************
*** 836,842 ****
  EOM
  case "$mansrc" in
  '')
!     dflt=`loc . /usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1 /usr/man/u_man/man1 /usr/man/man1 /usr/man/man.L`
      ;;
  *)  dflt="$mansrc"
      ;;
--- 841,847 ----
  EOM
  case "$mansrc" in
  '')
!     dflt=`loc . /usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1 /usr/man/u_man/man1 /usr/man/l_man/man1 /usr/local/man/u_man/man1 /usr/local/man/l_man/man1 /usr/man/man1 /usr/man/man.L`
      ;;
  *)  dflt="$mansrc"
      ;;
***************
*** 1578,1583 ****
--- 1583,1622 ----
  	calendar="$ans"
  fi
  
+ : check to see if the macros are 8 bit clean, ask the user
+ :
+ $cat <<EOM
+ 
+ 
+ Not all environments are restricted to the ASCII 7 bit character set.
+ For example, the ISO 8859/1 (Latin alphabet no. 1) character set,
+ consisting of 8 bits and 191 printable characters, is becoming
+ more and more common, especially in non-English speaking countries.
+ 
+ Unfortunately, not all isprint() functions or macros, which ELM
+ uses to determine whether a character is printable or not, will
+ handle non-ASCII (8 bit) characters properly.  It is suggested that you
+ start with this value configured to handle 8 bit characters correctly
+ and if there are problems with Elm aborting while displaying messages
+ that use extended character sets to reconfigure Elm to only display
+ 7 bit characters.
+ 
+ EOM
+ 
+ case "$d_ascii" in
+     "$define")   dflt='n';;
+     *)  dflt='y';;
+ esac
+ 
+ echo "  "
+ rp="Should Elm assume that isprint() won't break on non-ascii characters? [$dflt]"
+ $echo $n "$rp $c"
+ . myread
+ case "$ans" in
+     y*) d_ascii="$undef";;
+     *) d_ascii="$define";;
+ esac
+ 
  : find out how to find out full name
  echo " "
  case "$d_berknames" in
***************
*** 1860,1866 ****
  : decide how portable to be
  case "$d_portable" in
  "$define") dflt=y;;
! *)	dflt=n;;
  esac
  $cat <<'EOH'
   
--- 1899,1911 ----
  : decide how portable to be
  case "$d_portable" in
  "$define") dflt=y;;
! "$undef")  dflt=n;;
! *)	   if $test "$d_nfs" = "$define" ; then
! 	       dflt=y
! 	   else
! 	       dflt=n
! 	   fi
! 	   ;;
  esac
  $cat <<'EOH'
   
***************
*** 1966,1973 ****
  
  case "$d_douname$d_gethname" in
  *define*)
!     case "$d_host_comp" in
!     "$define") dflt=y;;
      *)  dflt=n;;
      esac
      cat <<EOM
--- 2011,2022 ----
  
  case "$d_douname$d_gethname" in
  *define*)
!     case "$ign_hname" in
!     '')	case "$d_host_comp" in
! 	"$define") dflt=y;;
! 	*)  dflt=n;;
! 	esac;;
!     y)  dflt=y;;
      *)  dflt=n;;
      esac
      cat <<EOM
***************
*** 1979,1990 ****
      $echo $n "$rp $c"
      . myread
      case "$ans" in
!     y*) d_douname="$undef"
  	d_gethname="$undef"
  	d_host_comp="$define"
  	$echo $n "Okay... $c"
  	;;
!     *)
  	d_host_comp="$undef"
  	;;
      esac
--- 2028,2040 ----
      $echo $n "$rp $c"
      . myread
      case "$ans" in
!     y*) ign_hname=y
! 	d_douname="$undef"
  	d_gethname="$undef"
  	d_host_comp="$define"
  	$echo $n "Okay... $c"
  	;;
!     *)	ign_hname=n
  	d_host_comp="$undef"
  	;;
      esac
***************
*** 2334,2339 ****
--- 2384,2391 ----
  "$undef")  dflt=n;;
  *)	if $test -f "$submit"; then
  	    dflt=y
+ 	else
+ 	    dflt=n
  	fi
  	;;
  esac
***************
*** 2476,2482 ****
  case "$d_notouchadd" in
  "$define") dflt=n;;
  "$undef")  dflt=y;;
! *)	   dflt=y;;
  esac
  $cat <<EOM
  
--- 2528,2539 ----
  case "$d_notouchadd" in
  "$define") dflt=n;;
  "$undef")  dflt=y;;
! *)	   if $test "$d_internet" = "$define" ; then
! 	       dflt=n
! 	   else
! 	       dflt=y
! 	   fi
! 	   ;;
  esac
  $cat <<EOM
  
***************
*** 2606,2612 ****
  esac
  $cat <<EOM
   
! Some sites to not like to see the mail header "X-mailer:" in outgoing
  messages.  If you choose, you may disable these headers.  However, it
  is strongly urged to leave these headers in the mail to assist in
  tracking down problems.
--- 2663,2669 ----
  esac
  $cat <<EOM
   
! Some sites do not like to see the mail header "X-mailer:" in outgoing
  messages.  If you choose, you may disable these headers.  However, it
  is strongly urged to leave these headers in the mail to assist in
  tracking down problems.
***************
*** 3109,3115 ****
  case "$d_useembed" in
  "$define")	dflt=y;;
  "$undef")	dflt=n;;
! *)		dflt=n;;
  esac
  $cat <<EOM
   
--- 3166,3177 ----
  case "$d_useembed" in
  "$define")	dflt=y;;
  "$undef")	dflt=n;;
! *)	        if $test "$d_internet" = "$define" ; then
! 	            dflt=y
! 	        else
! 	            dflt=n
! 	        fi
! 	        ;;
  esac
  $cat <<EOM
   
***************
*** 3727,3732 ****
--- 3789,3820 ----
  	done
  fi
  
+ : if pmake exists, allow its use for parallel make
+  
+ if $test -f "$pmake" ; then
+     case "$use_pmake" in
+ 	n)  dflt=n;;
+ 	*)  dflt=y;;
+     esac
+ 
+     $cat <<EOM
+  
+ The executable file pmake was found on this system.  Usually this
+ file indicates a parallel make, which executes much faster.  Should
+ this system use the pmake command as its make command?
+ 
+ EOM
+     rp="Does this system use pmake as its make? [$dflt]"
+     $echo $n "$rp $c"
+     . myread
+     case "$ans" in
+ 	y*) use_pmake=y
+ 	    make="$pmake";;
+ 	*)  use_pmake=n;;
+     esac
+ else
+     use_pmake=n
+ fi
  echo " "
  echo "End of configuration questions."
  echo " "
***************
*** 3757,3763 ****
  d_havetlib='$d_havetlib'
  termlib='$termlib'
  d_mkdir='$d_mkdir'
- d_portable='$d_portable'
  d_rename='$d_rename'
  d_sigvec='$d_sigvec'
  d_sigvectr='$d_sigvectr'
--- 3845,3850 ----
***************
*** 3834,3840 ****
--- 3921,3929 ----
  make='$make'
  date='$date'
  csh='$csh'
+ pmake='$pmake'
  c_date='$c_date'
+ d_ascii='$d_ascii'
  d_calendar='$d_calendar'
  calendar='$calendar'
  d_cuserid='$d_cuserid'
***************
*** 3845,3850 ****
--- 3934,3940 ----
  d_douname='$d_douname'
  d_phostname='$d_phostname'
  d_host_comp='$d_host_comp'
+ ign_hname='$ign_hname'
  d_havedbm='$d_havedbm'
  dbm='$dbm'
  d_index='$d_index'
***************
*** 3862,3867 ****
--- 3952,3958 ----
  d_usedomain='$d_usedomain'
  d_nocheckvalid='$d_nocheckvalid'
  d_pidcheck='$d_pidcheck'
+ d_portable='$d_portable'
  d_ptem='$d_ptem'
  d_remlock='$d_remlock'
  maxattempts='$maxattempts'
***************
*** 3916,3921 ****
--- 4007,4013 ----
  rmttape='$rmttape'
  roff='$roff'
  tmpdir='$tmpdir'
+ use_pmake='$use_pmake'
  xencf='$xencf'
  xenlf='$xenlf'
  d_xenix='$d_xenix'

Index: config.h.SH
*** ../elm2.3/config.h.SH	Sat Apr 28 22:40:54 1990
--- config.h.SH	Tue Jun 26 20:40:44 1990
***************
*** 74,87 ****
   */
  #$d_mkdir	MKDIR		/**/
  
- /* PORTABLE:
-  *	This symbol, if defined, indicates to the C program that it should
-  *	not assume that it is running on the machine it was compiled on.
-  *	The program should be prepared to look up the host name, translate
-  *	generic filenames, use PATH, etc.
-  */
- #$d_portable	PORTABLE	/**/
- 
  /* RENAME:
   *	This symbol, if defined, indicates that the rename routine is available
   *	to rename files.  Otherwise you should do the unlink(), link(), unlink()
--- 74,79 ----
***************
*** 179,184 ****
--- 171,182 ----
   */
  #define		CONFIGURE_DATE	"$c_date"
  
+ /* ASCII_CTYPE:
+  *	This symbol, if defined, indicates that the ctype functions and
+  *	macros are ascii specific and not 8 bit clean.
+  */
+ #$d_ascii	ASCII_CTYPE	/**/
+ 
  /* ENABLE_CALENDAR:
   *	This symbol, if defined, indicates that the calendar feature
   *	should be supported.
***************
*** 325,330 ****
--- 323,336 ----
   *	check for an active pid.
   */
  #$d_pidcheck PIDCHECK		/**/
+ 
+ /* PORTABLE:
+  *	This symbol, if defined, indicates to the C program that it should
+  *	not assume that it is running on the machine it was compiled on.
+  *	The program should be prepared to look up the host name, translate
+  *	generic filenames, use PATH, etc.
+  */
+ #$d_portable	PORTABLE	/**/
  
  /* PTEM:
   *	This symbol, if defined, indicates that the sys/ptem.h include file is

Index: src/curses.c
Prereq: 4.1.1.1
*** ../elm2.3/src/curses.c	Tue Jun  5 22:02:37 1990
--- src/curses.c	Tue Jun 26 20:09:50 1990
***************
*** 1,8 ****
  
! static char rcsid[] = "@(#)$Id: curses.c,v 4.1.1.1 90/06/05 21:05:22 syd Exp $";
  
  /*******************************************************************************
!  *  The Elm Mail System  -  $Revision: 4.1.1.1 $   $State: Exp $
   *
   * 			Copyright (c) 1986, 1987 Dave Taylor
   * 			Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
  
! static char rcsid[] = "@(#)$Id: curses.c,v 4.1.1.2 90/06/26 20:09:09 syd Exp $";
  
  /*******************************************************************************
!  *  The Elm Mail System  -  $Revision: 4.1.1.2 $   $State: Exp $
   *
   * 			Copyright (c) 1986, 1987 Dave Taylor
   * 			Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,23 ----
   *
   *******************************************************************************
   * $Log:	curses.c,v $
+  * Revision 4.1.1.2  90/06/26  20:09:09  syd
+  * Add 8 bit support via ascii_ctype
+  * From: Robert Claeson <prc@erbe.se>
+  * 
   * Revision 4.1.1.1  90/06/05  21:05:22  syd
   * Fixes where src/curses.c attempts to set the screen size via the ioctl
   * TIOCGWINSIZ if it exsists. It should only use the row or col size as
***************
*** 690,696 ****
--- 694,704 ----
  
  	else {
  	  /* if some kind of non-printable character change to a '?' */
+ #ifdef ASCII_CTYPE
  	  if(!isascii(ch) || !isprint(ch))
+ #else
+ 	  if(!isprint(ch))
+ #endif
  	    ch = '?';
  
  	  /* if we only have one column left, simulate automargins if

Index: src/mailmsg2.c
Prereq: 4.1.1.3
*** ../elm2.3/src/mailmsg2.c	Fri Jun 22 00:00:02 1990
--- src/mailmsg2.c	Tue Jun 26 16:25:03 1990
***************
*** 1,8 ****
  
! static char rcsid[] = "@(#)$Id: mailmsg2.c,v 4.1.1.3 90/06/21 21:07:48 syd Exp $";
  
  /*******************************************************************************
!  *  The Elm Mail System  -  $Revision: 4.1.1.3 $   $State: Exp $
   *
   * 			Copyright (c) 1986, 1987 Dave Taylor
   * 			Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
  
! static char rcsid[] = "@(#)$Id: mailmsg2.c,v 4.1.1.4 90/06/26 16:18:24 syd Exp $";
  
  /*******************************************************************************
!  *  The Elm Mail System  -  $Revision: 4.1.1.4 $   $State: Exp $
   *
   * 			Copyright (c) 1986, 1987 Dave Taylor
   * 			Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,24 ----
   *
   *******************************************************************************
   * $Log:	mailmsg2.c,v $
+  * Revision 4.1.1.4  90/06/26  16:18:24  syd
+  * Make it encode lines that are [...] if not one of the reserved lines.
+  * It was messing up decoding
+  * From: Syd via report from Lenny Tropiano
+  * 
   * Revision 4.1.1.3  90/06/21  21:07:48  syd
   * Fix XHEAD define
   * From: Syd
***************
*** 803,808 ****
--- 808,821 ----
  	          || (strncmp(buffer, DONT_SAVE2, strlen(DONT_SAVE2)) == 0)) {
  	      if(copy) break;  /* saved copy doesn't want anything after this */
  	      else continue;   /* next line? */
+ 	    }
+ 	    else if (crypted) {
+ 	      if (! gotten_key++)
+ 	        getkey(ON);
+ 	      else if (! encoded_lines)
+ 	        get_key_no_prompt();		/* reinitialize.. */
+ 	      encode(buffer);
+ 	      encoded_lines++;
  	    }
  	  }
  	  else if (crypted) {

Index: src/newmbox.c
Prereq: 4.1.1.1
*** ../elm2.3/src/newmbox.c	Fri Jun 22 00:00:03 1990
--- src/newmbox.c	Tue Jun 26 20:18:28 1990
***************
*** 1,8 ****
  
! static char rcsid[] = "@(#)$Id: newmbox.c,v 4.1.1.1 90/06/21 21:10:33 syd Exp $";
  
  /*******************************************************************************
!  *  The Elm Mail System  -  $Revision: 4.1.1.1 $   $State: Exp $
   *
   * 			Copyright (c) 1988, USENET Community Trust
   * 			Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
  
! static char rcsid[] = "@(#)$Id: newmbox.c,v 4.1.1.2 90/06/26 20:18:06 syd Exp $";
  
  /*******************************************************************************
!  *  The Elm Mail System  -  $Revision: 4.1.1.2 $   $State: Exp $
   *
   * 			Copyright (c) 1988, USENET Community Trust
   * 			Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,24 ----
   *
   *******************************************************************************
   * $Log:	newmbox.c,v $
+  * Revision 4.1.1.2  90/06/26  20:18:06  syd
+  * Fix double word
+  * From: Peter Kendell <pete@tcom.stc.co.uk>
+  * 
+  * 
   * Revision 4.1.1.1  90/06/21  21:10:33  syd
   * Add another fixed mailbox id
   * From: Syd
***************
*** 98,104 ****
  	    Centerline(15,
  	      "Hey! An instantiation of ELM is already reading this mail!");
  	    Centerline(17,
! 	      "If this is in error, then you'll need to save a copy of the");
  	    Centerline(18, "the following file then remove it:");
  	    Centerline(19, new_tempfile);
  	    MoveCursor(LINES, 0);  /* so shell prompt upon exit is on newline */
--- 103,109 ----
  	    Centerline(15,
  	      "Hey! An instantiation of ELM is already reading this mail!");
  	    Centerline(17,
! 	      "If this is in error, then you'll need to save a copy of");
  	    Centerline(18, "the following file then remove it:");
  	    Centerline(19, new_tempfile);
  	    MoveCursor(LINES, 0);  /* so shell prompt upon exit is on newline */

Index: utils/fastmail.c
Prereq: 4.1
*** ../elm2.3/utils/fastmail.c	Sat Apr 28 22:44:40 1990
--- utils/fastmail.c	Tue Jun 26 20:30:33 1990
***************
*** 1,8 ****
  
! static char rcsid[] = "@(#)$Id: fastmail.c,v 4.1 90/04/28 22:44:39 syd Exp $";
  
  /*******************************************************************************
!  *  The Elm Mail System  -  $Revision: 4.1 $   $State: Exp $
   *
   * 			Copyright (c) 1986, 1987 Dave Taylor
   * 			Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
  
! static char rcsid[] = "@(#)$Id: fastmail.c,v 4.1.1.1 90/06/26 20:30:22 syd Exp $";
  
  /*******************************************************************************
!  *  The Elm Mail System  -  $Revision: 4.1.1.1 $   $State: Exp $
   *
   * 			Copyright (c) 1986, 1987 Dave Taylor
   * 			Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,23 ----
   *
   *******************************************************************************
   * $Log:	fastmail.c,v $
+  * Revision 4.1.1.1  90/06/26  20:30:22  syd
+  * Fix boundary check on argument count
+  * From: Syd
+  * 
   * Revision 4.1  90/04/28  22:44:39  syd
   * checkin of Elm 2.3 as of Release PL0
   * 
***************
*** 122,128 ****
   	  }
  	}	
  
! 	if (optind > argc) {
  	  fprintf(stderr,"Usage: fastmail {args} filename address(es)\n");
  	  fprintf(stderr, "   where {args} can be;\n");
  	  fprintf(stderr,"\t-b bcc-list\n\t-c cc-list\n\t-d\n\t-f from-name\n");
--- 126,132 ----
   	  }
  	}	
  
! 	if (optind >= argc) {
  	  fprintf(stderr,"Usage: fastmail {args} filename address(es)\n");
  	  fprintf(stderr, "   where {args} can be;\n");
  	  fprintf(stderr,"\t-b bcc-list\n\t-c cc-list\n\t-d\n\t-f from-name\n");
***************
*** 133,139 ****
  
  	strcpy(filename, argv[optind++]);
  
! 	if (optind > argc) {
  	  fprintf(stderr,"Usage: fastmail {args} filename address(es)\n");
  	  fprintf(stderr, "   where {args} can be;\n");
  	  fprintf(stderr,"\t-b bcc-list\n\t-c cc-list\n\t-d\n\t-f from-name\n");
--- 137,143 ----
  
  	strcpy(filename, argv[optind++]);
  
! 	if (optind >= argc) {
  	  fprintf(stderr,"Usage: fastmail {args} filename address(es)\n");
  	  fprintf(stderr, "   where {args} can be;\n");
  	  fprintf(stderr,"\t-b bcc-list\n\t-c cc-list\n\t-d\n\t-f from-name\n");

-- 
=====================================================================
Sydney S. Weinstein, CDP, CCP                   Elm Coordinator
Datacomp Systems, Inc.                          Voice: (215) 947-9900
syd@DSI.COM or dsinc!syd                        FAX:   (215) 938-0235

exit 0 # Just in case...
-- 
Please send comp.sources.unix-related mail to rsalz@uunet.uu.net.
Use a domain-based address or give alternate paths, or you may lose out.