remove bogus default ppd _PATH_PAPDPPDFILE, from Olaf Hering

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

diff --git a/etc/papd/ppd.c b/etc/papd/ppd.c
index c2c64240a2b89d51697209369c65907d556d38e6..786ee9c69e4b888e6c039c61da03cc36cecb9f15 100644 (file)
--- a/etc/papd/ppd.c
+++ b/etc/papd/ppd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ppd.c,v 1.8 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: ppd.c,v 1.14 2009-01-21 04:04:20 didg Exp $
  *
  * Copyright (c) 1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <atalk/logger.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -27,7 +28,11 @@ struct ppd_font              *ppd_fonts = NULL;
 struct ppd_feature     ppd_features[] = {
     { "*LanguageLevel",        0 },
     { "*PSVersion",    0 },
+#ifdef HAVE_CUPS
+    { "*FreeVM",       "33554432" },
+#else
     { "*FreeVM",       0 },
+#endif
     { "*Product",      0 },
     { "*PCFileName",   0 },
     { "*ModelName",    0 },
@@ -46,20 +51,50 @@ struct ppdent {
 };
 
 #ifndef SHOWPPD
-int ppd_inited = 0;
+static int ppd_inited;
 
-int ppd_init()
+static void ppd_init()
 {
-    if ( ppd_inited ) {
-       return( -1 );
-    }
+    if (ppd_inited)
+        return;
+
     ppd_inited++;
 
-    return read_ppd( printer->p_ppdfile, 0 );
+    if (printer->p_ppdfile)
+        read_ppd( printer->p_ppdfile, 0 );
 }
 #endif /* SHOWPPD */
 
-struct ppdent *getppdent( stream )
+
+/* quick and ugly hack to be able to read
+   ppd files with Mac line ending */
+static char* my_fgets(buf, bufsize, stream) 
+    char   *buf;
+    size_t bufsize;
+    FILE   *stream;
+{
+    int p;           /* uninitialized, OK 310105 */
+    size_t count = 0;
+ 
+    while (count < (bufsize - 1) && EOF != (p=fgetc(stream))) {
+        buf[count] = p;
+        count++;
+        if ( p == '\r' || p == '\n')
+           break;
+    }
+
+    if (p == EOF && count == 0)
+        return NULL;
+
+    /* translate line endings */
+    if ( buf[count - 1] == '\r')
+        buf[count - 1] = '\n';
+
+    buf[count] = 0;
+    return buf;
+}
+
+static struct ppdent *getppdent( stream )
     FILE       *stream;
 {
     static char                        buf[ 1024 ];
@@ -69,12 +104,12 @@ struct ppdent *getppdent( stream )
     ppdent.pe_main = ppdent.pe_option = ppdent.pe_translation =
            ppdent.pe_value = NULL;
 
-    while (( p = fgets( buf, sizeof( buf ), stream )) != NULL ) {
+    while (( p = my_fgets( buf, sizeof( buf ), stream )) != NULL ) {
        if ( *p != '*' ) {      /* main key word */
            continue;
        }
-       if ( p[ strlen( p ) - 1 ] != '\n' ) {
-           LOG(log_error, logtype_default, "getppdent: line too long" );
+       if ( p[ strlen( p ) - 1 ] != '\n') {
+           LOG(log_error, logtype_papd, "getppdent: line too long" );
            continue;
        }
 
@@ -154,12 +189,12 @@ int read_ppd( file, fcnt )
     struct ppd_font    *pfo;
 
     if ( fcnt > 20 ) {
-       LOG(log_error, logtype_default, "read_ppd: %s: Too many files!", file );
+       LOG(log_error, logtype_papd, "read_ppd: %s: Too many files!", file );
        return( -1 );
     }
 
     if (( ppdfile = fopen( file, "r" )) == NULL ) {
-       LOG(log_error, logtype_default, "read_ppd %s: %m", file );
+       LOG(log_error, logtype_papd, "read_ppd %s: %s", file, strerror(errno) );
        return( -1 );
     }
 
@@ -171,7 +206,7 @@ int read_ppd( file, fcnt )
        }
 
        /* *Font */
-       if ( strcmp( pe->pe_main, "*Font" ) == 0 ) {
+       if ( strcmp( pe->pe_main, "*Font" ) == 0 && pe->pe_option ) {
            for ( pfo = ppd_fonts; pfo; pfo = pfo->pd_next ) {
                if ( strcmp( pfo->pd_font, pe->pe_option ) == 0 ) {
                    break;
@@ -183,12 +218,12 @@ int read_ppd( file, fcnt )
 
            if (( pfo = (struct ppd_font *)malloc( sizeof( struct ppd_font )))
                    == NULL ) {
-               LOG(log_error, logtype_default, "malloc: %m" );
+               LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
                exit( 1 );
            }
            if (( pfo->pd_font =
                    (char *)malloc( strlen( pe->pe_option ) + 1 )) == NULL ) {
-               LOG(log_error, logtype_default, "malloc: %m" );
+               LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
                exit( 1 );
            }
            strcpy( pfo->pd_font, pe->pe_option );
@@ -204,10 +239,10 @@ int read_ppd( file, fcnt )
                break;
            }
        }
-       if ( pfe->pd_name && (pfe->pd_value == NULL) ) {
+       if ( pfe->pd_name && pe->pe_value ) { 
            if (( pfe->pd_value =
                    (char *)malloc( strlen( pe->pe_value ) + 1 )) == NULL ) {
-               LOG(log_error, logtype_default, "malloc: %m" );
+               LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
                exit( 1 );
            }