Patch #:	92
Type:		operational change
Priority:	none
Modification:	lwsrv option specifying no adobe preprocessing (for PC jobs)
Submitted:	Gavin Longmuir <gavin@coombs.anu.edu.au>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch092
Application:	'cd cap60; patch -p < cap60.patches/cap60.patch092'
Summary:	add -P flag for PC Windows printer spooler
EXAMPLES:	FTP sorokin.anu.edu.au  pub/cap60_patches/lwsrvPC.shar.Z
EXAMPLES:	FTP sorokin.anu.edu.au  pub/apple/*
WARNING:	-P is no longer a pseudonym for -p
File:		cap60/Configure
File:		cap60/applications/lwsrv/lwsrv.c
File:		cap60/applications/lwsrv/simple.c

*** Configure.orig	Sat Feb 22 22:13:20 1992
--- Configure		Sat Feb 22 22:15:23 1992
***************
*** 1,7 ****
  #!/bin/sh
! # $Author: djh $ $Date: 1992/02/21 14:37:42 $
! # $Header: /mac/src/cap60/RCS/Configure,v 2.35 1992/02/21 14:37:42 djh Rel djh $
! # $Revision: 2.35 $
  # CAP configuration shell script.  This ain't perfect, but it's a start.
  # Execute with /bin/sh Configure if your system won't run it (ksh is okay too)
  # 
--- 1,7 ----
  #!/bin/sh
! # $Author: djh $ $Date: 1992/02/22 11:15:10 $
! # $Header: /mac/src/cap60/RCS/Configure,v 2.36 1992/02/22 11:15:10 djh Rel djh $
! # $Revision: 2.36 $
  # CAP configuration shell script.  This ain't perfect, but it's a start.
  # Execute with /bin/sh Configure if your system won't run it (ksh is okay too)
  # 
***************
*** 575,580 ****
--- 575,583 ----
  #
  # + REREAD_AFPVOLS kill -USR1 will make parent aufs re-read system vols file
  # define(`specialcflags',concat(specialcflags,` -DREREAD_AFPVOLS'))
+ #
+ # + PASS_THRU pass through LWSRV jobs with no adobe preprocessing (for PCs)
+ # define(`specialcflags',concat(specialcflags,` -DPASS_THRU'))
  #
  #
  #
*** applications/lwsrv/lwsrv.c.orig	Sun Feb 16 03:05:29 1992
--- applications/lwsrv/lwsrv.c		Sat Feb 22 22:08:42 1992
***************
*** 1,6 ****
! static char rcsid[] = "$Author: djh $ $Date: 1992/02/15 16:05:04 $";
! static char rcsident[] = "$Header: /mac/src/cap60/applications/lwsrv/RCS/lwsrv.c,v 2.16 1992/02/15 16:05:04 djh Rel djh $";
! static char revision[] = "$Revision: 2.16 $";
  
  /*
   * lwsrv - UNIX AppleTalk spooling program: act as a laserwriter
--- 1,6 ----
! static char rcsid[] = "$Author: djh $ $Date: 1992/02/22 11:08:30 $";
! static char rcsident[] = "$Header: /mac/src/cap60/applications/lwsrv/RCS/lwsrv.c,v 2.17 1992/02/22 11:08:30 djh Rel djh $";
! static char revision[] = "$Revision: 2.17 $";
  
  /*
   * lwsrv - UNIX AppleTalk spooling program: act as a laserwriter
***************
*** 20,25 ****
--- 20,26 ----
   *					off by defining SINGLEFORK)
   *  Feb	 15, 1991	djh		Various cleanups & patches
   *  Feb  20, 1991	rapatel		improve wait code, add lpr logging
+  *  Jan  21, 1992	gkl300		add simple pass thru (for PC's)
   *
   */
  
***************
*** 150,155 ****
--- 151,159 ----
  #ifdef LPRARGS
    fprintf(stderr,"\t-L <arg> Argument to pass to lpr (multiple use)\n");
  #endif LPRARGS
+ #ifdef PASS_THRU
+   fprintf(stderr,"\t-P lwsrv pass through (no adobe preprocessing)\n");
+ #endif PASS_THRU
  #ifdef NeXT
    fprintf(stderr,"\t-R <dpi> Specify resolution for NeXT printer\n");
  #endif NeXT
***************
*** 176,182 ****
    int c;
    extern char *optarg;
    extern int optind;
!   static char optlist[64] = "a:f:l:p:P:t:d:n:rehNT:A:Sv";
    
  #ifdef LWSRV_AUFS_SECURITY
    strcat(optlist, "X:");
--- 180,186 ----
    int c;
    extern char *optarg;
    extern int optind;
