replaced all #include <sys/syslog.h> with #include <syslog.h>

[netatalk.git] / etc / papd / queries.c

diff --git a/etc/papd/queries.c b/etc/papd/queries.c
index 6a926e1bb142a69a045ee7a5ff43c98419006605..3ce055ca64f45cf9c2843baf5f56e59ce1ea55fb 100644 (file)
--- a/etc/papd/queries.c
+++ b/etc/papd/queries.c
@@ -1,14 +1,18 @@
 /*
+ * $Id: queries.c,v 1.9 2002-01-03 17:49:39 sibaz Exp $
+ *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include <string.h>
-#include <sys/syslog.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <syslog.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -18,23 +22,45 @@
 #ifdef KRB
 #ifdef SOLARIS
 #include <kerberos/krb.h>
-#else
+#else /* SOLARIS */
 #include <krb.h>
-#endif
-#endif KRB
+#endif /* SOLARIS */
+#endif /* KRB */
 
 #include "file.h"
 #include "comment.h"
 #include "printer.h"
 #include "ppd.h"
+#include "lp.h"
 #include "uam_auth.h"
 
-cq_default( in, out )
+int cq_default( struct papfile *, struct papfile * );
+int cq_k4login( struct papfile *, struct papfile * );
+int cq_uameth( struct papfile *, struct papfile * );
+
+int gq_balance( struct papfile * );
+int gq_pagecost( struct papfile * );
+int gq_true( struct papfile * );
+int gq_rbispoolerid( struct papfile * );
+int gq_rbiuamlist( struct papfile * );
+
+int cq_query( struct papfile *, struct papfile * );
+void cq_font_answer( char *, char *, struct papfile * );
+int cq_font( struct papfile *, struct papfile * );
+int cq_feature( struct papfile *, struct papfile * );
+int cq_printer( struct papfile *, struct papfile * );
+int cq_rmjob( struct papfile *, struct papfile * );
+int cq_listq( struct papfile *, struct papfile * );
+int cq_rbilogin( struct papfile *, struct papfile * );
+
+
+
+int cq_default( in, out )
     struct papfile     *in, *out;
 {
     char               *start, *stop, *p;
     int                        linelength, crlflength;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
 
     for (;;) {
        switch ( markline( in, &start, &linelength, &crlflength )) {
@@ -85,13 +111,13 @@ char       *LoginFailed = "LoginFailed\n";
 
 #define h2b(x) (isdigit((x))?(x)-'0':(isupper((x))?(x)-'A':(x)-'a')+10)
 
-cq_k4login( in, out )
+int cq_k4login( in, out )
     struct papfile     *in, *out;
 {
     char               *start, *p;
     int                        linelength, crlflength;
     unsigned char      *t;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
     KTEXT_ST           tkt;
     AUTH_DAT           ad;
     int                        rc, i;
@@ -138,12 +164,12 @@ cq_k4login( in, out )
 
 char   *uameth = "UMICHKerberosIV\n*\n";
 
-cq_uameth( in, out )
+int cq_uameth( in, out )
     struct papfile     *in, *out;
 {
     char               *start;
     int                        linelength, crlflength;
-    struct comment     *c, *comment = compeek();
+    struct papd_comment        *c, *comment = compeek();
 
     for (;;) {
        switch ( markline( in, &start, &linelength, &crlflength )) {
@@ -174,9 +200,9 @@ cq_uameth( in, out )
        CONSUME( in, linelength + crlflength );
     }
 }
-#endif KRB
+#endif /* KRB */
 
-gq_true( out )
+int gq_true( out )
     struct papfile     *out;
 {
     if ( printer->p_flags & P_SPOOLED ) {
@@ -187,7 +213,7 @@ gq_true( out )
     }
 }
 
-gq_pagecost( out )
+int gq_pagecost( out )
     struct papfile     *out;
 {
     char               cost[ 60 ];
@@ -199,7 +225,7 @@ gq_pagecost( out )
     } else if ( printer->p_flags & P_ACCOUNT ) {
 #ifdef ABS_PRINT
        lp_pagecost();
-#endif ABS_PRINT
+#endif /* ABS_PRINT */
        sprintf( cost, "%d", printer->p_pagecost );
        append( out, cost, strlen( cost ));
     } else {
@@ -210,7 +236,7 @@ gq_pagecost( out )
 }
 
 #ifdef ABS_PRINT
-gq_balance( out )
+int gq_balance( out )
     struct papfile     *out;
 {
     char               balance[ 60 ];
@@ -222,7 +248,7 @@ gq_balance( out )
     append( out, balance, strlen( balance ));
     return( 0 );
 }
-#endif ABS_PRINT
+#endif /* ABS_PRINT */
 
 
 /*
@@ -231,7 +257,7 @@ gq_balance( out )
 
 static const char *spoolerid = "(PAPD Spooler) 2.1 (2.1.4 pre-release)\n";
 
-gq_rbispoolerid( out )
+int gq_rbispoolerid( out )
     struct papfile     *out;
 {
     append( out, spoolerid, strlen( spoolerid ));
@@ -246,7 +272,7 @@ gq_rbispoolerid( out )
 
 static const char *nouams = "*\n";
 
-gq_rbiuamlist( out )
+int gq_rbiuamlist( out )
     struct papfile      *out;
 {
     char uamnames[128] = "\0";
@@ -273,7 +299,7 @@ struct genquery {
     { "UMICHCostPerPage", gq_pagecost },
 #ifdef notdef
     { "UMICHUserBalance", gq_balance },
-#endif 
+#endif /* notdef */
     { "RBISpoolerID",  gq_rbispoolerid },
     { "RBIUAMListQuery", gq_rbiuamlist },
     { "UMICHListQueue", gq_true },
@@ -281,12 +307,12 @@ struct genquery {
     { NULL },
 };
 
-cq_query( in, out )
+int cq_query( in, out )
     struct papfile     *in, *out;
 {
     char               *start, *stop, *p, *q;
     int                        linelength, crlflength;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
     struct genquery    *gq;
 
 
@@ -348,7 +374,7 @@ cq_query( in, out )
     }
 }
 
-cq_font_answer( start, stop, out )
+void cq_font_answer( start, stop, out )
     char               *start, *stop;
     struct papfile     *out;
 {
@@ -385,12 +411,12 @@ cq_font_answer( start, stop, out )
     return;
 }
 
-cq_font( in, out )
+int cq_font( in, out )
     struct papfile     *in, *out;
 {
     char               *start, *stop, *p;
     int                        linelength, crlflength;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
 
     for (;;) {
        switch ( markline( in, &start, &linelength, &crlflength )) {
@@ -442,12 +468,12 @@ cq_font( in, out )
     }
 }
 
-cq_feature( in, out )
+int cq_feature( in, out )
     struct papfile     *in, *out;
 {
     char               *start, *stop, *p;
     int                        linelength, crlflength;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
     struct ppd_feature *pfe;
 
     for (;;) {
@@ -500,12 +526,12 @@ cq_feature( in, out )
 static const char      *psver = "*PSVersion\n";
 static const char      *prod = "*Product\n";
 
-cq_printer( in, out )
+int cq_printer( in, out )
     struct papfile     *in, *out;
 {
     char               *start, *p;
     int                        linelength, crlflength;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
     struct ppd_feature *pdpsver, *pdprod;
 
     for (;;) {
@@ -576,7 +602,7 @@ cq_printer( in, out )
 static const char      *rmjobfailed = "Failed\n";
 static const char      *rmjobok = "Ok\n";
 
-cq_rmjob( in, out )
+int cq_rmjob( in, out )
     struct papfile     *in, *out;
 {
     char               *start, *stop, *p;
@@ -617,7 +643,7 @@ cq_rmjob( in, out )
     return( CH_DONE );
 }
 
-cq_listq( in, out )
+int cq_listq( in, out )
     struct papfile     *in, *out;
 {
     char               *start;
@@ -653,14 +679,14 @@ SecurityViolation: Unknown user, incorrect password or log on is \
 disabled ]%%\r%%Flushing: rest of job (to end-of-file) will be \
 ignored ]%%\r";
 
-cq_rbilogin( in, out )
+int cq_rbilogin( in, out )
     struct papfile      *in, *out;
 {
-    char        *start, *stop, *p, *begin;
-    int                linelength, crlflength;
-    char        username[9] = "\0";
-    struct comment      *comment = compeek();
-    char       uamtype[20] = "\0";
+    char               *start, *stop, *p, *begin;
+    int                        linelength, crlflength;
+    char               username[9] = "\0";
+    struct papd_comment        *comment = compeek();
+    char               uamtype[20] = "\0";
 
     for (;;) {
         switch ( markline( in, &start, &linelength, &crlflength )) {
@@ -713,11 +739,11 @@ cq_rbilogin( in, out )
  * All queries start with %%?Begin and end with %%?End.  Note that the
  * "Begin"/"End" general queries have to be last.
  */
-struct comment queries[] = {
+struct papd_comment    queries[] = {
 #ifdef KRB
     { "%%Login: UMICHKerberosIV", 0,                   cq_k4login,     0 },
     { "%%?BeginUAMethodsQuery",        "%%?EndUAMethodsQuery:", cq_uameth, C_FULL },
-#endif KRB
+#endif /* KRB */
     { "%UMICHListQueue", 0,                            cq_listq, C_FULL },
     { "%UMICHDeleteJob", 0,                            cq_rmjob,       0 },
     { "%%?BeginQuery: RBILogin ", "%%?EndQuery",       cq_rbilogin,    0 },