*** Makefile%	Sat Apr  3 00:22:07 1999
--- Makefile	Mon Dec 20 17:48:06 1999
***************
*** 2,8 ****
  
  # BASENAME should point to where the whole lot will be installed
  # change BASENAME to your home directory if need be
! BASENAME	= /usr
  # For display in the man pages
  VISIBLE_BASENAME= $(BASENAME)
  
--- 2,8 ----
  
  # BASENAME should point to where the whole lot will be installed
  # change BASENAME to your home directory if need be
! BASENAME	= /usr/local
  # For display in the man pages
  VISIBLE_BASENAME= $(BASENAME)
  
***************
*** 65,71 ****
  # Only edit below this line if you *think* you know what you are doing #
  ########################################################################
  
! #LOCKINGTEST=100	# Uncomment (and change) if you think you know
  #			it better than the autoconf lockingtests.
  #			This will cause the lockingtests to be hotwired.
  #			100	to enable fcntl()
--- 65,71 ----
  # Only edit below this line if you *think* you know what you are doing #
  ########################################################################
  
! LOCKINGTEST=100		# Uncomment (and change) if you think you know
  #			it better than the autoconf lockingtests.
  #			This will cause the lockingtests to be hotwired.
  #			100	to enable fcntl()
***************
*** 86,93 ****
   #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
  
  # The place to put your favourite extra cc flag
! CFLAGS0 = -O #$(GCC_WARNINGS)
! LDFLAGS0= -s
  # Read my libs :-)
  LIBS=
  
--- 86,92 ----
   #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
  
  # The place to put your favourite extra cc flag
! CFLAGS0 = -g -DUSE_LOCAL_LOCK -DUSE_ORGMAILSIZE_VAR -DUSE_DEFAULTSIZE_VAR -DUSE_BERKELEY_FMT -DUSE_OUT_VAR #$(GCC_WARNINGS) LDFLAGS0= -s
  # Read my libs :-)
  LIBS=
  
*** src/formail.c%	Tue Nov 16 09:31:10 1999
--- src/formail.c	Mon Dec 20 17:40:44 1999
***************
*** 361,367 ****
--- 361,371 ----
  int main(lastm,argv)int lastm;const char*const argv[];
  { int i,split=0,force=0,bogus=1,every=0,headreply=0,digest=0,nowait=0,keepb=0,
     minfields=(char*)progid-(char*)progid,conctenate=0,babyl=0,babylstart,
+ #ifdef	USE_BERKELEY_FMT
+    berkeley=1,forgetclen;
+ #else
     berkeley=0,forgetclen;
+ #endif	/* USE_BERKELEY_FMT */
    off_t maxlen,ctlength;FILE*idcache=0;pid_t thepid;
    size_t j,lnl,escaplen;char*chp,*namep,*escap=ESCAP;
    struct field*fldp,*fp2,**afldp,*fdate,*fcntlength,*fsubject,*fFrom_;
*** src/locking.c%	Wed Oct 20 08:42:47 1999
--- src/locking.c	Mon Dec 20 17:43:17 1999
***************
*** 40,45 ****
--- 40,49 ----
  #endif
  	;
     }
+ #ifdef	USE_LOCAL_LOCK
+   if (locallockit(name))
+         goto term;
+ #endif	/* USE_LOCAL_LOCK */
    for(lcking|=lck_LOCKFILE;;)
     { yell("Locking",name);	    /* in order to cater for clock skew: get */
       if(!xcreat(name,LOCKperm,&t,locktype))    /* time t from the filesystem */
***************
*** 101,106 ****
--- 105,180 ----
       elog(whilstwfor),elog("lockfile"),logqnl(name),Terminate();
  }
  
