/*
- * $Id: ppd.c,v 1.9 2002-09-29 23:29:14 sibaz Exp $
+ * $Id: ppd.c,v 1.17 2009-10-14 02:24:05 didg Exp $
*
* Copyright (c) 1995 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <errno.h>
#include <atalk/logger.h>
#include <sys/types.h>
#include <sys/param.h>
struct ppd_font *ppd_fonts = NULL;
struct ppd_feature ppd_features[] = {
- { "*LanguageLevel", 0 },
- { "*PSVersion", 0 },
- { "*FreeVM", 0 },
- { "*Product", 0 },
- { "*PCFileName", 0 },
- { "*ModelName", 0 },
- { "*NickName", 0 },
- { "*ColorDevice", 0 },
- { "*FaxSupport", 0 },
- { "*TTRasterizer", 0 },
- { 0, 0 },
+ { "*LanguageLevel", NULL },
+ { "*PSVersion", NULL },
+#ifdef HAVE_CUPS
+ { "*FreeVM", "33554432" },
+#else
+ { "*FreeVM", NULL },
+#endif
+ { "*Product", NULL },
+ { "*PCFileName", NULL },
+ { "*ModelName", NULL },
+ { "*NickName", NULL },
+ { "*ColorDevice", NULL },
+ { "*FaxSupport", NULL },
+ { "*TTRasterizer", NULL },
+ { NULL, NULL },
};
struct ppdent {
};
#ifndef SHOWPPD
-int ppd_inited = 0;
+static int ppd_inited;
-int ppd_init()
+static void ppd_init(void)
{
- 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 )
- FILE *stream;
+
+/* quick and ugly hack to be able to read
+ ppd files with Mac line ending */
+static char* my_fgets(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( FILE *stream)
{
static char buf[ 1024 ];
static struct ppdent ppdent;
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' ) {
+ if ( p[ strlen( p ) - 1 ] != '\n') {
LOG(log_error, logtype_papd, "getppdent: line too long" );
continue;
}
return( NULL );
}
-int read_ppd( file, fcnt )
- char *file;
- int fcnt;
+int read_ppd(char *file, int fcnt)
{
FILE *ppdfile;
struct ppdent *pe;
}
if (( ppdfile = fopen( file, "r" )) == NULL ) {
- LOG(log_error, logtype_papd, "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 ) {
- LOG(log_error, logtype_papd, "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_papd, "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 ) {
- LOG(log_error, logtype_papd, "malloc: %m" );
+ LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
exit( 1 );
}
return( 0 );
}
-struct ppd_font *ppd_font( font )
- char *font;
+struct ppd_font *ppd_font( char *font)
{
struct ppd_font *pfo;
return( NULL );
}
-struct ppd_feature *ppd_feature( feature, len )
- const char *feature;
- int len;
+struct ppd_feature *ppd_feature( const char *feature, int len)
{
struct ppd_feature *pfe;
char ppd_feature_main[ 256 ];
}
#endif /* SHOWPPD */
+ if (len > sizeof(ppd_feature_main) -1)
+ return( NULL );
+
for ( end = feature + len, p = feature, q = ppd_feature_main;
(p <= end) && (*p != '\n') && (*p != '\r'); p++, q++ ) {
*q = *p;