/*
- * "$Id: ppd.c,v 1.17 1999/05/17 18:11:46 mike Exp $"
+ * "$Id: ppd.c,v 1.51.2.64 2004/06/29 03:46:29 mike Exp $"
*
* PPD file routines for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-1999 by Easy Software Products, all rights reserved.
+ * Copyright 1997-2003 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3111 USA
+ * Hollywood, Maryland 20636-3142 USA
*
- * Voice: (301) 373-9603
+ * Voice: (301) 373-9600
* EMail: cups-info@cups.org
* WWW: http://www.cups.org
*
* GhostScript (or its derivatives) is governed by the CUPS license
* agreement.
*
+ * This file is subject to the Apple OS-Developed Software exception.
+ *
* Contents:
*
- * ppdClose() - Free all memory used by the PPD file.
- * ppd_free_group() - Free a single UI group.
- * ppd_free_option() - Free a single option.
- * ppdOpen() - Read a PPD file into memory.
- * ppdOpenFd() - Read a PPD file into memory.
- * ppdOpenFile() - Read a PPD file into memory.
- * ppd_read() - Read a line from a PPD file, skipping comment lines
- * as necessary.
+ * _ppd_attr_compare() - Compare two attributes.
+ * ppdClose() - Free all memory used by the PPD file.
+ * ppdErrorString() - Returns the text assocated with a status.
+ * ppdLastError() - Return the status from the last ppdOpen*().
+ * ppdOpen() - Read a PPD file into memory.
+ * ppdOpenFd() - Read a PPD file into memory.
+ * ppdOpenFile() - Read a PPD file into memory.
+ * ppdSetConformance() - Set the conformance level for PPD files.
+ * ppd_add_attr() - Add an attribute to the PPD data.
+ * ppd_add_choice() - Add a choice to an option.
+ * ppd_add_size() - Add a page size.
+ * ppd_compare_groups() - Compare two groups.
+ * ppd_compare_options() - Compare two options.
+ * ppd_decode() - Decode a string value...
+ * ppd_fix() - Fix WinANSI characters in the range 0x80 to
+ * 0x9f to be valid ISO-8859-1 characters...
+ * ppd_free_group() - Free a single UI group.
+ * ppd_free_option() - Free a single option.
+ * ppd_get_extoption() - Get an extended option record.
+ * ppd_get_extparam() - Get an extended parameter record.
+ * ppd_get_group() - Find or create the named group as needed.
+ * ppd_get_option() - Find or create the named option as needed.
+ * ppd_read() - Read a line from a PPD file, skipping comment
+ * lines as necessary.
*/
/*
* Include necessary headers.
*/
-/*#define DEBUG*/
#include "ppd.h"
#include <stdlib.h>
#include <ctype.h>
#include "string.h"
+#include "language.h"
+#include "debug.h"
/*
# define WRITE_BINARY "w" /* Open a binary file for writing */
#endif /* WIN32 || __EMX__ */
+#define ppd_free(p) if (p) free(p) /* Safe free macro */
+
#define PPD_KEYWORD 1 /* Line contained a keyword */
#define PPD_OPTION 2 /* Line contained an option name */
#define PPD_TEXT 4 /* Line contained human-readable text */
#define PPD_STRING 8 /* Line contained a string or code */
+/*
+ * Local globals...
+ */
+
+static ppd_status_t ppd_status = PPD_OK;
+ /* Status of last ppdOpen*() */
+static int ppd_line = 0; /* Current line number */
+static ppd_conform_t ppd_conform = PPD_CONFORM_RELAXED;
+ /* Level of conformance required */
+
+
/*
* Local functions...
*/
-static int ppd_read(FILE *fp, char *keyword, char *option,
- char *text, char **string);
-static void ppd_decode(char *string);
+static ppd_attr_t *ppd_add_attr(ppd_file_t *ppd, const char *name,
+ const char *spec, const char *text,
+ const char *value);
+static ppd_choice_t *ppd_add_choice(ppd_option_t *option, const char *name);
+static ppd_size_t *ppd_add_size(ppd_file_t *ppd, const char *name);
+#ifndef __APPLE__
+static int ppd_compare_groups(ppd_group_t *g0, ppd_group_t *g1);
+static int ppd_compare_options(ppd_option_t *o0, ppd_option_t *o1);
+#endif /* !__APPLE__ */
+static int ppd_decode(char *string);
+#ifndef __APPLE__
+static void ppd_fix(char *string);
+#else
+# define ppd_fix(s)
+#endif /* !__APPLE__ */
static void ppd_free_group(ppd_group_t *group);
static void ppd_free_option(ppd_option_t *option);
-static ppd_group_t *ppd_get_group(ppd_file_t *ppd, char *name);
-static ppd_option_t *ppd_get_option(ppd_group_t *group, char *name);
-static ppd_choice_t *ppd_add_choice(ppd_option_t *option, char *name);
+static ppd_ext_option_t *ppd_get_extoption(ppd_file_t *ppd, const char *name);
+static ppd_ext_param_t *ppd_get_extparam(ppd_ext_option_t *opt,
+ const char *param,
+ const char *text);
+static ppd_group_t *ppd_get_group(ppd_file_t *ppd, const char *name,
+ const char *text);
+static ppd_option_t *ppd_get_option(ppd_group_t *group, const char *name);
+static int ppd_read(FILE *fp, char *keyword, char *option,
+ char *text, char **string, int ignoreblank);
+
+
+/*
+ * '_ppd_attr_compare()' - Compare two attributes.
+ */
+
+int /* O - Result of comparison */
+_ppd_attr_compare(ppd_attr_t **a, /* I - First attribute */
+ ppd_attr_t **b) /* I - Second attribute */
+{
+ int ret; /* Result of comparison */
+
+
+ if ((ret = strcasecmp((*a)->name, (*b)->name)) != 0)
+ return (ret);
+ else if ((*a)->spec[0] && (*b)->spec[0])
+ return (strcasecmp((*a)->spec, (*b)->spec));
+ else
+ return (0);
+}
/*
*/
void
-ppdClose(ppd_file_t *ppd) /* I - PPD file record */
+ppdClose(ppd_file_t *ppd) /* I - PPD file record */
{
- int i; /* Looping var */
- ppd_emul_t *emul; /* Current emulation */
- ppd_group_t *group; /* Current group */
- char **font; /* Current font */
+ int i, j; /* Looping var */
+ ppd_emul_t *emul; /* Current emulation */
+ ppd_group_t *group; /* Current group */
+ char **font; /* Current font */
+ char **filter; /* Current filter */
+ ppd_attr_t **attr; /* Current attribute */
+ ppd_ext_option_t **opt; /* Current extended option */
+ ppd_ext_param_t **param; /* Current extended parameter */
/*
* Free all strings at the top level...
*/
- free(ppd->lang_encoding);
- free(ppd->lang_version);
- free(ppd->modelname);
- free(ppd->ttrasterizer);
- free(ppd->manufacturer);
- free(ppd->product);
- free(ppd->nickname);
- free(ppd->shortnickname);
+ ppd_free(ppd->patches);
+ ppd_free(ppd->jcl_begin);
+ ppd_free(ppd->jcl_end);
+ ppd_free(ppd->jcl_ps);
/*
* Free any emulations...
{
for (i = ppd->num_emulations, emul = ppd->emulations; i > 0; i --, emul ++)
{
- free(emul->start);
- free(emul->stop);
+ ppd_free(emul->start);
+ ppd_free(emul->stop);
}
- free(ppd->emulations);
+ ppd_free(ppd->emulations);
}
/*
for (i = ppd->num_groups, group = ppd->groups; i > 0; i --, group ++)
ppd_free_group(group);
- free(ppd->groups);
+ ppd_free(ppd->groups);
}
/*
*/
if (ppd->num_sizes > 0)
- free(ppd->sizes);
+ {
+ ppd_free(ppd->sizes);
+ }
/*
* Free any constraints...
*/
if (ppd->num_consts > 0)
- free(ppd->consts);
+ {
+ ppd_free(ppd->consts);
+ }
+
+ /*
+ * Free any filters...
+ */
+
+ if (ppd->num_filters > 0)
+ {
+ for (i = ppd->num_filters, filter = ppd->filters; i > 0; i --, filter ++)
+ {
+ ppd_free(*filter);
+ }
+
+ ppd_free(ppd->filters);
+ }
/*
* Free any fonts...
if (ppd->num_fonts > 0)
{
for (i = ppd->num_fonts, font = ppd->fonts; i > 0; i --, font ++)
- free(*font);
+ {
+ ppd_free(*font);
+ }
- free(ppd->fonts);
+ ppd_free(ppd->fonts);
}
/*
*/
if (ppd->num_profiles > 0)
- free(ppd->profiles);
-
- /*
- * Free the whole record...
- */
-
- free(ppd);
-}
-
-
-/*
- * 'ppd_free_group()' - Free a single UI group.
- */
-
-static void
-ppd_free_group(ppd_group_t *group) /* I - Group to free */
-{
- int i; /* Looping var */
- ppd_option_t *option; /* Current option */
- ppd_group_t *subgroup; /* Current sub-group */
-
-
- if (group->num_options > 0)
- {
- for (i = group->num_options, option = group->options;
- i > 0;
- i --, option ++)
- ppd_free_option(option);
-
- free(group->options);
- }
-
- if (group->num_subgroups > 0)
{
- for (i = group->num_subgroups, subgroup = group->subgroups;
- i > 0;
- i --, subgroup ++)
- ppd_free_group(subgroup);
-
- free(group->subgroups);
+ ppd_free(ppd->profiles);
}
-}
-
-
-/*
- * 'ppd_free_option()' - Free a single option.
- */
-
-static void
-ppd_free_option(ppd_option_t *option) /* I - Option to free */
-{
- int i; /* Looping var */
- ppd_choice_t *choice; /* Current choice */
+ /*
+ * Free any attributes...
+ */
- if (option->num_choices > 0)
+ if (ppd->num_attrs > 0)
{
- for (i = option->num_choices, choice = option->choices;
- i > 0;
- i --, choice ++)
- free(choice->code);
+ for (i = ppd->num_attrs, attr = ppd->attrs; i > 0; i --, attr ++)
+ {
+ ppd_free((*attr)->value);
+ ppd_free(*attr);
+ }
- free(option->choices);
+ ppd_free(ppd->attrs);
}
-}
-
-
-/*
- * 'ppd_get_group()' - Find or create the named group as needed.
- */
-
-static ppd_group_t * /* O - Named group */
-ppd_get_group(ppd_file_t *ppd, /* I - PPD file */
- char *name) /* I - Name of group */
-{
- int i; /* Looping var */
- ppd_group_t *group; /* Group */
-
-
- for (i = ppd->num_groups, group = ppd->groups; i > 0; i --, group ++)
- if (strcmp(group->text, name) == 0)
- break;
- if (i == 0)
+ if (ppd->num_extended)
{
- if (ppd->num_groups == 0)
- group = malloc(sizeof(ppd_group_t));
- else
- group = realloc(ppd->groups,
- (ppd->num_groups + 1) * sizeof(ppd_group_t));
+ for (i = ppd->num_extended, opt = ppd->extended; i > 0; i --, opt ++)
+ {
+ ppd_free((*opt)->code);
- if (group == NULL)
- return (NULL);
+ for (j = (*opt)->num_params, param = (*opt)->params; j > 0; j --, param ++)
+ ppd_free((*param)->value);
- ppd->groups = group;
- group += ppd->num_groups;
- ppd->num_groups ++;
+ ppd_free((*opt)->params);
+ }
- memset(group, 0, sizeof(ppd_group_t));
- strcpy(group->text, name);
+ ppd_free(ppd->extended);
}
- return (group);
-}
-
-
-/*
- * 'ppd_get_option()' - Find or create the named option as needed.
- */
-
-static ppd_option_t * /* O - Named option */
-ppd_get_option(ppd_group_t *group, /* I - Group */
- char *name) /* I - Name of option */
-{
- int i; /* Looping var */
- ppd_option_t *option; /* Option */
-
-
- for (i = group->num_options, option = group->options; i > 0; i --, option ++)
- if (strcmp(option->keyword, name) == 0)
- break;
-
- if (i == 0)
- {
- if (group->num_options == 0)
- option = malloc(sizeof(ppd_option_t));
- else
- option = realloc(group->options,
- (group->num_options + 1) * sizeof(ppd_option_t));
-
- if (option == NULL)
- return (NULL);
-
- group->options = option;
- option += group->num_options;
- group->num_options ++;
-
- memset(option, 0, sizeof(ppd_option_t));
- strcpy(option->keyword, name);
- }
+ /*
+ * Free the whole record...
+ */
- return (option);
+ ppd_free(ppd);
}
/*
- * 'ppd_add_choice()' - Add a choice to an option.
+ * 'ppdErrorString()' - Returns the text assocated with a status.
*/
-static ppd_choice_t * /* O - Named choice */
-ppd_add_choice(ppd_option_t *option, /* I - Option */
- char *name) /* I - Name of choice */
+const char * /* O - Status string */
+ppdErrorString(ppd_status_t status) /* I - PPD status */
{
- ppd_choice_t *choice; /* Choice */
-
-
- if (option->num_choices == 0)
- choice = malloc(sizeof(ppd_choice_t));
+ static const char * const messages[] =/* Status messages */
+ {
+ "OK",
+ "Unable to open PPD file",
+ "NULL PPD file pointer",
+ "Memory allocation error",
+ "Missing PPD-Adobe-4.x header",
+ "Missing value string",
+ "Internal error",
+ "Bad OpenGroup",
+ "OpenGroup without a CloseGroup first",
+ "Bad OpenUI/JCLOpenUI",
+ "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first",
+ "Bad OrderDependency",
+ "Bad UIConstraints",
+ "Missing asterisk in column 1",
+ "Line longer than the maximum allowed (255 characters)",
+ "Illegal control character",
+ "Illegal main keyword string",
+ "Illegal option keyword string",
+ "Illegal translation string",
+ "Illegal whitespace character"
+ };
+
+
+ if (status < PPD_OK || status > PPD_ILLEGAL_WHITESPACE)
+ return ("Unknown");
else
- choice = realloc(option->choices,
- sizeof(ppd_choice_t) * (option->num_choices + 1));
-
- if (choice == NULL)
- return (NULL);
-
- option->choices = choice;
- choice += option->num_choices;
- option->num_choices ++;
-
- memset(choice, 0, sizeof(ppd_choice_t));
- strcpy(choice->choice, name);
-
- return (choice);
+ return (messages[status]);
}
/*
- * 'ppd_add_size()' - Add a page size.
+ * 'ppdLastError()' - Return the status from the last ppdOpen*().
*/
-static ppd_size_t * /* O - Named size */
-ppd_add_size(ppd_file_t *ppd, /* I - PPD file */
- char *name) /* I - Name of size */
+ppd_status_t /* O - Status code */
+ppdLastError(int *line) /* O - Line number */
{
- ppd_size_t *size; /* Size */
-
-
- if (ppd->num_sizes == 0)
- size = malloc(sizeof(ppd_size_t));
- else
- size = realloc(ppd->sizes, sizeof(ppd_size_t) * (ppd->num_sizes + 1));
-
- if (size == NULL)
- return (NULL);
-
- ppd->sizes = size;
- size += ppd->num_sizes;
- ppd->num_sizes ++;
-
- memset(size, 0, sizeof(ppd_size_t));
- strcpy(size->name, name);
+ if (line)
+ *line = ppd_line;
- return (size);
+ return (ppd_status);
}
* 'ppdOpen()' - Read a PPD file into memory.
*/
-ppd_file_t * /* O - PPD file record */
-ppdOpen(FILE *fp) /* I - File to read from */
+ppd_file_t * /* O - PPD file record */
+ppdOpen(FILE *fp) /* I - File to read from */
{
- int i, j, k, m; /* Looping vars */
- int count; /* Temporary count */
- ppd_file_t *ppd; /* PPD file record */
- ppd_group_t *group, /* Current group */
- *subgroup; /* Current sub-group */
- ppd_option_t *option; /* Current option */
- ppd_choice_t *choice; /* Current choice */
- ppd_const_t *constraint; /* Current constraint */
- ppd_size_t *size; /* Current page size */
- int mask; /* Line data mask */
- char keyword[41], /* Keyword from file */
- name[41], /* Option from file */
- text[81], /* Human-readable text from file */
- *string, /* Code/text from file */
- *sptr, /* Pointer into string */
- *nameptr; /* Pointer into name */
- float order; /* Order dependency number */
- ppd_section_t section; /* Order dependency section */
- ppd_profile_t *profile; /* Pointer to color profile */
- char **filter; /* Pointer to filter */
+ char *oldlocale; /* Old locale settings */
+ int i, j, k, m; /* Looping vars */
+ int count; /* Temporary count */
+ ppd_file_t *ppd; /* PPD file record */
+ ppd_group_t *group, /* Current group */
+ *subgroup; /* Current sub-group */
+ ppd_option_t *option; /* Current option */
+ ppd_ext_option_t *extopt; /* Current extended option */
+ ppd_choice_t *choice; /* Current choice */
+ ppd_const_t *constraint; /* Current constraint */
+ ppd_size_t *size; /* Current page size */
+ int mask; /* Line data mask */
+ char keyword[PPD_MAX_NAME],
+ /* Keyword from file */
+ name[PPD_MAX_NAME],
+ /* Option from file */
+ text[PPD_MAX_LINE],
+ /* Human-readable text from file */
+ *string, /* Code/text from file */
+ *sptr, /* Pointer into string */
+ *nameptr, /* Pointer into name */
+ *temp, /* Temporary string pointer */
+ **tempfonts; /* Temporary fonts pointer */
+ float order; /* Order dependency number */
+ ppd_section_t section; /* Order dependency section */
+ ppd_profile_t *profile; /* Pointer to color profile */
+ char **filter; /* Pointer to filter */
+ cups_lang_t *language; /* Default language */
+ int ui_keyword; /* Is this line a UI keyword? */
+ static const char * const ui_keywords[] =
+ {
+ /* Boolean keywords */
+ "BlackSubstitution",
+ "Booklet",
+ "Collate",
+ "ManualFeed",
+ "MirrorPrint",
+ "NegativePrint",
+ "Sorter",
+ "TraySwitch",
+
+ /* PickOne keywords */
+ "AdvanceMedia",
+ "BindColor",
+ "BindEdge",
+ "BindType",
+ "BindWhen",
+ "BitsPerPixel",
+ "ColorModel",
+ "CutMedia",
+ "Duplex",
+ "FoldType",
+ "FoldWhen",
+ "InputSlot",
+ "JCLFrameBufferSize",
+ "JCLResolution",
+ "Jog",
+ "MediaColor",
+ "MediaType",
+ "MediaWeight",
+ "OutputBin",
+ "OutputMode",
+ "OutputOrder",
+ "PageRegion",
+ "PageSize",
+ "Resolution",
+ "Separations",
+ "Signature",
+ "Slipsheet",
+ "Smoothing",
+ "StapleLocation",
+ "StapleOrientation",
+ "StapleWhen",
+ "StapleX",
+ "StapleY"
+ };
+
+
+ /*
+ * Default to "OK" status...
+ */
+ ppd_status = PPD_OK;
+ ppd_line = 0;
/*
* Range check input...
*/
if (fp == NULL)
+ {
+ ppd_status = PPD_NULL_FILE;
return (NULL);
+ }
/*
* Grab the first line and make sure it reads '*PPD-Adobe: "major.minor"'...
*/
- mask = ppd_read(fp, keyword, name, text, &string);
+ mask = ppd_read(fp, keyword, name, text, &string, 0);
+
+ DEBUG_printf(("mask=%x, keyword=\"%s\"...\n", mask, keyword));
if (mask == 0 ||
strcmp(keyword, "PPD-Adobe") != 0 ||
* Either this is not a PPD file, or it is not a 4.x PPD file.
*/
- if (string != NULL)
- free(string);
+ if (ppd_status == PPD_OK)
+ ppd_status = PPD_MISSING_PPDADOBE4;
+
+ ppd_free(string);
return (NULL);
}
- if (string != NULL)
- free(string);
+ DEBUG_printf(("ppdOpen: keyword = %s, string = %p\n", keyword, string));
+
+ ppd_free(string);
/*
* Allocate memory for the PPD file record...
*/
- if ((ppd = calloc(sizeof(ppd_file_t), 1)) == NULL)
+ if ((ppd = calloc(1, sizeof(ppd_file_t))) == NULL)
+ {
+ ppd_status = PPD_ALLOC_ERROR;
+
return (NULL);
+ }
ppd->language_level = 1;
ppd->color_device = 0;
ppd->colorspace = PPD_CS_GRAY;
- ppd->landscape = 90;
+ ppd->landscape = -90;
+
+ /*
+ * Get the default language for the user...
+ */
+
+ language = cupsLangDefault();
+
+#ifdef LC_NUMERIC
+ oldlocale = _cupsSaveLocale(LC_NUMERIC, "C");
+#else
+ oldlocale = _cupsSaveLocale(LC_ALL, "C");
+#endif /* LC_NUMERIC */
/*
* Read lines from the PPD file and add them to the file record...
*/
- group = NULL;
- subgroup = NULL;
- option = NULL;
- choice = NULL;
+ group = NULL;
+ subgroup = NULL;
+ option = NULL;
+ choice = NULL;
+ ui_keyword = 0;
- while ((mask = ppd_read(fp, keyword, name, text, &string)) != 0)
+ while ((mask = ppd_read(fp, keyword, name, text, &string, 1)) != 0)
{
#ifdef DEBUG
printf("mask = %x, keyword = \"%s\"", mask, keyword);
if (string != NULL)
{
if (strlen(string) > 40)
- printf(", string = %08x", string);
+ printf(", string = %p", string);
else
printf(", string = \"%s\"", string);
}
puts("");
#endif /* DEBUG */
- if (strcmp(keyword, "LanguageLevel") == 0)
- ppd->language_level = atoi(string);
- else if (strcmp(keyword, "LanguageEncoding") == 0)
- {
- ppd->lang_encoding = string;
- string = NULL; /* Don't free this string below */
- }
- else if (strcmp(keyword, "LanguageVersion") == 0)
- {
- ppd->lang_version = string;
- string = NULL; /* Don't free this string below */
- }
- else if (strcmp(keyword, "Manufacturer") == 0)
- {
- ppd->manufacturer = string;
- string = NULL; /* Don't free this string below */
- }
- else if (strcmp(keyword, "ModelName") == 0)
+ if (strcmp(keyword, "CloseUI") && strcmp(keyword, "CloseGroup") &&
+ strcmp(keyword, "CloseSubGroup") && strncmp(keyword, "Default", 7) &&
+ strcmp(keyword, "JCLCloseUI") && strcmp(keyword, "JCLOpenUI") &&
+ strcmp(keyword, "OpenUI") && strcmp(keyword, "OpenGroup") &&
+ strcmp(keyword, "OpenSubGroup") && string == NULL)
{
- ppd->modelname = string;
- string = NULL; /* Don't free this string below */
- }
- else if (strcmp(keyword, "NickName") == 0)
- {
- ppd->nickname = string;
- string = NULL; /* Don't free this string below */
- }
- else if (strcmp(keyword, "Product") == 0)
- {
- ppd->product = string;
- string = NULL; /* Don't free this string below */
- }
- else if (strcmp(keyword, "ShortNickName") == 0)
- {
- ppd->shortnickname = string;
- string = NULL; /* Don't free this string below */
- }
- else if (strcmp(keyword, "TTRasterizer") == 0)
- {
- ppd->ttrasterizer = string;
- string = NULL; /* Don't free this string below */
+ /*
+ * Need a string value!
+ */
+
+ ppd_status = PPD_MISSING_VALUE;
+
+ goto error;
}
- else if (strcmp(keyword, "JCLBegin") == 0)
+
+ /*
+ * Certain main keywords (as defined by the PPD spec) may be used
+ * without the usual OpenUI/CloseUI stuff. Presumably this is just
+ * so that Adobe wouldn't completely break compatibility with PPD
+ * files prior to v4.0 of the spec, but it is hopelessly
+ * inconsistent... Catch these main keywords and automatically
+ * create the corresponding option, as needed...
+ */
+
+ if (ui_keyword)
{
- ppd_decode(string); /* Decode quoted string */
- ppd->jcl_begin = string;
- string = NULL; /* Don't free this string below */
+ /*
+ * Previous line was a UI keyword...
+ */
+
+ option = NULL;
+ ui_keyword = 0;
}
- else if (strcmp(keyword, "JCLEnd") == 0)
+
+ if (option == NULL &&
+ (mask & (PPD_KEYWORD | PPD_OPTION | PPD_STRING)) ==
+ (PPD_KEYWORD | PPD_OPTION | PPD_STRING))
{
- ppd_decode(string); /* Decode quoted string */
- ppd->jcl_end = string;
- string = NULL; /* Don't free this string below */
- }
+ for (i = 0; i < (int)(sizeof(ui_keywords) / sizeof(ui_keywords[0])); i ++)
+ if (!strcmp(keyword, ui_keywords[i]))
+ break;
+
+ if (i < (int)(sizeof(ui_keywords) / sizeof(ui_keywords[0])))
+ {
+ /*
+ * Create the option in the appropriate group...
+ */
+
+ ui_keyword = 1;
+
+ DEBUG_printf(("**** FOUND ADOBE UI KEYWORD %s WITHOUT OPENUI!\n",
+ keyword));
+
+ if (!group)
+ {
+ if (strcmp(keyword, "Collate") && strcmp(keyword, "Duplex") &&
+ strcmp(keyword, "InputSlot") && strcmp(keyword, "ManualFeed") &&
+ strcmp(keyword, "MediaType") && strcmp(keyword, "MediaColor") &&
+ strcmp(keyword, "MediaWeight") && strcmp(keyword, "OutputBin") &&
+ strcmp(keyword, "OutputMode") && strcmp(keyword, "OutputOrder") &&
+ strcmp(keyword, "PageSize") && strcmp(keyword, "PageRegion"))
+ group = ppd_get_group(ppd, "Extra",
+ cupsLangString(language, CUPS_MSG_EXTRA));
+ else
+ group = ppd_get_group(ppd, "General",
+ cupsLangString(language, CUPS_MSG_GENERAL));
+
+ if (group == NULL)
+ goto error;
+
+ DEBUG_printf(("Adding to group %s...\n", group->text));
+ option = ppd_get_option(group, keyword);
+ group = NULL;
+ }
+ else
+ option = ppd_get_option(group, keyword);
+
+ if (option == NULL)
+ {
+ ppd_status = PPD_ALLOC_ERROR;
+
+ goto error;
+ }
+
+ /*
+ * Now fill in the initial information for the option...
+ */
+
+ if (!strncmp(keyword, "JCL", 3))
+ option->section = PPD_ORDER_JCL;
+ else
+ option->section = PPD_ORDER_ANY;
+
+ option->order = 10.0f;
+
+ if (i < 8)
+ option->ui = PPD_UI_BOOLEAN;
+ else
+ option->ui = PPD_UI_PICKONE;
+
+ for (j = 0; j < ppd->num_attrs; j ++)
+ if (!strncmp(ppd->attrs[j]->name, "Default", 7) &&
+ !strcmp(ppd->attrs[j]->name + 7, keyword) &&
+ ppd->attrs[j]->value)
+ {
+ DEBUG_printf(("Setting Default%s to %s via attribute...\n",
+ option->keyword, ppd->attrs[j]->value));
+ strlcpy(option->defchoice, ppd->attrs[j]->value,
+ sizeof(option->defchoice));
+ break;
+ }
+
+ if (strcmp(keyword, "PageSize") == 0)
+ strlcpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_SIZE),
+ sizeof(option->text));
+ else if (strcmp(keyword, "MediaType") == 0)
+ strlcpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_TYPE),
+ sizeof(option->text));
+ else if (strcmp(keyword, "InputSlot") == 0)
+ strlcpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_SOURCE),
+ sizeof(option->text));
+ else if (strcmp(keyword, "ColorModel") == 0)
+ strlcpy(option->text, cupsLangString(language, CUPS_MSG_OUTPUT_MODE),
+ sizeof(option->text));
+ else if (strcmp(keyword, "Resolution") == 0)
+ strlcpy(option->text, cupsLangString(language, CUPS_MSG_RESOLUTION),
+ sizeof(option->text));
+ else
+ strlcpy(option->text, keyword, sizeof(option->text));
+ }
+ }
+
+ if (strcmp(keyword, "LanguageLevel") == 0)
+ ppd->language_level = atoi(string);
+ else if (strcmp(keyword, "LanguageEncoding") == 0)
+ ppd->lang_encoding = string;
+ else if (strcmp(keyword, "LanguageVersion") == 0)
+ ppd->lang_version = string;
+ else if (strcmp(keyword, "Manufacturer") == 0)
+ ppd->manufacturer = string;
+ else if (strcmp(keyword, "ModelName") == 0)
+ ppd->modelname = string;
+ else if (strcmp(keyword, "Protocols") == 0)
+ ppd->protocols = string;
+ else if (strcmp(keyword, "PCFileName") == 0)
+ ppd->pcfilename = string;
+ else if (strcmp(keyword, "NickName") == 0)
+ ppd->nickname = string;
+ else if (strcmp(keyword, "Product") == 0)
+ ppd->product = string;
+ else if (strcmp(keyword, "ShortNickName") == 0)
+ ppd->shortnickname = string;
+ else if (strcmp(keyword, "TTRasterizer") == 0)
+ ppd->ttrasterizer = string;
+ else if (strcmp(keyword, "JCLBegin") == 0)
+ {
+ ppd->jcl_begin = strdup(string);
+ ppd_decode(ppd->jcl_begin); /* Decode quoted string */
+ }
+ else if (strcmp(keyword, "JCLEnd") == 0)
+ {
+ ppd->jcl_end = strdup(string);
+ ppd_decode(ppd->jcl_end); /* Decode quoted string */
+ }
else if (strcmp(keyword, "JCLToPSInterpreter") == 0)
{
- ppd_decode(string); /* Decode quoted string */
- ppd->jcl_ps = string;
- string = NULL; /* Don't free this string below */
+ ppd->jcl_ps = strdup(string);
+ ppd_decode(ppd->jcl_ps); /* Decode quoted string */
}
else if (strcmp(keyword, "AccurateScreensSupport") == 0)
ppd->accurate_screens = strcmp(string, "True") == 0;
ppd->color_device = strcmp(string, "True") == 0;
else if (strcmp(keyword, "ContoneOnly") == 0)
ppd->contone_only = strcmp(string, "True") == 0;
- else if (strcmp(keyword, "DefaultColorSpace") == 0)
- {
- if (strcmp(string, "CMY") == 0)
- ppd->colorspace = PPD_CS_CMY;
- else if (strcmp(string, "CMYK") == 0)
- ppd->colorspace = PPD_CS_CMYK;
- else if (strcmp(string, "RGB") == 0)
- ppd->colorspace = PPD_CS_RGB;
- else if (strcmp(string, "RGBK") == 0)
- ppd->colorspace = PPD_CS_RGBK;
- else if (strcmp(string, "N") == 0)
- ppd->colorspace = PPD_CS_N;
- else
- ppd->colorspace = PPD_CS_GRAY;
- }
+ else if (strcmp(keyword, "cupsFlipDuplex") == 0)
+ ppd->flip_duplex = strcmp(string, "True") == 0;
else if (strcmp(keyword, "cupsManualCopies") == 0)
ppd->manual_copies = strcmp(string, "True") == 0;
else if (strcmp(keyword, "cupsModelNumber") == 0)
ppd->num_profiles ++;
memset(profile, 0, sizeof(ppd_profile_t));
- strcpy(profile->resolution, name);
- strcpy(profile->media_type, text);
- sscanf(string, "%f%f%f%f%f%f%f%f%f%f", &(profile->density),
+ strlcpy(profile->resolution, name, sizeof(profile->resolution));
+ strlcpy(profile->media_type, text, sizeof(profile->media_type));
+ sscanf(string, "%f%f%f%f%f%f%f%f%f%f%f", &(profile->density),
+ &(profile->gamma),
profile->matrix[0] + 0, profile->matrix[0] + 1,
profile->matrix[0] + 2, profile->matrix[1] + 0,
profile->matrix[1] + 1, profile->matrix[1] + 2,
else
filter = realloc(ppd->filters, sizeof(char *) * (ppd->num_filters + 1));
+ if (filter == NULL)
+ {
+ ppd_free(filter);
+
+ ppd_status = PPD_ALLOC_ERROR;
+
+ goto error;
+ }
+
ppd->filters = filter;
filter += ppd->num_filters;
ppd->num_filters ++;
*filter = string;
string = NULL;
}
- else if (strcmp(keyword, "VariablePaperSize") == 0 &&
- strcmp(string, "True") == 0)
+ else if (strcmp(keyword, "Throughput") == 0)
+ ppd->throughput = atoi(string);
+ else if (strcmp(keyword, "Font") == 0)
{
- ppd->variable_sizes = 1;
-
- /*
- * Add a "Custom" page size entry...
- */
-
- ppd_add_size(ppd, "Custom");
-
/*
- * Add a "Custom" page size option...
+ * Add this font to the list of available fonts...
*/
- if ((group = ppd_get_group(ppd, "General")) == NULL)
- {
- ppdClose(ppd);
- free(string);
- return (NULL);
- }
+ if (ppd->num_fonts == 0)
+ tempfonts = (char **)malloc(sizeof(char *));
+ else
+ tempfonts = (char **)realloc(ppd->fonts,
+ sizeof(char *) * (ppd->num_fonts + 1));
- if ((option = ppd_get_option(group, "PageSize")) == NULL)
+ if (tempfonts == NULL)
{
- ppdClose(ppd);
- free(string);
- return (NULL);
- }
+ ppd_status = PPD_ALLOC_ERROR;
- if ((choice = ppd_add_choice(option, "Custom")) == NULL)
- {
- ppdClose(ppd);
- free(string);
- return (NULL);
+ goto error;
}
-
- strcpy(choice->text, "Custom Size");
- group = NULL;
- option = NULL;
+
+ ppd->fonts = tempfonts;
+ ppd->fonts[ppd->num_fonts] = strdup(name);
+ ppd->num_fonts ++;
}
- else if (strcmp(keyword, "MaxMediaWidth") == 0)
- ppd->custom_max[0] = atof(string);
- else if (strcmp(keyword, "MaxMediaHeight") == 0)
- ppd->custom_max[1] = atof(string);
else if (strcmp(keyword, "ParamCustomPageSize") == 0)
{
if (strcmp(name, "Width") == 0)
ppd->custom_margins + 1, ppd->custom_margins + 2,
ppd->custom_margins + 3);
else if (strcmp(keyword, "CustomPageSize") == 0 &&
- strcmp(name, "True") == 0 &&
- ppd->variable_sizes)
+ strcmp(name, "True") == 0)
{
+ DEBUG_puts("Processing CustomPageSize...");
+
+ if (!ppd->variable_sizes)
+ {
+ ppd->variable_sizes = 1;
+
+ /*
+ * Add a "Custom" page size entry...
+ */
+
+ ppd_add_size(ppd, "Custom");
+
+ /*
+ * Add a "Custom" page size option...
+ */
+
+ if ((option = ppdFindOption(ppd, "PageSize")) == NULL)
+ {
+ ppd_group_t *temp;
+
+
+ DEBUG_puts("PageSize option not found for CustomPageSize...");
+
+ if ((temp = ppd_get_group(ppd, "General",
+ cupsLangString(language,
+ CUPS_MSG_GENERAL))) == NULL)
+ {
+ DEBUG_puts("Unable to get general group!");
+
+ goto error;
+ }
+
+ if ((option = ppd_get_option(temp, "PageSize")) == NULL)
+ {
+ DEBUG_puts("Unable to get PageSize option!");
+
+ ppd_status = PPD_ALLOC_ERROR;
+
+ goto error;
+ }
+ }
+
+ if ((choice = ppd_add_choice(option, "Custom")) == NULL)
+ {
+ DEBUG_puts("Unable to add Custom choice!");
+
+ ppd_status = PPD_ALLOC_ERROR;
+
+ goto error;
+ }
+
+ strlcpy(choice->text, cupsLangString(language, CUPS_MSG_VARIABLE),
+ sizeof(choice->text));
+ option = NULL;
+ }
+
if ((option = ppdFindOption(ppd, "PageSize")) == NULL)
{
- ppdClose(ppd);
- free(string);
- return (NULL);
+ DEBUG_puts("Unable to find PageSize option!");
+
+ ppd_status = PPD_INTERNAL_ERROR;
+
+ goto error;
}
if ((choice = ppdFindChoice(option, "Custom")) == NULL)
{
- ppdClose(ppd);
- free(string);
- return (NULL);
+ DEBUG_puts("Unable to find Custom choice!");
+
+ ppd_status = PPD_INTERNAL_ERROR;
+
+ goto error;
}
choice->code = string;
- string = NULL;
- option = NULL;
+ option = NULL;
+ string = NULL; /* Don't add as an attribute below */
}
else if (strcmp(keyword, "LandscapeOrientation") == 0)
{
if (strcmp(string, "Minus90") == 0)
ppd->landscape = -90;
- else
+ else if (strcmp(string, "Plus90") == 0)
ppd->landscape = 90;
}
else if (strcmp(keyword, "Emulators") == 0)
}
ppd->num_emulations = count;
- ppd->emulations = calloc(sizeof(ppd_emul_t), count);
+ ppd->emulations = calloc(count, sizeof(ppd_emul_t));
for (i = 0, sptr = string; i < count; i ++)
{
- for (nameptr = ppd->emulations[i].name; *sptr != '\0' && *sptr != ' ';)
- *nameptr ++ = *sptr ++;
+ for (nameptr = ppd->emulations[i].name;
+ *sptr != '\0' && *sptr != ' ';
+ sptr ++)
+ if (nameptr < (ppd->emulations[i].name + sizeof(ppd->emulations[i].name) - 1))
+ *nameptr++ = *sptr;
*nameptr = '\0';
else if (strcmp(keyword, "JobPatchFile") == 0)
{
if (ppd->patches == NULL)
- {
- ppd->patches = string;
- string = NULL;
- }
+ ppd->patches = strdup(string);
else
{
- ppd->patches = realloc(ppd->patches, strlen(ppd->patches) +
- strlen(string) + 1);
+ temp = realloc(ppd->patches, strlen(ppd->patches) +
+ strlen(string) + 1);
+ if (temp == NULL)
+ {
+ ppd_status = PPD_ALLOC_ERROR;
+
+ goto error;
+ }
+
+ ppd->patches = temp;
strcpy(ppd->patches + strlen(ppd->patches), string);
}
}
else if (strcmp(keyword, "OpenUI") == 0)
{
+ /*
+ * Don't allow nesting of options...
+ */
+
+ if (option && ppd_conform == PPD_CONFORM_STRICT)
+ {
+ ppd_status = PPD_NESTED_OPEN_UI;
+
+ goto error;
+ }
+
/*
* Add an option record to the current sub-group, group, or file...
*/
if (name[0] == '*')
- strcpy(name, name + 1);
+ cups_strcpy(name, name + 1); /* Eliminate leading asterisk */
- if (string == NULL)
- {
- ppdClose(ppd);
- return (NULL);
- }
+ for (i = strlen(name) - 1; i > 0 && isspace(name[i] & 255); i --)
+ name[i] = '\0'; /* Eliminate trailing spaces */
+
+ DEBUG_printf(("OpenUI of %s in group %s...\n", name,
+ group ? group->text : "(null)"));
if (subgroup != NULL)
option = ppd_get_option(subgroup, name);
- else
+ else if (group == NULL)
{
- if (group == NULL)
- {
- if (strcmp(name, "Collate") != 0 &&
- strcmp(name, "Duplex") != 0 &&
- strcmp(name, "InputSlot") != 0 &&
- strcmp(name, "ManualFeed") != 0 &&
- strcmp(name, "MediaType") != 0 &&
- strcmp(name, "MediaColor") != 0 &&
- strcmp(name, "MediaWeight") != 0 &&
- strcmp(name, "OutputBin") != 0 &&
- strcmp(name, "OutputMode") != 0 &&
- strcmp(name, "OutputOrder") != 0 &&
- strcmp(name, "PageSize") != 0 &&
- strcmp(name, "PageRegion") != 0)
- group = ppd_get_group(ppd, "Printer");
- else
- group = ppd_get_group(ppd, "General");
+ if (strcmp(name, "Collate") && strcmp(name, "Duplex") &&
+ strcmp(name, "InputSlot") && strcmp(name, "ManualFeed") &&
+ strcmp(name, "MediaType") && strcmp(name, "MediaColor") &&
+ strcmp(name, "MediaWeight") && strcmp(name, "OutputBin") &&
+ strcmp(name, "OutputMode") && strcmp(name, "OutputOrder") &&
+ strcmp(name, "PageSize") && strcmp(name, "PageRegion"))
+ group = ppd_get_group(ppd, "Extra",
+ cupsLangString(language, CUPS_MSG_EXTRA));
+ else
+ group = ppd_get_group(ppd, "General",
+ cupsLangString(language, CUPS_MSG_GENERAL));
- if (group == NULL)
- {
- ppdClose(ppd);
- free(string);
- return (NULL);
- }
+ if (group == NULL)
+ goto error;
- option = ppd_get_option(group, name);
- group = NULL;
- }
- else
- option = ppd_get_option(group, name);
+ DEBUG_printf(("Adding to group %s...\n", group->text));
+ option = ppd_get_option(group, name);
group = NULL;
}
+ else
+ option = ppd_get_option(group, name);
if (option == NULL)
{
- ppdClose(ppd);
- free(string);
- return (NULL);
+ ppd_status = PPD_ALLOC_ERROR;
+
+ goto error;
}
/*
* Now fill in the initial information for the option...
*/
- if (strcmp(string, "PickMany") == 0)
+ if (string && strcmp(string, "PickMany") == 0)
option->ui = PPD_UI_PICKMANY;
- else if (strcmp(string, "Boolean") == 0)
+ else if (string && strcmp(string, "Boolean") == 0)
option->ui = PPD_UI_BOOLEAN;
+ else if (string && strcmp(string, "PickOne") == 0)
+ option->ui = PPD_UI_PICKONE;
+ else if (ppd_conform == PPD_CONFORM_STRICT)
+ {
+ ppd_status = PPD_BAD_OPEN_UI;
+
+ goto error;
+ }
else
option->ui = PPD_UI_PICKONE;
- strcpy(option->text, text);
+ for (j = 0; j < ppd->num_attrs; j ++)
+ if (!strncmp(ppd->attrs[j]->name, "Default", 7) &&
+ !strcmp(ppd->attrs[j]->name + 7, name) &&
+ ppd->attrs[j]->value)
+ {
+ DEBUG_printf(("Setting Default%s to %s via attribute...\n",
+ option->keyword, ppd->attrs[j]->value));
+ strlcpy(option->defchoice, ppd->attrs[j]->value,
+ sizeof(option->defchoice));
+ break;
+ }
+
+ if (text[0])
+ {
+ strlcpy(option->text, text, sizeof(option->text));
+ ppd_fix(option->text);
+ }
+ else
+ {
+ if (strcmp(name, "PageSize") == 0)
+ strlcpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_SIZE),
+ sizeof(option->text));
+ else if (strcmp(name, "MediaType") == 0)
+ strlcpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_TYPE),
+ sizeof(option->text));
+ else if (strcmp(name, "InputSlot") == 0)
+ strlcpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_SOURCE),
+ sizeof(option->text));
+ else if (strcmp(name, "ColorModel") == 0)
+ strlcpy(option->text, cupsLangString(language, CUPS_MSG_OUTPUT_MODE),
+ sizeof(option->text));
+ else if (strcmp(name, "Resolution") == 0)
+ strlcpy(option->text, cupsLangString(language, CUPS_MSG_RESOLUTION),
+ sizeof(option->text));
+ else
+ strlcpy(option->text, name, sizeof(option->text));
+ }
option->section = PPD_ORDER_ANY;
+
+ ppd_free(string);
+ string = NULL;
}
else if (strcmp(keyword, "JCLOpenUI") == 0)
{
/*
- * Find the JCL group, and add if needed...
+ * Don't allow nesting of options...
*/
- if (group != NULL)
+ if (option && ppd_conform == PPD_CONFORM_STRICT)
{
- ppdClose(ppd);
- free(string);
- return (NULL);
+ ppd_status = PPD_NESTED_OPEN_UI;
+
+ goto error;
}
- group = ppd_get_group(ppd, "JCL");
+ /*
+ * Find the JCL group, and add if needed...
+ */
+
+ group = ppd_get_group(ppd, "JCL", "JCL");
if (group == NULL)
- {
- ppdClose(ppd);
- free(string);
- return (NULL);
- }
+ goto error;
/*
* Add an option record to the current JCLs...
*/
if (name[0] == '*')
- strcpy(name, name + 1);
+ cups_strcpy(name, name + 1);
option = ppd_get_option(group, name);
if (option == NULL)
{
- ppdClose(ppd);
- free(string);
- return (NULL);
+ ppd_status = PPD_ALLOC_ERROR;
+
+ goto error;
}
/*
* Now fill in the initial information for the option...
*/
- if (strcmp(string, "PickMany") == 0)
+ if (string && strcmp(string, "PickMany") == 0)
option->ui = PPD_UI_PICKMANY;
- else if (strcmp(string, "Boolean") == 0)
+ else if (string && strcmp(string, "Boolean") == 0)
option->ui = PPD_UI_BOOLEAN;
- else
+ else if (string && strcmp(string, "PickOne") == 0)
option->ui = PPD_UI_PICKONE;
+ else
+ {
+ ppd_status = PPD_BAD_OPEN_UI;
+
+ goto error;
+ }
- strcpy(option->text, text);
+ for (j = 0; j < ppd->num_attrs; j ++)
+ if (!strncmp(ppd->attrs[j]->name, "Default", 7) &&
+ !strcmp(ppd->attrs[j]->name + 7, name) &&
+ ppd->attrs[j]->value)
+ {
+ DEBUG_printf(("Setting Default%s to %s via attribute...\n",
+ option->keyword, ppd->attrs[j]->value));
+ strlcpy(option->defchoice, ppd->attrs[j]->value,
+ sizeof(option->defchoice));
+ break;
+ }
+
+ strlcpy(option->text, text, sizeof(option->text));
option->section = PPD_ORDER_JCL;
group = NULL;
+
+ ppd_free(string);
+ string = NULL;
}
else if (strcmp(keyword, "CloseUI") == 0 ||
strcmp(keyword, "JCLCloseUI") == 0)
+ {
option = NULL;
+
+ ppd_free(string);
+ string = NULL;
+ }
else if (strcmp(keyword, "OpenGroup") == 0)
{
/*
if (group != NULL)
{
- ppdClose(ppd);
- free(string);
- return (NULL);
+ ppd_status = PPD_NESTED_OPEN_GROUP;
+
+ goto error;
}
- if (strchr(string, '/') != NULL) /* Just show human readable text */
- strcpy(string, strchr(string, '/') + 1);
+ if (!string)
+ {
+ ppd_status = PPD_BAD_OPEN_GROUP;
+
+ goto error;
+ }
- group = ppd_get_group(ppd, string);
- }
- else if (strcmp(keyword, "CloseGroup") == 0)
- group = NULL;
- else if (strcmp(keyword, "OpenSubGroup") == 0)
- {
/*
- * Open a new sub-group...
+ * Separate the group name from the text (name/text)...
*/
- if (group == NULL || subgroup != NULL)
- {
- ppdClose(ppd);
- free(string);
- return (NULL);
- }
-
- if (group->num_subgroups == 0)
- subgroup = malloc(sizeof(ppd_group_t));
+ if ((sptr = strchr(string, '/')) != NULL)
+ *sptr++ = '\0';
else
- subgroup = realloc(group->subgroups,
- (group->num_subgroups + 1) * sizeof(ppd_group_t));
+ sptr = string;
- if (subgroup == NULL)
- {
- ppdClose(ppd);
- free(string);
- return (NULL);
- }
+ /*
+ * Fix up the text...
+ */
- group->subgroups = subgroup;
- subgroup += group->num_subgroups;
- group->num_subgroups ++;
+ ppd_decode(sptr);
+ ppd_fix(sptr);
+
+ /*
+ * Find/add the group...
+ */
+
+ group = ppd_get_group(ppd, string, sptr);
+
+ if (group == NULL)
+ goto error;
+
+ ppd_free(string);
+ string = NULL;
+ }
+ else if (strcmp(keyword, "CloseGroup") == 0)
+ {
+ group = NULL;
- memset(subgroup, 0, sizeof(ppd_group_t));
- strcpy(subgroup->text, string);
+ ppd_free(string);
+ string = NULL;
}
- else if (strcmp(keyword, "CloseSubGroup") == 0)
- subgroup = NULL;
else if (strcmp(keyword, "OrderDependency") == 0 ||
strcmp(keyword, "NonUIOrderDependency") == 0)
{
- if (sscanf(string, "%f%s%s", &order, name, keyword) != 3)
+ if (sscanf(string, "%f%40s%40s", &order, name, keyword) != 3)
{
- ppdClose(ppd);
- free(string);
- return (NULL);
+ ppd_status = PPD_BAD_ORDER_DEPENDENCY;
+
+ goto error;
}
if (keyword[0] == '*')
- strcpy(keyword, keyword + 1);
+ cups_strcpy(keyword, keyword + 1);
if (strcmp(name, "ExitServer") == 0)
section = PPD_ORDER_EXIT;
if (option == NULL)
{
+ ppd_group_t *temp;
+
+
/*
* Only valid for Non-UI options...
*/
- for (i = ppd->num_groups, group = ppd->groups; i > 0; i --, group ++)
- if (group->text[0] == '\0')
+ for (i = ppd->num_groups, temp = ppd->groups; i > 0; i --, temp ++)
+ if (temp->text[0] == '\0')
break;
if (i > 0)
- for (i = 0; i < group->num_options; i ++)
- if (strcmp(keyword, group->options[i].keyword) == 0)
+ for (i = 0; i < temp->num_options; i ++)
+ if (strcmp(keyword, temp->options[i].keyword) == 0)
{
- group->options[i].section = section;
- group->options[i].order = order;
+ temp->options[i].section = section;
+ temp->options[i].order = order;
break;
}
-
- group = NULL;
}
else
{
option->section = section;
option->order = order;
}
+
+ ppd_free(string);
+ string = NULL;
}
else if (strncmp(keyword, "Default", 7) == 0)
{
+ if (string == NULL)
+ continue;
+
+ /*
+ * Drop UI text, if any, from value...
+ */
+
if (strchr(string, '/') != NULL)
*strchr(string, '/') = '\0';
- if (option == NULL)
+ /*
+ * Assign the default value as appropriate...
+ */
+
+ if (strcmp(keyword, "DefaultColorSpace") == 0)
{
/*
- * Only valid for Non-UI options...
+ * Set default colorspace...
*/
- for (i = ppd->num_groups, group = ppd->groups; i > 0; i --, group ++)
- if (group->text[0] == '\0')
- break;
+ if (strcmp(string, "CMY") == 0)
+ ppd->colorspace = PPD_CS_CMY;
+ else if (strcmp(string, "CMYK") == 0)
+ ppd->colorspace = PPD_CS_CMYK;
+ else if (strcmp(string, "RGB") == 0)
+ ppd->colorspace = PPD_CS_RGB;
+ else if (strcmp(string, "RGBK") == 0)
+ ppd->colorspace = PPD_CS_RGBK;
+ else if (strcmp(string, "N") == 0)
+ ppd->colorspace = PPD_CS_N;
+ else
+ ppd->colorspace = PPD_CS_GRAY;
+ }
+ else if (option && strcmp(keyword + 7, option->keyword) == 0)
+ {
+ /*
+ * Set the default as part of the current option...
+ */
- if (i > 0)
- for (i = 0; i < group->num_options; i ++)
- if (strcmp(keyword, group->options[i].keyword) == 0)
- {
- strcpy(group->options[i].defchoice, string);
- break;
- }
+ DEBUG_printf(("Setting %s to %s...\n", keyword, string));
+
+ strlcpy(option->defchoice, string, sizeof(option->defchoice));
- group = NULL;
+ DEBUG_printf(("%s is now %s...\n", keyword, option->defchoice));
}
else
- strcpy(option->defchoice, string);
+ {
+ /*
+ * Lookup option and set if it has been defined...
+ */
+
+ ppd_option_t *toption; /* Temporary option */
+
+
+ if ((toption = ppdFindOption(ppd, keyword + 7)) != NULL)
+ {
+ DEBUG_printf(("Setting %s to %s...\n", keyword, string));
+ strlcpy(toption->defchoice, string, sizeof(toption->defchoice));
+ }
+ }
}
else if (strcmp(keyword, "UIConstraints") == 0 ||
strcmp(keyword, "NonUIConstraints") == 0)
{
if (ppd->num_consts == 0)
- constraint = calloc(sizeof(ppd_const_t), 1);
+ constraint = calloc(1, sizeof(ppd_const_t));
else
constraint = realloc(ppd->consts,
(ppd->num_consts + 1) * sizeof(ppd_const_t));
if (constraint == NULL)
{
- ppdClose(ppd);
- free(string);
- return (NULL);
+ ppd_status = PPD_ALLOC_ERROR;
+
+ goto error;
}
ppd->consts = constraint;
constraint += ppd->num_consts;
ppd->num_consts ++;
- switch (sscanf(string, "%s%s%s%s", constraint->option1,
+ switch (sscanf(string, "%40s%40s%40s%40s", constraint->option1,
constraint->choice1, constraint->option2,
constraint->choice2))
{
case 0 : /* Error */
case 1 : /* Error */
- ppdClose(ppd);
- free(string);
- break;
+ ppd_status = PPD_BAD_UI_CONSTRAINTS;
+ goto error;
case 2 : /* Two options... */
+ /*
+ * The following strcpy's are safe, as optionN and
+ * choiceN are all the same size (size defined by PPD spec...)
+ */
+
if (constraint->option1[0] == '*')
- strcpy(constraint->option1, constraint->option1 + 1);
+ cups_strcpy(constraint->option1, constraint->option1 + 1);
if (constraint->choice1[0] == '*')
- strcpy(constraint->option2, constraint->choice1 + 1);
+ cups_strcpy(constraint->option2, constraint->choice1 + 1);
else
- strcpy(constraint->option2, constraint->choice1);
+ cups_strcpy(constraint->option2, constraint->choice1);
constraint->choice1[0] = '\0';
constraint->choice2[0] = '\0';
break;
case 3 : /* Two options, one choice... */
+ /*
+ * The following cups_strcpy's are safe, as optionN and
+ * choiceN are all the same size (size defined by PPD spec...)
+ */
+
if (constraint->option1[0] == '*')
- strcpy(constraint->option1, constraint->option1 + 1);
+ cups_strcpy(constraint->option1, constraint->option1 + 1);
if (constraint->choice1[0] == '*')
{
- strcpy(constraint->option2, constraint->choice1 + 1);
+ cups_strcpy(constraint->choice2, constraint->option2);
+ cups_strcpy(constraint->option2, constraint->choice1 + 1);
constraint->choice1[0] = '\0';
}
- else if (constraint->option2[0] == '*')
- strcpy(constraint->option2, constraint->option2 + 1);
+ else
+ {
+ if (constraint->option2[0] == '*')
+ cups_strcpy(constraint->option2, constraint->option2 + 1);
- constraint->choice2[0] = '\0';
+ constraint->choice2[0] = '\0';
+ }
break;
case 4 : /* Two options, two choices... */
if (constraint->option1[0] == '*')
- strcpy(constraint->option1, constraint->option1 + 1);
+ cups_strcpy(constraint->option1, constraint->option1 + 1);
if (constraint->option2[0] == '*')
- strcpy(constraint->option2, constraint->option2 + 1);
+ cups_strcpy(constraint->option2, constraint->option2 + 1);
break;
}
+
+ ppd_free(string);
+ string = NULL;
}
else if (strcmp(keyword, "PaperDimension") == 0)
{
- if ((size = ppdPageSize(ppd, name)) != NULL)
- sscanf(string, "%f%f", &(size->width), &(size->length));
+ if ((size = ppdPageSize(ppd, name)) == NULL)
+ size = ppd_add_size(ppd, name);
+
+ if (size == NULL)
+ {
+ /*
+ * Unable to add or find size!
+ */
+
+ ppd_status = PPD_ALLOC_ERROR;
+
+ goto error;
+ }
+
+ sscanf(string, "%f%f", &(size->width), &(size->length));
+
+ ppd_free(string);
+ string = NULL;
}
else if (strcmp(keyword, "ImageableArea") == 0)
{
- if ((size = ppdPageSize(ppd, name)) != NULL)
- sscanf(string, "%f%f%f%f", &(size->left), &(size->bottom),
- &(size->right), &(size->top));
+ if ((size = ppdPageSize(ppd, name)) == NULL)
+ size = ppd_add_size(ppd, name);
+
+ if (size == NULL)
+ {
+ /*
+ * Unable to add or find size!
+ */
+
+ ppd_status = PPD_ALLOC_ERROR;
+
+ goto error;
+ }
+
+ sscanf(string, "%f%f%f%f", &(size->left), &(size->bottom),
+ &(size->right), &(size->top));
+
+ ppd_free(string);
+ string = NULL;
}
else if (option != NULL &&
(mask & (PPD_KEYWORD | PPD_OPTION | PPD_STRING)) ==
- (PPD_KEYWORD | PPD_OPTION | PPD_STRING))
+ (PPD_KEYWORD | PPD_OPTION | PPD_STRING) &&
+ strcmp(keyword, option->keyword) == 0)
{
+ DEBUG_printf(("group = %p, subgroup = %p\n", group, subgroup));
+
if (strcmp(keyword, "PageSize") == 0)
{
/*
* Add a page size...
*/
- ppd_add_size(ppd, name);
+ if (ppdPageSize(ppd, name) == NULL)
+ ppd_add_size(ppd, name);
}
/*
choice = ppd_add_choice(option, name);
if (mask & PPD_TEXT)
- strcpy(choice->text, text);
+ {
+ strlcpy(choice->text, text, sizeof(choice->text));
+ ppd_fix(choice->text);
+ }
else if (strcmp(name, "True") == 0)
strcpy(choice->text, "Yes");
else if (strcmp(name, "False") == 0)
strcpy(choice->text, "No");
else
- strcpy(choice->text, name);
+ strlcpy(choice->text, name, sizeof(choice->text));
- if (strncmp(keyword, "JCL", 3) == 0)
+ if (option->section == PPD_ORDER_JCL)
ppd_decode(string); /* Decode quoted string */
choice->code = string;
- string = NULL; /* Don't free this string below */
+ string = NULL; /* Don't add as an attribute below */
}
+#if 0
+ else if (strcmp(keyword, "cupsUIType") == 0 &&
+ (mask & (PPD_KEYWORD | PPD_STRING)) == (PPD_KEYWORD | PPD_STRING) &&
+ option != NULL)
+ {
+ /*
+ * Define an extended option value type...
+ */
- if (string != NULL)
- free(string);
+ extopt = ppd_get_extoption(ppd, name);
+
+ if (strcmp(string, "Text") == 0)
+ option->ui = PPD_UI_CUPS_TEXT;
+ else if (strcmp(string, "Integer") == 0)
+ {
+ option->ui = PPD_UI_CUPS_INTEGER;
+ extopt->defval.integer = 0;
+ extopt->minval.integer = 0;
+ extopt->maxval.integer = 100;
+ }
+ else if (strcmp(string, "Real") == 0)
+ {
+ option->ui = PPD_UI_CUPS_REAL;
+ extopt->defval.real = 0.0;
+ extopt->minval.real = 0.0;
+ extopt->maxval.real = 1.0;
+ }
+ else if (strcmp(string, "Gamma") == 0)
+ {
+ option->ui = PPD_UI_CUPS_GAMMA;
+ extopt->defval.gamma = 1.0;
+ extopt->minval.gamma = 1.0;
+ extopt->maxval.gamma = 10.0;
+ }
+ else if (strcmp(string, "Curve") == 0)
+ {
+ option->ui = PPD_UI_CUPS_CURVE;
+ extopt->defval.curve.start = 0.0;
+ extopt->defval.curve.end = 0.0;
+ extopt->defval.curve.gamma = 1.0;
+ extopt->minval.curve.start = 0.0;
+ extopt->minval.curve.end = 0.0;
+ extopt->minval.curve.gamma = 1.0;
+ extopt->maxval.curve.start = 1.0;
+ extopt->maxval.curve.end = 1.0;
+ extopt->maxval.curve.gamma = 10.0;
+ }
+ else if (strcmp(string, "IntegerArray") == 0)
+ {
+ option->ui = PPD_UI_CUPS_INTEGER_ARRAY;
+ extopt->defval.integer_array.num_elements = 2;
+ extopt->minval.integer_array.num_elements = 2;
+ extopt->maxval.integer_array.num_elements = 16;
+ }
+ else if (strcmp(string, "RealArray") == 0)
+ {
+ option->ui = PPD_UI_CUPS_REAL_ARRAY;
+ extopt->defval.real_array.num_elements = 2;
+ extopt->minval.real_array.num_elements = 2;
+ extopt->maxval.real_array.num_elements = 16;
+ }
+ }
+ else if (strcmp(keyword, "cupsUIDefault") == 0 &&
+ (mask & (PPD_KEYWORD | PPD_STRING)) == (PPD_KEYWORD | PPD_STRING) &&
+ option != NULL)
+ {
+ /*
+ * Define an extended option minimum value...
+ */
+
+ extopt = ppd_get_extoption(ppd, name);
+
+ switch (option->ui)
+ {
+ case PPD_UI_CUPS_INTEGER :
+ sscanf(string, "%d", &(extopt->defval.integer));
+ break;
+
+ case PPD_UI_CUPS_REAL :
+ sscanf(string, "%f", &(extopt->defval.real));
+ break;
+
+ case PPD_UI_CUPS_GAMMA :
+ sscanf(string, "%f", &(extopt->defval.gamma));
+ break;
+
+ case PPD_UI_CUPS_CURVE :
+ sscanf(string, "%f%f%f", &(extopt->defval.curve.start),
+ &(extopt->defval.curve.end),
+ &(extopt->defval.curve.gamma));
+ break;
+
+ case PPD_UI_CUPS_INTEGER_ARRAY :
+ extopt->defval.integer_array.elements = calloc(1, sizeof(int));
+ sscanf(string, "%d%d", &(extopt->defval.integer_array.num_elements),
+ extopt->defval.integer_array.elements);
+ break;
+
+ case PPD_UI_CUPS_REAL_ARRAY :
+ extopt->defval.real_array.elements = calloc(1, sizeof(float));
+ sscanf(string, "%d%f", &(extopt->defval.real_array.num_elements),
+ extopt->defval.real_array.elements);
+ break;
+
+ default :
+ break;
+ }
+ }
+ else if (strcmp(keyword, "cupsUIMinimum") == 0 &&
+ (mask & (PPD_KEYWORD | PPD_STRING)) == (PPD_KEYWORD | PPD_STRING) &&
+ option != NULL)
+ {
+ /*
+ * Define an extended option minimum value...
+ */
+
+ extopt = ppd_get_extoption(ppd, name);
+
+ switch (option->ui)
+ {
+ case PPD_UI_CUPS_INTEGER :
+ sscanf(string, "%d", &(extopt->minval.integer));
+ break;
+
+ case PPD_UI_CUPS_REAL :
+ sscanf(string, "%f", &(extopt->minval.real));
+ break;
+
+ case PPD_UI_CUPS_GAMMA :
+ sscanf(string, "%f", &(extopt->minval.gamma));
+ break;
+
+ case PPD_UI_CUPS_CURVE :
+ sscanf(string, "%f%f%f", &(extopt->minval.curve.start),
+ &(extopt->minval.curve.end),
+ &(extopt->minval.curve.gamma));
+ break;
+
+ case PPD_UI_CUPS_INTEGER_ARRAY :
+ extopt->minval.integer_array.elements = calloc(1, sizeof(int));
+ sscanf(string, "%d%d", &(extopt->minval.integer_array.num_elements),
+ extopt->minval.integer_array.elements);
+ break;
+
+ case PPD_UI_CUPS_REAL_ARRAY :
+ extopt->minval.real_array.elements = calloc(1, sizeof(float));
+ sscanf(string, "%d%f", &(extopt->minval.real_array.num_elements),
+ extopt->minval.real_array.elements);
+ break;
+
+ default :
+ break;
+ }
+ }
+ else if (strcmp(keyword, "cupsUIMaximum") == 0 &&
+ (mask & (PPD_KEYWORD | PPD_STRING)) == (PPD_KEYWORD | PPD_STRING) &&
+ option != NULL)
+ {
+ /*
+ * Define an extended option maximum value...
+ */
+
+ extopt = ppd_get_extoption(ppd, name);
+
+ switch (option->ui)
+ {
+ case PPD_UI_CUPS_INTEGER :
+ sscanf(string, "%d", &(extopt->maxval.integer));
+ break;
+
+ case PPD_UI_CUPS_REAL :
+ sscanf(string, "%f", &(extopt->maxval.real));
+ break;
+
+ case PPD_UI_CUPS_GAMMA :
+ sscanf(string, "%f", &(extopt->maxval.gamma));
+ break;
+
+ case PPD_UI_CUPS_CURVE :
+ sscanf(string, "%f%f%f", &(extopt->maxval.curve.start),
+ &(extopt->maxval.curve.end),
+ &(extopt->maxval.curve.gamma));
+ break;
+
+ case PPD_UI_CUPS_INTEGER_ARRAY :
+ extopt->maxval.integer_array.elements = calloc(1, sizeof(int));
+ sscanf(string, "%d%d", &(extopt->maxval.integer_array.num_elements),
+ extopt->maxval.integer_array.elements);
+ break;
+
+ case PPD_UI_CUPS_REAL_ARRAY :
+ extopt->maxval.real_array.elements = calloc(1, sizeof(float));
+ sscanf(string, "%d%f", &(extopt->maxval.real_array.num_elements),
+ extopt->maxval.real_array.elements);
+ break;
+
+ default :
+ break;
+ }
+ }
+ else if (strcmp(keyword, "cupsUICommand") == 0 &&
+ (mask & (PPD_KEYWORD | PPD_STRING)) == (PPD_KEYWORD | PPD_STRING) &&
+ option != NULL)
+ {
+ /*
+ * Define an extended option command...
+ */
+
+ extopt = ppd_get_extoption(ppd, name);
+
+ extopt->command = string;
+ string = NULL;
+ }
+#endif /* 0 */
+
+ /*
+ * Add remaining lines with keywords and string values as attributes...
+ */
+
+ if (string &&
+ (mask & (PPD_KEYWORD | PPD_STRING)) == (PPD_KEYWORD | PPD_STRING))
+ ppd_add_attr(ppd, keyword, name, text, string);
+ else
+ {
+ ppd_free(string);
+ }
}
+ /*
+ * Reset language preferences...
+ */
+
+ cupsLangFree(language);
+
+#ifdef LC_NUMERIC
+ _cupsRestoreLocale(LC_NUMERIC, oldlocale);
+#else
+ _cupsRestoreLocale(LC_ALL, oldlocale);
+#endif /* LC_NUMERIC */
+
#ifdef DEBUG
if (!feof(fp))
- printf("Premature EOF at %d...\n", ftell(fp));
+ printf("Premature EOF at %lu...\n", (unsigned long)ftell(fp));
#endif /* DEBUG */
+ if (ppd_status != PPD_OK)
+ {
+ /*
+ * Had an error reading the PPD file, cannot continue!
+ */
+
+ ppdClose(ppd);
+
+ return (NULL);
+ }
+
+#ifndef __APPLE__
+ /*
+ * Make sure that all PPD files with an InputSlot option have an
+ * "auto" choice that maps to no specific tray or media type.
+ */
+
+ if ((option = ppdFindOption(ppd, "InputSlot")) != NULL)
+ {
+ for (i = 0; i < option->num_choices; i ++)
+ if (option->choices[i].code == NULL || !option->choices[i].code[0] ||
+ !strncasecmp(option->choices[i].choice, "Auto", 4))
+ break;
+
+ if (i >= option->num_choices)
+ {
+ /*
+ * No "auto" input slot, add one...
+ */
+
+ choice = ppd_add_choice(option, "Auto");
+
+ strlcpy(choice->text, cupsLangString(language, CUPS_MSG_AUTO),
+ sizeof(choice->text));
+ choice->code = NULL;
+ }
+ }
+#endif /* !__APPLE__ */
+
/*
* Set the option back-pointer for each choice...
*/
+#ifndef __APPLE__
+ qsort(ppd->groups, ppd->num_groups, sizeof(ppd_group_t),
+ (int (*)(const void *, const void *))ppd_compare_groups);
+#endif /* !__APPLE__ */
+
for (i = ppd->num_groups, group = ppd->groups;
i > 0;
i --, group ++)
{
+#ifndef __APPLE__
+ qsort(group->options, group->num_options, sizeof(ppd_option_t),
+ (int (*)(const void *, const void *))ppd_compare_options);
+#endif /* !__APPLE__ */
+
for (j = group->num_options, option = group->options;
j > 0;
j --, option ++)
+ {
for (k = 0; k < option->num_choices; k ++)
option->choices[k].option = (void *)option;
+ }
+
+#ifndef __APPLE__
+ qsort(group->subgroups, group->num_subgroups, sizeof(ppd_group_t),
+ (int (*)(const void *, const void *))ppd_compare_groups);
+#endif /* !__APPLE__ */
for (j = group->num_subgroups, subgroup = group->subgroups;
j > 0;
j --, subgroup ++)
+ {
+#ifndef __APPLE__
+ qsort(subgroup->options, subgroup->num_options, sizeof(ppd_option_t),
+ (int (*)(const void *, const void *))ppd_compare_options);
+#endif /* !__APPLE__ */
+
for (k = group->num_options, option = group->options;
k > 0;
k --, option ++)
+ {
for (m = 0; m < option->num_choices; m ++)
option->choices[m].option = (void *)option;
+ }
+ }
}
+ /*
+ * Set the option pointers for all extended options...
+ */
+
+ for (i = 0; i < ppd->num_extended; i ++)
+ ppd->extended[i]->option = ppdFindOption(ppd, ppd->extended[i]->keyword);
+
+ /*
+ * Sort the attributes...
+ */
+
+ if (ppd->num_attrs > 1)
+ qsort(ppd->attrs, ppd->num_attrs, sizeof(ppd_attr_t *),
+ (int (*)(const void *, const void *))_ppd_attr_compare);
+
+ /*
+ * Return the PPD file structure...
+ */
+
return (ppd);
+
+ /*
+ * Common exit point for errors to save code size...
+ */
+
+ error:
+
+ ppd_free(string);
+
+ ppdClose(ppd);
+
+ cupsLangFree(language);
+
+#ifdef LC_NUMERIC
+ _cupsRestoreLocale(LC_NUMERIC, oldlocale);
+#else
+ _cupsRestoreLocale(LC_ALL, oldlocale);
+#endif /* LC_NUMERIC */
+
+ return (NULL);
}
* 'ppdOpenFd()' - Read a PPD file into memory.
*/
-ppd_file_t * /* O - PPD file record */
-ppdOpenFd(int fd) /* I - File to read from */
+ppd_file_t * /* O - PPD file record */
+ppdOpenFd(int fd) /* I - File to read from */
{
- FILE *fp; /* File pointer */
- ppd_file_t *ppd; /* PPD file record */
+ FILE *fp; /* File pointer */
+ ppd_file_t *ppd; /* PPD file record */
+ /*
+ * Set the line number to 0...
+ */
+
+ ppd_line = 0;
+
/*
* Range check input...
*/
if (fd < 0)
+ {
+ ppd_status = PPD_NULL_FILE;
+
+ return (NULL);
+ }
+
+ /*
+ * Try to open the file and parse it...
+ */
+
+ if ((fp = fdopen(fd, "r")) != NULL)
+ {
+ setbuf(fp, NULL);
+
+ ppd = ppdOpen(fp);
+
+ fclose(fp);
+ }
+ else
+ {
+ ppd_status = PPD_FILE_OPEN_ERROR;
+ ppd = NULL;
+ }
+
+ return (ppd);
+}
+
+
+/*
+ * 'ppdOpenFile()' - Read a PPD file into memory.
+ */
+
+ppd_file_t * /* O - PPD file record */
+ppdOpenFile(const char *filename) /* I - File to read from */
+{
+ FILE *fp; /* File pointer */
+ ppd_file_t *ppd; /* PPD file record */
+
+
+ /*
+ * Set the line number to 0...
+ */
+
+ ppd_line = 0;
+
+ /*
+ * Range check input...
+ */
+
+ if (filename == NULL)
+ {
+ ppd_status = PPD_NULL_FILE;
+
return (NULL);
+ }
+
+ /*
+ * Try to open the file and parse it...
+ */
+
+ if ((fp = fopen(filename, "r")) != NULL)
+ {
+ ppd = ppdOpen(fp);
+
+ fclose(fp);
+ }
+ else
+ {
+ ppd_status = PPD_FILE_OPEN_ERROR;
+ ppd = NULL;
+ }
+
+ return (ppd);
+}
+
+
+/*
+ * 'ppdSetConformance()' - Set the conformance level for PPD files.
+ */
+
+void
+ppdSetConformance(ppd_conform_t c) /* I - Conformance level */
+{
+ ppd_conform = c;
+}
+
+
+/*
+ * 'ppd_add_attr()' - Add an attribute to the PPD data.
+ */
+
+static ppd_attr_t * /* O - New attribute */
+ppd_add_attr(ppd_file_t *ppd, /* I - PPD file data */
+ const char *name, /* I - Attribute name */
+ const char *spec, /* I - Specifier string, if any */
+ const char *text, /* I - Text string, if any */
+ const char *value) /* I - Value of attribute */
+{
+ ppd_attr_t **ptr, /* New array */
+ *temp; /* New attribute */
+
+
+ /*
+ * Range check input...
+ */
+
+ if (ppd == NULL || name == NULL || spec == NULL)
+ return (NULL);
+
+ /*
+ * Allocate memory for the new attribute...
+ */
+
+ if (ppd->num_attrs == 0)
+ ptr = malloc(sizeof(ppd_attr_t *));
+ else
+ ptr = realloc(ppd->attrs, (ppd->num_attrs + 1) * sizeof(ppd_attr_t *));
+
+ if (ptr == NULL)
+ return (NULL);
+
+ ppd->attrs = ptr;
+ ptr += ppd->num_attrs;
+
+ if ((temp = calloc(1, sizeof(ppd_attr_t))) == NULL)
+ return (NULL);
+
+ *ptr = temp;
+
+ ppd->num_attrs ++;
+
+ /*
+ * Copy data over...
+ */
+
+ strlcpy(temp->name, name, sizeof(temp->name));
+ strlcpy(temp->spec, spec, sizeof(temp->spec));
+ strlcpy(temp->text, text, sizeof(temp->text));
+ temp->value = (char *)value;
+
+ /*
+ * Return the attribute...
+ */
+
+ return (temp);
+}
+
+
+/*
+ * 'ppd_add_choice()' - Add a choice to an option.
+ */
+
+static ppd_choice_t * /* O - Named choice */
+ppd_add_choice(ppd_option_t *option, /* I - Option */
+ const char *name) /* I - Name of choice */
+{
+ ppd_choice_t *choice; /* Choice */
+
+
+ if (option->num_choices == 0)
+ choice = malloc(sizeof(ppd_choice_t));
+ else
+ choice = realloc(option->choices,
+ sizeof(ppd_choice_t) * (option->num_choices + 1));
+
+ if (choice == NULL)
+ return (NULL);
+
+ option->choices = choice;
+ choice += option->num_choices;
+ option->num_choices ++;
+
+ memset(choice, 0, sizeof(ppd_choice_t));
+ strlcpy(choice->choice, name, sizeof(choice->choice));
+
+ return (choice);
+}
+
+
+/*
+ * 'ppd_add_size()' - Add a page size.
+ */
+
+static ppd_size_t * /* O - Named size */
+ppd_add_size(ppd_file_t *ppd, /* I - PPD file */
+ const char *name) /* I - Name of size */
+{
+ ppd_size_t *size; /* Size */
+
+
+ if (ppd->num_sizes == 0)
+ size = malloc(sizeof(ppd_size_t));
+ else
+ size = realloc(ppd->sizes, sizeof(ppd_size_t) * (ppd->num_sizes + 1));
+
+ if (size == NULL)
+ return (NULL);
+
+ ppd->sizes = size;
+ size += ppd->num_sizes;
+ ppd->num_sizes ++;
+
+ memset(size, 0, sizeof(ppd_size_t));
+ strlcpy(size->name, name, sizeof(size->name));
+
+ return (size);
+}
+
+
+#ifndef __APPLE__
+/*
+ * 'ppd_compare_groups()' - Compare two groups.
+ */
+
+static int /* O - Result of comparison */
+ppd_compare_groups(ppd_group_t *g0, /* I - First group */
+ ppd_group_t *g1) /* I - Second group */
+{
+ return (strcasecmp(g0->text, g1->text));
+}
+
+
+/*
+ * 'ppd_compare_options()' - Compare two options.
+ */
+
+static int /* O - Result of comparison */
+ppd_compare_options(ppd_option_t *o0, /* I - First option */
+ ppd_option_t *o1) /* I - Second option */
+{
+ return (strcasecmp(o0->text, o1->text));
+}
+#endif /* !__APPLE__ */
+
+
+/*
+ * 'ppd_decode()' - Decode a string value...
+ */
+
+static int /* O - Length of decoded string */
+ppd_decode(char *string) /* I - String to decode */
+{
+ char *inptr, /* Input pointer */
+ *outptr; /* Output pointer */
+
+
+ inptr = string;
+ outptr = string;
+
+ while (*inptr != '\0')
+ if (*inptr == '<' && isxdigit(inptr[1] & 255))
+ {
+ /*
+ * Convert hex to 8-bit values...
+ */
+
+ inptr ++;
+ while (isxdigit(*inptr & 255))
+ {
+ if (isalpha(*inptr))
+ *outptr = (tolower(*inptr) - 'a' + 10) << 4;
+ else
+ *outptr = (*inptr - '0') << 4;
+
+ inptr ++;
+
+ if (!isxdigit(*inptr & 255))
+ break;
+
+ if (isalpha(*inptr))
+ *outptr |= tolower(*inptr) - 'a' + 10;
+ else
+ *outptr |= *inptr - '0';
+
+ inptr ++;
+ outptr ++;
+ }
+
+ while (*inptr != '>' && *inptr != '\0')
+ inptr ++;
+ while (*inptr == '>')
+ inptr ++;
+ }
+ else
+ *outptr++ = *inptr++;
+
+ *outptr = '\0';
+
+ return (outptr - string);
+}
+
+
+#ifndef __APPLE__
+/*
+ * 'ppd_fix()' - Fix WinANSI characters in the range 0x80 to 0x9f to be
+ * valid ISO-8859-1 characters...
+ */
+
+static void
+ppd_fix(char *string) /* IO - String to fix */
+{
+ unsigned char *p; /* Pointer into string */
+ static const unsigned char lut[32] = /* Lookup table for characters */
+ {
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 0x20,
+ 'l',
+ '`',
+ '\'',
+ '^',
+ '~',
+ 0x20, /* bar */
+ 0x20, /* circumflex */
+ 0x20, /* dot */
+ 0x20, /* double dot */
+ 0x20,
+ 0x20, /* circle */
+ 0x20, /* ??? */
+ 0x20,
+ '\"', /* should be right quotes */
+ 0x20, /* ??? */
+ 0x20 /* accent */
+ };
+
+
+ for (p = (unsigned char *)string; *p; p ++)
+ if (*p >= 0x80 && *p < 0xa0)
+ *p = lut[*p - 0x80];
+}
+#endif /* !__APPLE__ */
+
+
+/*
+ * 'ppd_free_group()' - Free a single UI group.
+ */
+
+static void
+ppd_free_group(ppd_group_t *group) /* I - Group to free */
+{
+ int i; /* Looping var */
+ ppd_option_t *option; /* Current option */
+ ppd_group_t *subgroup; /* Current sub-group */
+
+
+ if (group->num_options > 0)
+ {
+ for (i = group->num_options, option = group->options;
+ i > 0;
+ i --, option ++)
+ ppd_free_option(option);
+
+ ppd_free(group->options);
+ }
+
+ if (group->num_subgroups > 0)
+ {
+ for (i = group->num_subgroups, subgroup = group->subgroups;
+ i > 0;
+ i --, subgroup ++)
+ ppd_free_group(subgroup);
+
+ ppd_free(group->subgroups);
+ }
+}
+
+
+/*
+ * 'ppd_free_option()' - Free a single option.
+ */
+
+static void
+ppd_free_option(ppd_option_t *option) /* I - Option to free */
+{
+ int i; /* Looping var */
+ ppd_choice_t *choice; /* Current choice */
+
+
+ if (option->num_choices > 0)
+ {
+ for (i = option->num_choices, choice = option->choices;
+ i > 0;
+ i --, choice ++)
+ {
+ ppd_free(choice->code);
+ }
+
+ ppd_free(option->choices);
+ }
+}
+
+
+/*
+ * 'ppd_get_extoption()' - Get an extended option record.
+ */
+
+static ppd_ext_option_t * /* O - Extended option... */
+ppd_get_extoption(ppd_file_t *ppd, /* I - PPD file */
+ const char *name) /* I - Name of option */
+{
+ ppd_ext_option_t **temp, /* New array pointer */
+ *extopt; /* New extended option */
+
+
+ /*
+ * See if the option already exists...
+ */
+
+ if ((extopt = ppdFindExtOption(ppd, name)) != NULL)
+ return (extopt);
+
+ /*
+ * Not found, so create the extended option record...
+ */
+
+ if ((extopt = calloc(1, sizeof(ppd_ext_option_t))) == NULL)
+ return (NULL);
+
+ strlcpy(extopt->keyword, name, sizeof(extopt->keyword));
+
+ /*
+ * Add this record to the end of the array...
+ */
+
+ if (ppd->num_extended == 0)
+ temp = malloc(sizeof(ppd_ext_option_t *));
+ else
+ temp = realloc(ppd->extended, sizeof(ppd_ext_option_t *) *
+ (ppd->num_extended + 1));
+
+ if (temp == NULL)
+ {
+ free(extopt);
+ return (NULL);
+ }
+
+ ppd->extended = temp;
+ temp[ppd->num_extended] = extopt;
+
+ ppd->num_extended ++;
+
+ /*
+ * Return the new record...
+ */
+
+ return (extopt);
+}
+
+
+/*
+ * 'ppd_get_extparam()' - Get an extended parameter record.
+ */
+
+static ppd_ext_param_t * /* O - Extended option... */
+ppd_get_extparam(ppd_ext_option_t *opt, /* I - PPD file */
+ const char *param,/* I - Name of parameter */
+ const char *text) /* I - Human-readable text */
+{
+ ppd_ext_param_t **temp, /* New array pointer */
+ *extparam; /* New extended parameter */
+
+
+ /*
+ * See if the parameter already exists...
+ */
+
+ if ((extparam = ppdFindExtParam(opt, param)) != NULL)
+ return (extparam);
+
+ /*
+ * Not found, so create the extended parameter record...
+ */
+
+ if ((extparam = calloc(1, sizeof(ppd_ext_param_t))) == NULL)
+ return (NULL);
+
+ if ((extparam->value = calloc(4, sizeof(ppd_ext_value_t))) == NULL)
+ {
+ ppd_free(extparam);
+ return (NULL);
+ }
+
+ extparam->defval = extparam->value + 1;
+ extparam->minval = extparam->value + 2;
+ extparam->maxval = extparam->value + 3;
+
+ strlcpy(extparam->keyword, param, sizeof(extparam->keyword));
+ strlcpy(extparam->text, text, sizeof(extparam->text));
+
+ /*
+ * Add this record to the end of the array...
+ */
+
+ if (opt->num_params == 0)
+ temp = malloc(sizeof(ppd_ext_param_t *));
+ else
+ temp = realloc(opt->params, sizeof(ppd_ext_param_t *) *
+ (opt->num_params + 1));
+
+ if (temp == NULL)
+ {
+ free(extparam);
+ return (NULL);
+ }
+
+ opt->params = temp;
+ temp[opt->num_params] = extparam;
+
+ opt->num_params ++;
+
+ /*
+ * Return the new record...
+ */
+
+ return (extparam);
+}
+
+
+/*
+ * 'ppd_get_group()' - Find or create the named group as needed.
+ */
+
+static ppd_group_t * /* O - Named group */
+ppd_get_group(ppd_file_t *ppd, /* I - PPD file */
+ const char *name, /* I - Name of group */
+ const char *text) /* I - Text for group */
+{
+ int i; /* Looping var */
+ ppd_group_t *group; /* Group */
+
+
+ DEBUG_printf(("ppd_get_group(%p, \"%s\")\n", ppd, name));
+
+ for (i = ppd->num_groups, group = ppd->groups; i > 0; i --, group ++)
+ if (strcmp(group->name, name) == 0)
+ break;
+
+ if (i == 0)
+ {
+ DEBUG_printf(("Adding group %s...\n", name));
+
+ if (ppd_conform == PPD_CONFORM_STRICT && strlen(text) >= sizeof(group->text))
+ {
+ ppd_status = PPD_ILLEGAL_TRANSLATION;
+
+ return (NULL);
+ }
+
+ if (ppd->num_groups == 0)
+ group = malloc(sizeof(ppd_group_t));
+ else
+ group = realloc(ppd->groups,
+ (ppd->num_groups + 1) * sizeof(ppd_group_t));
- /*
- * Try to open the file and parse it...
- */
+ if (group == NULL)
+ {
+ ppd_status = PPD_ALLOC_ERROR;
- if ((fp = fdopen(fd, "r")) != NULL)
- {
- setbuf(fp, NULL);
+ return (NULL);
+ }
- ppd = ppdOpen(fp);
+ ppd->groups = group;
+ group += ppd->num_groups;
+ ppd->num_groups ++;
- free(fp);
+ memset(group, 0, sizeof(ppd_group_t));
+ strlcpy(group->name, name, sizeof(group->name));
+ strlcpy(group->text, text, sizeof(group->text));
}
- else
- ppd = NULL;
- return (ppd);
+ return (group);
}
/*
- * 'ppdOpenFile()' - Read a PPD file into memory.
+ * 'ppd_get_option()' - Find or create the named option as needed.
*/
-ppd_file_t * /* O - PPD file record */
-ppdOpenFile(char *filename) /* I - File to read from */
+static ppd_option_t * /* O - Named option */
+ppd_get_option(ppd_group_t *group, /* I - Group */
+ const char *name) /* I - Name of option */
{
- FILE *fp; /* File pointer */
- ppd_file_t *ppd; /* PPD file record */
-
+ int i; /* Looping var */
+ ppd_option_t *option; /* Option */
- /*
- * Range check input...
- */
- if (filename == NULL)
- return (NULL);
+ DEBUG_printf(("ppd_get_option(group=%p(\"%s\"), name=\"%s\")\n",
+ group, group->name, name));
- /*
- * Try to open the file and parse it...
- */
+ for (i = group->num_options, option = group->options; i > 0; i --, option ++)
+ if (strcmp(option->keyword, name) == 0)
+ break;
- if ((fp = fopen(filename, "r")) != NULL)
+ if (i == 0)
{
- ppd = ppdOpen(fp);
+ if (group->num_options == 0)
+ option = malloc(sizeof(ppd_option_t));
+ else
+ option = realloc(group->options,
+ (group->num_options + 1) * sizeof(ppd_option_t));
- fclose(fp);
+ if (option == NULL)
+ return (NULL);
+
+ group->options = option;
+ option += group->num_options;
+ group->num_options ++;
+
+ memset(option, 0, sizeof(ppd_option_t));
+ strlcpy(option->keyword, name, sizeof(option->keyword));
}
- else
- ppd = NULL;
- return (ppd);
+ return (option);
}
* necessary.
*/
-static int /* O - Bitmask of fields read */
-ppd_read(FILE *fp, /* I - File to read from */
- char *keyword, /* O - Keyword from line */
- char *option, /* O - Option from line */
- char *text, /* O - Human-readable text from line */
- char **string) /* O - Code/string data */
+static int /* O - Bitmask of fields read */
+ppd_read(FILE *fp, /* I - File to read from */
+ char *keyword, /* O - Keyword from line */
+ char *option, /* O - Option from line */
+ char *text, /* O - Human-readable text from line */
+ char **string, /* O - Code/string data */
+ int ignoreblank) /* I - Ignore blank lines? */
{
- int ch, /* Character from file */
- endquote, /* Waiting for an end quote */
- mask; /* Mask to be returned */
- char *keyptr, /* Keyword pointer */
- *optptr, /* Option pointer */
- *textptr, /* Text pointer */
- *strptr, /* Pointer into string */
- *lineptr, /* Current position in line buffer */
- line[262144]; /* Line buffer (256k) */
+ int ch, /* Character from file */
+ col, /* Column in line */
+ colon, /* Colon seen? */
+ endquote, /* Waiting for an end quote */
+ mask, /* Mask to be returned */
+ startline, /* Start line */
+ textlen; /* Length of text */
+ char *keyptr, /* Keyword pointer */
+ *optptr, /* Option pointer */
+ *textptr, /* Text pointer */
+ *strptr, /* Pointer into string */
+ *lineptr, /* Current position in line buffer */
+ line[65536]; /* Line buffer (64k) */
/*
* Now loop until we have a valid line...
*/
+ *string = NULL;
+ col = 0;
+ startline = ppd_line + 1;
+
do
{
/*
lineptr = line;
endquote = 0;
+ colon = 0;
while ((ch = getc(fp)) != EOF &&
(lineptr - line) < (sizeof(line) - 1))
* Line feed or carriage return...
*/
- if (lineptr == line) /* Skip blank lines */
- continue;
+ ppd_line ++;
+ col = 0;
if (ch == '\r')
{
ungetc(ch, fp);
}
- *lineptr++ = '\n';
+ if (lineptr == line && ignoreblank)
+ continue; /* Skip blank lines */
+
+ ch = '\n';
if (!endquote) /* Continue for multi-line text */
break;
+
+ *lineptr++ = '\n';
}
- else
+ else if (ch < ' ' && ch != '\t' && ppd_conform == PPD_CONFORM_STRICT)
+ {
+ /*
+ * Other control characters...
+ */
+
+ ppd_line = startline;
+ ppd_status = PPD_ILLEGAL_CHARACTER;
+
+ return (0);
+ }
+ else if (ch != 0x1a)
{
/*
* Any other character...
*/
*lineptr++ = ch;
+ col ++;
+
+ if (col > (PPD_MAX_LINE - 1))
+ {
+ /*
+ * Line is too long...
+ */
+
+ ppd_line = startline;
+ ppd_status = PPD_LINE_TOO_LONG;
+
+ return (0);
+ }
+
+ if (ch == ':' && strncmp(line, "*%", 2) != 0)
+ colon = 1;
- if (ch == '\"')
- endquote = !endquote;
+ if (ch == '\"' && colon)
+ endquote = !endquote;
}
}
+ if (endquote)
+ {
+ /*
+ * Didn't finish this quoted string...
+ */
+
+ while ((ch = getc(fp)) != EOF)
+ if (ch == '\"')
+ break;
+ else if (ch == '\r' || ch == '\n')
+ {
+ ppd_line ++;
+ col = 0;
+
+ if (ch == '\r')
+ {
+ /*
+ * Check for a trailing line feed...
+ */
+
+ if ((ch = getc(fp)) == EOF)
+ break;
+ if (ch != 0x0a)
+ ungetc(ch, fp);
+ }
+
+ ch = '\n';
+ }
+ else if (ch < ' ' && ch != '\t' && ppd_conform == PPD_CONFORM_STRICT)
+ {
+ /*
+ * Other control characters...
+ */
+
+ ppd_line = startline;
+ ppd_status = PPD_ILLEGAL_CHARACTER;
+
+ return (0);
+ }
+ else if (ch != 0x1a)
+ {
+ col ++;
+
+ if (col > (PPD_MAX_LINE - 1))
+ {
+ /*
+ * Line is too long...
+ */
+
+ ppd_line = startline;
+ ppd_status = PPD_LINE_TOO_LONG;
+
+ return (0);
+ }
+ }
+ }
+
+ if (ch != '\n')
+ {
+ /*
+ * Didn't finish this line...
+ */
+
+ while ((ch = getc(fp)) != EOF)
+ if (ch == '\r' || ch == '\n')
+ {
+ /*
+ * Line feed or carriage return...
+ */
+
+ ppd_line ++;
+ col = 0;
+
+ if (ch == '\r')
+ {
+ /*
+ * Check for a trailing line feed...
+ */
+
+ if ((ch = getc(fp)) == EOF)
+ break;
+ if (ch != 0x0a)
+ ungetc(ch, fp);
+ }
+
+ break;
+ }
+ else if (ch < ' ' && ch != '\t' && ppd_conform == PPD_CONFORM_STRICT)
+ {
+ /*
+ * Other control characters...
+ */
+
+ ppd_line = startline;
+ ppd_status = PPD_ILLEGAL_CHARACTER;
+
+ return (0);
+ }
+ else if (ch != 0x1a)
+ {
+ col ++;
+
+ if (col > (PPD_MAX_LINE - 1))
+ {
+ /*
+ * Line is too long...
+ */
+
+ ppd_status = PPD_LINE_TOO_LONG;
+
+ return (0);
+ }
+ }
+ }
+
if (lineptr > line && lineptr[-1] == '\n')
lineptr --;
*lineptr = '\0';
+ DEBUG_printf(("LINE = \"%s\"\n", line));
+
if (ch == EOF && lineptr == line)
return (0);
text[0] = '\0';
*string = NULL;
- if (line[0] != '*') /* All lines start with an asterisk */
+ if ((!line[0] || /* Blank line */
+ strncmp(line, "*%", 2) == 0 || /* Comment line */
+ strcmp(line, "*End") == 0) && /* End of multi-line string */
+ ignoreblank) /* Ignore these? */
+ {
+ startline = ppd_line + 1;
continue;
+ }
- if (strncmp(line, "*%", 2) == 0 || /* Comment line */
- strncmp(line, "*?", 2) == 0 || /* Query line */
- strcmp(line, "*End") == 0) /* End of multi-line string */
- continue;
+ if (strcmp(line, "*") == 0) /* (Bad) comment line */
+ {
+ if (ppd_conform == PPD_CONFORM_RELAXED)
+ {
+ startline = ppd_line + 1;
+ continue;
+ }
+ else
+ {
+ ppd_line = startline;
+ ppd_status = PPD_ILLEGAL_MAIN_KEYWORD;
+
+ return (0);
+ }
+ }
+
+ if (line[0] != '*') /* All lines start with an asterisk */
+ {
+ if (ppd_conform == PPD_CONFORM_STRICT)
+ {
+ ppd_status = PPD_MISSING_ASTERISK;
+ return (0);
+ }
+
+ /*
+ * Allow lines consisting of just whitespace...
+ */
+
+ for (lineptr = line; *lineptr; lineptr ++)
+ if (!isspace(*lineptr & 255))
+ break;
+
+ if (*lineptr)
+ {
+ ppd_status = PPD_MISSING_ASTERISK;
+ return (0);
+ }
+ else if (ignoreblank)
+ continue;
+ else
+ return (0);
+ }
/*
* Get a keyword...
keyptr = keyword;
- while (*lineptr != '\0' && *lineptr != ':' && !isspace(*lineptr) &&
- (keyptr - keyword) < 40)
+ while (*lineptr != '\0' && *lineptr != ':' && !isspace(*lineptr & 255))
+ {
+ if (*lineptr <= ' ' || *lineptr > 126 || *lineptr == '/' ||
+ (keyptr - keyword) >= (PPD_MAX_NAME - 1))
+ {
+ ppd_status = PPD_ILLEGAL_MAIN_KEYWORD;
+ return (0);
+ }
+
*keyptr++ = *lineptr++;
+ }
*keyptr = '\0';
+
+ if (strcmp(keyword, "End") == 0)
+ continue;
+
mask |= PPD_KEYWORD;
- if (*lineptr == ' ' || *lineptr == '\t')
+/* DEBUG_printf(("keyword = \"%s\", lineptr = \"%s\"\n", keyword, lineptr));*/
+
+ if (isspace(*lineptr & 255))
{
/*
* Get an option name...
*/
- while (*lineptr == ' ' || *lineptr == '\t')
+ while (isspace(*lineptr & 255))
lineptr ++;
optptr = option;
- while (*lineptr != '\0' && *lineptr != '\n' && *lineptr != ':' &&
- *lineptr != '/' && (optptr - option) < 40)
- *optptr++ = *lineptr++;
+ while (*lineptr != '\0' && !isspace(*lineptr & 255) && *lineptr != ':' &&
+ *lineptr != '/')
+ {
+ if (*lineptr <= ' ' || *lineptr > 126 ||
+ (optptr - option) >= (PPD_MAX_NAME - 1))
+ {
+ ppd_status = PPD_ILLEGAL_OPTION_KEYWORD;
+ return (0);
+ }
+
+ *optptr++ = *lineptr++;
+ }
*optptr = '\0';
+
+ if (isspace(*lineptr & 255) && ppd_conform == PPD_CONFORM_STRICT)
+ {
+ ppd_status = PPD_ILLEGAL_WHITESPACE;
+ return (0);
+ }
+
+ while (isspace(*lineptr & 255))
+ lineptr ++;
+
mask |= PPD_OPTION;
+/* DEBUG_printf(("option = \"%s\", lineptr = \"%s\"\n", option, lineptr));*/
+
if (*lineptr == '/')
{
/*
textptr = text;
- while (*lineptr != '\0' && *lineptr != '\n' && *lineptr != ':' &&
- (textptr - text) < 80)
+ while (*lineptr != '\0' && *lineptr != '\n' && *lineptr != ':')
+ {
+ if (((unsigned char)*lineptr < ' ' && *lineptr != '\t') ||
+ (textptr - text) >= (PPD_MAX_LINE - 1))
+ {
+ ppd_status = PPD_ILLEGAL_TRANSLATION;
+ return (0);
+ }
+
*textptr++ = *lineptr++;
+ }
*textptr = '\0';
- ppd_decode(text);
+ textlen = ppd_decode(text);
+ if (textlen > PPD_MAX_TEXT && ppd_conform == PPD_CONFORM_STRICT)
+ {
+ ppd_status = PPD_ILLEGAL_TRANSLATION;
+ return (0);
+ }
+
mask |= PPD_TEXT;
}
+
+/* DEBUG_printf(("text = \"%s\", lineptr = \"%s\"\n", text, lineptr));*/
+ }
+
+ if (isspace(*lineptr & 255) && ppd_conform == PPD_CONFORM_STRICT)
+ {
+ ppd_status = PPD_ILLEGAL_WHITESPACE;
+ return (0);
}
+ while (isspace(*lineptr & 255))
+ lineptr ++;
+
if (*lineptr == ':')
{
/*
- * Get string...
+ * Get string after triming leading and trailing whitespace...
*/
- *string = malloc(strlen(lineptr) + 1);
-
- while (*lineptr == ':' || isspace(*lineptr))
+ lineptr ++;
+ while (isspace(*lineptr & 255))
lineptr ++;
- strptr = *string;
+ strptr = lineptr + strlen(lineptr) - 1;
+ while (strptr >= lineptr && isspace(*strptr & 255))
+ *strptr-- = '\0';
- while (*lineptr != '\0')
+ if (*strptr == '\"')
{
- if (*lineptr != '\"')
- *strptr++ = *lineptr++;
- else
- lineptr ++;
+ /*
+ * Quoted string by itself...
+ */
+
+ *string = malloc(strlen(lineptr) + 1);
+
+ strptr = *string;
+
+ for (; *lineptr != '\0'; lineptr ++)
+ if (*lineptr != '\"')
+ *strptr++ = *lineptr;
+
+ *strptr = '\0';
}
+ else
+ *string = strdup(lineptr);
- *strptr = '\0';
+/* DEBUG_printf(("string = \"%s\", lineptr = \"%s\"\n", *string, lineptr));*/
mask |= PPD_STRING;
}
/*
- * 'ppd_decode()' - Decode a string value...
- */
-
-static void
-ppd_decode(char *string) /* I - String to decode */
-{
- char *inptr, /* Input pointer */
- *outptr; /* Output pointer */
-
-
- inptr = string;
- outptr = string;
-
- while (*inptr != '\0')
- if (*inptr == '<' && isxdigit(inptr[1]))
- {
- /*
- * Convert hex to 8-bit values...
- */
-
- inptr ++;
- while (isxdigit(*inptr))
- {
- if (isalpha(*inptr))
- *outptr = (tolower(*inptr) - 'a' + 10) << 4;
- else
- *outptr = (*inptr - '0') << 4;
-
- inptr ++;
-
- if (isalpha(*inptr))
- *outptr |= tolower(*inptr) - 'a' + 10;
- else
- *outptr |= *inptr - '0';
-
- inptr ++;
- outptr ++;
- }
-
- while (*inptr != '>' && *inptr != '\0')
- inptr ++;
- while (*inptr == '>')
- inptr ++;
- }
- else
- *outptr++ = *inptr++;
-
- *outptr = '\0';
-}
-
-
-
-
-/*
- * End of "$Id: ppd.c,v 1.17 1999/05/17 18:11:46 mike Exp $".
+ * End of "$Id: ppd.c,v 1.51.2.64 2004/06/29 03:46:29 mike Exp $".
*/
projects / thirdparty / cups.git / blobdiff