+ #ifdef  USE_LOCAL_LOCK
+ 
+ #define TMPDIR "/tmp/"
+ #define TMPDIRLEN 5
+ 
+ locallockit(name)char*name;
+ { int triedforce=0,locktype=doLOCK;struct stat stbuf;time_t t;
+   char *localonlyname,*l,*m;
+   if (name[0] == '/') {
+   	localonlyname=malloc(TMPDIRLEN+strlen(name)+2);
+ 	strcat(strcpy(localonlyname,TMPDIR),name);
+ 	for (l=localonlyname+TMPDIRLEN;*l;l++) if (*l=='/') *l='!'; /* emacs-like */
+   } else {
+ 	if ((m=(char *)tgetenv(maildir)) == NULL) m=""; else m++;
+   	localonlyname=malloc(TMPDIRLEN+strlen(m)+strlen(name)+2);
+ 	strcat(strcat(strcat(strcpy(localonlyname,TMPDIR),m),"/"),name);
+ 	for (l=localonlyname+TMPDIRLEN+1;*l;l++) if (*l=='/') *l='!'; /* emacs-like */
+   }
+   for(;;)
+    { yell("Locking",localonlyname);
+      if(!xcreat(localonlyname,LOCKperm,&t,locktype))
+ 		 return 0;
+      switch(errno)
+       { case EEXIST:
+ 	   if(!lstat(localonlyname,&stbuf)&&
+ 		  stbuf.st_size<=MAX_locksize&&locktimeout&&
+ 		  !lstat(localonlyname,&stbuf)&&locktimeout<t-stbuf.st_mtime)
+ 	    { if(triedforce)			/* already tried, not trying */
+ 		 goto faillock;					    /* again */
+ 	      if(S_ISDIR(stbuf.st_mode)||unlink(localonlyname))
+ 		 triedforce=1,nlog("Forced unlock denied on"),logqnl(localonlyname);
+ 	      else
+ 	       { nlog("Forcing lock on");logqnl(localonlyname);suspend();
+ 		 goto ce;
+ 	       }
+ 	    }
+ 	   else
+ 	      triedforce=0;		 /* legitimate iteration, clear flag */
+ 	   break;
+ 	case ENOSPC:		   /* no space left, treat it as a transient */
+ #ifdef EDQUOT						      /* NFS failure */
+ 	case EDQUOT:		      /* maybe it was a short term shortage? */
+ #endif
+ 	case ENOENT:case ENOTDIR:case EIO:/*case EACCES:*/
+ 	   goto faillock;
+ #ifdef ENAMETOOLONG
+ 	case ENAMETOOLONG:     /* maybe filename too long, shorten and retry */
+ 	 { int i;
+ 	   if(0<(i=strlen(localonlyname)-1)&&!strchr(dirsep,localonlyname[i-1]))
+ 	    { nlog("Truncating");logqnl(localonlyname);
+ 		  elog(" and retrying lock\n");
+ 	      localonlyname[i]='\0';
+ 	      goto ce;
+ 	    }
+ 	 }
+ #endif
+ 	default:
+ faillock:  nlog("Lock failure on");logqnl(localonlyname);
+ 	   goto term;
+       }
+ 	 ssleep((unsigned)locksleep);
+ ce:  if(nextexit)
+ term: { free(localonlyname);			     /* drop the preallocated buffer */
+ 	break;
+       }
+    }
+   return 1;
+ }
+ #endif /* USE_LOCAL_LOCK */
+ 
  void lcllock P((void))				    /* lock a local lockfile */
  { char*lckfile;			    /* locking /dev/null or | would be silly */
    if(tolock||strcmp(buf2,devnull)&&strcmp(buf2,"|"))
***************
*** 119,124 ****
--- 193,220 ----
     }
  }
  