!   static char optlist[64] = "a:f:l:p:t:d:n:rehNT:A:Sv";
    
  #ifdef LWSRV_AUFS_SECURITY
    strcat(optlist, "X:");
***************
*** 184,189 ****
--- 188,196 ----
  #ifdef LPRARGS
    strcat(optlist, "L:");
  #endif LPRARGS
+ #ifdef PASS_THRU
+   strcat(optlist, "P");
+ #endif PASS_THRU
  #ifdef NeXT
    strcat(optlist, "R:");
  #endif NeXT
***************
*** 210,216 ****
        prtname = optarg;
        break;
      case 'p':				/* -p unix printer name */
-     case 'P':
        unixpname = optarg;
        break;
      case 'h':
--- 217,222 ----
***************
*** 238,243 ****
--- 244,254 ----
        *lprargs++ = optarg;
        break;
  #endif LPRARGS
+ #ifdef PASS_THRU
+     case 'P':
+       set_simple_pass_thru();		/* -P pass through PC jobs */
+       break;
+ #endif PASS_THRU
      case 'S':
        singlefork = TRUE;
        fprintf(stderr, "lwsrv: single fork\n");
*** applications/lwsrv/simple.c.orig	Sun Nov 17 22:51:27 1991
--- applications/lwsrv/simple.c		Sat Feb 22 22:09:25 1992
***************
*** 1,6 ****
! static char rcsid[] = "$Author: djh $ $Date: 1991/11/17 11:50:55 $";
! static char rcsident[] = "$Header: /mac/src/cap60/applications/lwsrv/RCS/simple.c,v 2.5 1991/11/17 11:50:55 djh Rel djh $";
! static char revision[] = "$Revision: 2.5 $";
  
  /*
   * lwsrv - UNIX AppleTalk spooling program: act as a laserwriter
--- 1,6 ----
! static char rcsid[] = "$Author: djh $ $Date: 1992/02/22 11:09:17 $";
! static char rcsident[] = "$Header: /mac/src/cap60/applications/lwsrv/RCS/simple.c,v 2.6 1992/02/22 11:09:17 djh Rel djh $";
! static char revision[] = "$Revision: 2.6 $";
  
  /*
   * lwsrv - UNIX AppleTalk spooling program: act as a laserwriter
***************
*** 18,23 ****
--- 18,24 ----
   * Edit History:
   *
   * Sept 5, 1987 created by cck
+  * Jan 21, 1992 gkl300 - added simple pass thru of all received files
   *
   */
  
***************
*** 137,145 ****
  private int nodsc = FALSE;
  #ifdef ADOBE_DSC2_CONFORMANT
  private int adobe_dsc2_conformant = TRUE;
! #else
  private int adobe_dsc2_conformant = FALSE;
! #endif
  
  export int is_simple_dsc();
  export int simple_dsc_option();
--- 138,149 ----
  private int nodsc = FALSE;
  #ifdef ADOBE_DSC2_CONFORMANT
  private int adobe_dsc2_conformant = TRUE;
! #else  ADOBE_DSC2_CONFORMANT
  private int adobe_dsc2_conformant = FALSE;
! #endif ADOBE_DSC2_CONFORMANT
! #ifdef PASS_THRU
! private int simple_pass_thru = FALSE;
! #endif PASS_THRU
  
  export int is_simple_dsc();
  export int simple_dsc_option();
***************
*** 153,159 ****
--- 157,172 ----
  int getjob();
  private void SendVAck();
  
+ #ifdef PASS_THRU
  export int
+ set_simple_pass_thru()
+ {
+   simple_pass_thru = TRUE;
+   return(0);
+ }
+ #endif PASS_THRU
+ 
+ export int
  is_simple_dsc()
  {
    return(adobe_dsc2_conformant);
***************
*** 307,312 ****
--- 320,330 ----
    char *p;
    register struct atoken *tp;
  
+ #ifdef PASS_THRU
+   /* do we really want to process these tokens? */
+   if (simple_pass_thru == TRUE)
+     return(TOK_UNK);
+ #endif PASS_THRU
    /* all tokens start with "%?" or "%%" or "%!" */
    if (str[0] != '%')
      return(TOK_UNK);
*** README.orig		Sat Feb 22 22:11:07 1992
--- README		Sat Feb 22 22:12:48 1992
***************
*** 3,9 ****
  	       (For use with AppleTalk/Ethernet bridge)
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 91, February 1992
  
  Introduction
  ------------
--- 3,9 ----
  	       (For use with AppleTalk/Ethernet bridge)
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 92, February 1992
  
  Introduction
  ------------