Patch #:	8
Type:		bug fix
Priority:	medium
Affects:	sites printing with Adobe Illustrator
Reported:	Maarten Carels <maarten@fwi.uva.nl>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch008
Summary:	Shouldn't edit DefineProcset'ed Procsets
File:		cap60/applications/lwsrv/procset.c
File:		cap60/applications/lwsrv/simple.c

*** applications/lwsrv/procset.c.orig	Tue May  7 01:54:31 1991
--- applications/lwsrv/procset.c	Tue May  7 02:06:25 1991
***************
*** 1,6 ****
! static char rcsid[] = "$Author: djh $ $Date: 91/02/15 21:15:02 $";
! static char rcsident[] = "$Header: procset.c,v 2.1 91/02/15 21:15:02 djh Rel $";
! static char revision[] = "$Revision: 2.1 $";
  
  /*
   * procset - UNIX AppleTalk spooling program: act as a laserwriter
--- 1,6 ----
! static char rcsid[] = "$Author: djh $ $Date: 1991/05/06 16:05:38 $";
! static char rcsident[] = "$Header: /mac/src/cap60/applications/lwsrv/RCS/procset.c,v 2.2 1991/05/06 16:05:38 djh Exp djh $";
! static char revision[] = "$Revision: 2.2 $";
  
  /*
   * procset - UNIX AppleTalk spooling program: act as a laserwriter
***************
*** 200,209 ****
  }
  
  void
! ListProcSet(fn, dictdir, outfile)
  char *fn;
  char *dictdir;
  FILE *outfile;
  {
    char adbuf[ADBUFZ+1];
    FILE *fd;
--- 200,210 ----
  }
  
  void
! ListProcSet(fn, dictdir, outfile, patchprocset)
  char *fn;
  char *dictdir;
  FILE *outfile;
+ int patchprocset;
  {
    char adbuf[ADBUFZ+1];
    FILE *fd;
***************
*** 211,217 ****
  
    sprintf(adbuf, "%s/%s",dictdir,fn);
    if ((fd = fopen(adbuf,"r")) != NULL) {
!     if (domultijob) {
        fprintf(stderr, "lwsrv: Running in eexec mode\n");
        fprintf(outfile, "%%The following fixes problems where the prep file\n");
        fprintf(outfile, "%%assumes that it is permanently downloaded and an\n");
--- 212,218 ----
  
    sprintf(adbuf, "%s/%s",dictdir,fn);
    if ((fd = fopen(adbuf,"r")) != NULL) {
!     if (patchprocset && domultijob) {
        fprintf(stderr, "lwsrv: Running in eexec mode\n");
        fprintf(outfile, "%%The following fixes problems where the prep file\n");
        fprintf(outfile, "%%assumes that it is permanently downloaded and an\n");
***************
*** 220,226 ****
      }
      while ((cnt = fread(adbuf,sizeof(char),ADBUFZ,fd)) > 0)
        fwrite(adbuf,sizeof(char),cnt,outfile);
!     if (domultijob)
        fprintf(outfile, "%%%%EOF\n");
      fclose(fd);
    } else {
--- 221,227 ----
      }
      while ((cnt = fread(adbuf,sizeof(char),ADBUFZ,fd)) > 0)
        fwrite(adbuf,sizeof(char),cnt,outfile);
!     if (patchprocset && domultijob)
        fprintf(outfile, "%%%%EOF\n");
      fclose(fd);
    } else {
*** applications/lwsrv/simple.c.orig	Tue May  7 01:56:36 1991
--- applications/lwsrv/simple.c		Tue May  7 02:06:29 1991
***************
*** 1,6 ****
! static char rcsid[] = "$Author: djh $ $Date: 91/02/15 21:15:47 $";
! static char rcsident[] = "$Header: simple.c,v 2.1 91/02/15 21:15:47 djh Rel $";
! static char revision[] = "$Revision: 2.1 $";
  
  /*
   * lwsrv - UNIX AppleTalk spooling program: act as a laserwriter
--- 1,6 ----
! static char rcsid[] = "$Author: djh $ $Date: 1991/05/06 16:05:38 $";
! static char rcsident[] = "$Header: /mac/src/cap60/applications/lwsrv/RCS/simple.c,v 2.2 1991/05/06 16:05:38 djh Exp djh $";
! static char revision[] = "$Revision: 2.2 $";
  
  /*
   * lwsrv - UNIX AppleTalk spooling program: act as a laserwriter
***************
*** 559,565 ****
  		 "lwsrv: simple: non-dsc2: Including ProcSet %s = %s\n"),
  		dl->ad_ver,dl->ad_fn);
  	fprintf(outfile,"%% ** Procset From File: %s **\n",dl->ad_fn);
! 	ListProcSet(dl->ad_fn, dictdir, outfile);
  	fprintf(outfile,"%% ** End of ProcSet **\n");
        }
        dl = NULL;		/* Close off */
--- 559,565 ----
  		 "lwsrv: simple: non-dsc2: Including ProcSet %s = %s\n"),
  		dl->ad_ver,dl->ad_fn);
  	fprintf(outfile,"%% ** Procset From File: %s **\n",dl->ad_fn);
! 	ListProcSet(dl->ad_fn, dictdir, outfile, 0);
  	fprintf(outfile,"%% ** End of ProcSet **\n");
        }
        dl = NULL;		/* Close off */
***************
*** 610,616 ****
  	fprintf(stderr,"lwsrv: simple: Including ProcSet %s = %s\n",
  		dl->ad_ver,dl->ad_fn);
  	fprintf(outfile,"%% ** Include Procset From File: %s **\n",dl->ad_fn);
! 	ListProcSet(dl->ad_fn, dictdir, outfile);
  	fprintf(outfile,"%% ** End of ProcSet **\n");
  	dl = NULL;		/* close off */
        } else
--- 610,616 ----
  	fprintf(stderr,"lwsrv: simple: Including ProcSet %s = %s\n",
  		dl->ad_ver,dl->ad_fn);
  	fprintf(outfile,"%% ** Include Procset From File: %s **\n",dl->ad_fn);
! 	ListProcSet(dl->ad_fn, dictdir, outfile, 1);
  	fprintf(outfile,"%% ** End of ProcSet **\n");
  	dl = NULL;		/* close off */
        } else
***************
*** 697,703 ****
  	NewStatus(status);
  	fprintf(stderr,"lwsrv: simple: Using ProcSet %s = %s\n",ver,dl->ad_fn);
  	fprintf(outfile,"%% ** Prepending ProcSet from: %s **\n",dl->ad_fn);
! 	ListProcSet(dl->ad_fn, dictdir, outfile); /* prepend appledict */
  	fprintf(outfile,"%% ** End of ProcSet **\n");
        }
      } else {
--- 697,703 ----
  	NewStatus(status);
  	fprintf(stderr,"lwsrv: simple: Using ProcSet %s = %s\n",ver,dl->ad_fn);
  	fprintf(outfile,"%% ** Prepending ProcSet from: %s **\n",dl->ad_fn);
! 	ListProcSet(dl->ad_fn, dictdir, outfile, 1); /* prepend appledict */
  	fprintf(outfile,"%% ** End of ProcSet **\n");
        }
      } else {
*** README.orig		Wed May  8 20:51:56 1991
--- README		Wed May  8 20:52:04 1991
***************
*** 3,9 ****
  	       (For use with AppleTalk/Ethernet bridge)
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 7, May 1991
  
  Introduction
  ------------
--- 3,9 ----
  	       (For use with AppleTalk/Ethernet bridge)
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 8, May 1991
  
  Introduction
  ------------