+ #ifdef USE_LOCAL_LOCK
+ 
+ void localunlock(name)char*name;
+ { char *localonlyname,*l,*m;
+   if (name[0] == '/') {
+   	localonlyname=malloc(TMPDIRLEN+strlen(name)+2);
+ 	strcat(strcpy(localonlyname,TMPDIR),name);
+ 	for (l=localonlyname+TMPDIRLEN;*l;l++) if (*l=='/') *l='!'; /* emacs-like */
+   } else {
+ 	if ((m=(char *)tgetenv(maildir)) == NULL) m=""; else m++;
+   	localonlyname=malloc(TMPDIRLEN+strlen(m)+strlen(name)+2);
+ 	strcat(strcat(strcat(strcpy(localonlyname,TMPDIR),m),"/"),name);
+ 	for (l=localonlyname+TMPDIRLEN+1;*l;l++) if (*l=='/') *l='!'; /* emacs-like */
+   }
+   yell("Unlocking",name);
+   if(unlink(localonlyname))
+ 	nlog("Couldn't unlock"),logqnl(localonlyname);
+   free(localonlyname);
+ }
+ 
+ #endif /* USE_LOCAL_LOCK */
+ 
  void unlock(lockp)char**const lockp;
  { lcking|=lck_LOCKFILE;
    if(*lockp)
***************
*** 127,132 ****
--- 223,231 ----
       yell("Unlocking",*lockp);
       if(unlink(*lockp))
  	nlog("Couldn't unlock"),logqnl(*lockp);
+ #ifdef USE_LOCAL_LOCK
+      localunlock(*lockp);
+ #endif /* USE_LOCAL_LOCK */
       if(rcstate==rc_NORMAL)			   /* we already set our ids */
  	setegid(gid);		      /* we put back our regular permissions */
       if(!nextexit)			   /* if not inside a signal handler */
*** src/misc.c%	Thu Nov 18 04:59:48 1999
--- src/misc.c	Mon Dec 20 17:45:10 1999
***************
*** 460,465 ****
--- 460,476 ----
  void asenv(chp)const char*const chp;
  { static const char logfile[]="LOGFILE",Log[]="LOG",sdelivered[]="DELIVERED",
     includerc[]="INCLUDERC",eumask[]="UMASK",dropprivs[]="DROPPRIVS",
+ #ifdef	USE_OUT_VAR
+    out[]="OUT",
+ #endif	/* USE_OUT_VAR */
+ #ifdef  USE_ORGMAILSIZE_VAR
+    orgmail[]="ORGMAIL",
+    orgmailsize[]="ORGMAILSIZE",
+ #endif  /* USE_ORGMAILSIZE_VAR */
+ #ifdef  USE_DEFAULTSIZE_VAR
+    _default[]="DEFAULT",
+    defaultsize[]="DEFAULTSIZE",
+ #endif  /* USE_DEFAULTSIZE_VAR */
     shift[]="SHIFT",switchrc[]="SWITCHRC";
    if(!strcmp(buf,slinebuf))
     { if((linebuf=renvint(0L,chp)+XTRAlinebuf)<MINlinebuf+XTRAlinebuf)
***************
*** 475,480 ****
--- 486,499 ----
       opnlog(chp);
    else if(!strcmp(buf,Log))
       elog(chp);
+ #ifdef	USE_OUT_VAR
+   else if(!strcmp(buf,out))
+   {
+      rclose(STDERR);rdup(savstdout);
+      elog(chp);
+      rclose(STDERR);rdup(STDOUT);
+   }
+ #endif	/* USE_OUT_VAR */
    else if(!strcmp(buf,exitcode))
       setxit=1;
    else if(!strcmp(buf,shift))
***************
*** 531,536 ****
--- 550,589 ----
  	   strenstr[i].sval=chp;
       while(i--);
     }
+ #ifdef	USE_ORGMAILSIZE_VAR
+   if(!strcmp(buf,orgmail))
+   {
+ 	struct stat   stbuf;
+ 	char          *p;
+ 
+ 	if((p=malloc(UNIQnamelen)))
+ 	{
+ 		if (stat(chp, &stbuf) < 0)
+ 			ultstr(0,(unsigned long)0,p);
+ 		else
+ 			ultstr(0,(unsigned long)stbuf.st_size,p);
+ 		setdef(orgmailsize,p);
+ 	}
+   }
+ #endif	/* USE_ORGMAILSIZE_VAR */
+ 
+ #ifdef	USE_DEFAULTSIZE_VAR
+   if(!strcmp(buf,_default))
+   {
+ 	struct stat   stbuf;
+ 	char          *p;
+ 
+ 	if((p=malloc(UNIQnamelen)))
+ 	{
+ 		if (stat(chp, &stbuf) < 0)
+ 			ultstr(0,(unsigned long)0,p);
+ 		else
+ 			ultstr(0,(unsigned long)stbuf.st_size,p);
+ 		setdef(defaultsize,p);
+ 	}
+   }
+ #endif	/* USE_DEFAULTSIZE_VAR */
+ 
  }
  
  long renvint(i,env)const long i;const char*const env;
*** src/procmail.c%	Fri Nov 19 10:21:43 1999
--- src/procmail.c	Mon Dec 20 17:47:14 1999
***************
*** 51,57 ****
--- 51,61 ----
  char*Stdout;
  int retval=EX_CANTCREAT,retvl2=EXIT_SUCCESS,sh,pwait,lcking,rcstate,rc= -1,
   ignwerr,lexitcode=EXIT_SUCCESS,asgnlastf,accspooldir,crestarg,skiprc,
+ #ifdef	USE_BERKELEY_FMT
+  savstdout,berkeley=1,mailfilter,erestrict,ifdepth;      /* depth of outermost */
+ #else
   savstdout,berkeley,mailfilter,erestrict,ifdepth;      /* depth of outermost */
+ #endif	/* USE_BERKELEY_FMT */
  struct dyna_long ifstack;	      /* brace in this rcfile, and the stack */
  size_t linebuf=mx(DEFlinebuf+XTRAlinebuf,1024/*STRLEN(systm_mbox)<<1*/);
  volatile int nextexit;			       /* if termination is imminent */
***************
*** 112,117 ****
--- 116,124 ----
  #ifdef USEflock
  		    elog(", flock()");
  #endif
+ #ifdef	USE_LOCAL_LOCK
+ 		    elog(", do lock on local FS prior to on NFS");
+ #endif	/* USE_LOCAL_LOCK */
  		    elog("\nDefault rcfile:\t\t");elog(pmrc);
  #ifdef GROUP_PER_USER
  		    elog("\n\tIt may be writable by your primary group");