/*
+ * $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.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/syslog.h>
+#include <errno.h>
+#include <atalk/logger.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
struct ppd_feature ppd_features[] = {
{ "*LanguageLevel", 0 },
{ "*PSVersion", 0 },
+#ifdef HAVE_CUPS
+ { "*FreeVM", "33554432" },
+#else
{ "*FreeVM", 0 },
+#endif
{ "*Product", 0 },
{ "*PCFileName", 0 },
{ "*ModelName", 0 },
};
#ifndef SHOWPPD
-int ppd_inited = 0;
+static int ppd_inited;
-ppd_init()
+static void ppd_init()
{
- if ( ppd_inited ) {
- return( -1 );
- }
+ if (ppd_inited)
+ return;
+
ppd_inited++;
- read_ppd( printer->p_ppdfile, 0 );
+ if (printer->p_ppdfile)
+ read_ppd( printer->p_ppdfile, 0 );
+}
+#endif /* SHOWPPD */
+
+
+/* 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;
}
-#endif SHOWPPD
- struct ppdent *
-getppdent( stream )
+static struct ppdent *getppdent( stream )
FILE *stream;
{
static char buf[ 1024 ];
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' ) {
- syslog( LOG_ERR, "getppdent: line too long" );
+ if ( p[ strlen( p ) - 1 ] != '\n') {
+ LOG(log_error, logtype_papd, "getppdent: line too long" );
continue;
}
q = p;
- while ( *p != ' ' && *p != '\t' && *p != ':' && *p != '\n' ) {
+ while ( (*p != ' ') && (*p != '\t') && (*p != ':') && (*p != '\n') ) {
p++;
}
- if ( *( q + 1 ) == '%' || *( q + 1 ) == '?' ) { /* comments & queries */
+ if ( (*( q + 1 ) == '%') || (*( q + 1 ) == '?') ) { /* comments & queries */
continue;
}
ppdent.pe_main = q;
if ( *p != ':' ) { /* option key word */
*p++ = '\0';
- while ( *p == ' ' || *p == '\t' ) {
+ while ( (*p == ' ') || (*p == '\t') ) {
p++;
}
q = p;
- while ( *p != ':' && *p != '/' && *p != '\n' ) {
+ while ( (*p != ':') && (*p != '/') && (*p != '\n') ) {
p++;
}
}
*p++ = '\0';
- while ( *p == ' ' || *p == '\t' ) {
+ while ( (*p == ' ') || (*p == '\t') ) {
p++;
}
/* value */
- if ( *p == '"' ) {
+ q = p;
+ while ( *p != '\n' ) {
p++;
- q = p;
-
- while ( *p != '"' && *p != '\n' ) {
- p++;
- }
-
- if ( *p == '\n' ) {
- continue;
- }
- *p = '\0';
- ppdent.pe_value = q;
- } else {
- q = p;
- while ( *p != '\n' ) {
- p++;
- }
- *p = '\0';
- ppdent.pe_value = q;
}
+ *p = '\0';
+ ppdent.pe_value = q;
+
return( &ppdent );
}
return( NULL );
}
-read_ppd( file, fcnt )
+int read_ppd( file, fcnt )
char *file;
int fcnt;
{
struct ppd_font *pfo;
if ( fcnt > 20 ) {
- syslog( LOG_ERR, "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 ) {
- syslog( LOG_ERR, "read_ppd %s: %m", file );
+ LOG(log_error, logtype_papd, "read_ppd %s: %s", file, strerror(errno) );
return( -1 );
}
}
/* *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;
if (( pfo = (struct ppd_font *)malloc( sizeof( struct ppd_font )))
== NULL ) {
- syslog( LOG_ERR, "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 ) {
- syslog( LOG_ERR, "malloc: %m" );
+ LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
exit( 1 );
}
strcpy( pfo->pd_font, pe->pe_option );
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 ) {
- syslog( LOG_ERR, "malloc: %m" );
+ LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
exit( 1 );
}
return( 0 );
}
- struct ppd_font *
-ppd_font( font )
+struct ppd_font *ppd_font( font )
char *font;
{
struct ppd_font *pfo;
if ( ! ppd_inited ) {
ppd_init();
}
-#endif SHOWPPD
+#endif /* SHOWPPD */
for ( pfo = ppd_fonts; pfo; pfo = pfo->pd_next ) {
if ( strcmp( pfo->pd_font, font ) == 0 ) {
return( NULL );
}
- struct ppd_feature *
-ppd_feature( feature, len )
- char *feature;
+struct ppd_feature *ppd_feature( feature, len )
+ const char *feature;
int len;
{
struct ppd_feature *pfe;
- char main[ 256 ];
- char *end, *p, *q;
+ char ppd_feature_main[ 256 ];
+ const char *end, *p;
+ char *q;
#ifndef SHOWPPD
if ( ! ppd_inited ) {
ppd_init();
}
-#endif SHOWPPD
+#endif /* SHOWPPD */
- for ( end = feature + len, p = feature, q = main;
- p <= end && *p != '\n' && *p != '\r'; p++, q++ ) {
+ for ( end = feature + len, p = feature, q = ppd_feature_main;
+ (p <= end) && (*p != '\n') && (*p != '\r'); p++, q++ ) {
*q = *p;
}
if ( p > end ) {
*q = '\0';
for ( pfe = ppd_features; pfe->pd_name; pfe++ ) {
- if ( strcmp( pfe->pd_name, main ) == 0 && pfe->pd_value ) {
+ if ( (strcmp( pfe->pd_name, ppd_feature_main ) == 0) && pfe->pd_value ) {
return( pfe );
}
}