/*
- * "$Id: mark.c 6942 2007-09-10 22:55:00Z mike $"
+ * "$Id: mark.c 7819 2008-08-01 00:27:24Z mike $"
*
* Option marking routines for the Common UNIX Printing System (CUPS).
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2008 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
*
* Contents:
*
- * ppdConflicts() - Check to see if there are any conflicts.
+ * cupsMarkOptions() - Mark command-line options in a PPD file.
* ppdFindChoice() - Return a pointer to an option choice.
* ppdFindMarkedChoice() - Return the marked choice for the specified option.
* ppdFindOption() - Return a pointer to the specified option.
+ * ppdIsMarked() - Check to see if an option is marked.
+ * ppdMarkDefaults() - Mark all default options in the PPD file.
+ * ppdMarkOption() - Mark an option in a PPD file and return the number
+ * of conflicts.
* ppdFirstOption() - Return the first option in the PPD file.
* ppdNextOption() - Return the next option in the PPD file.
- * ppdIsMarked() - Check to see if an option is marked...
- * ppdMarkDefaults() - Mark all default options in the PPD file.
- * ppdMarkOption() - Mark an option in a PPD file.
+ * _ppdParseOptions() - Parse options from a PPD file.
+ * debug_marked() - Output the marked array to stdout...
* ppd_defaults() - Set the defaults for this group and all sub-groups.
+ * ppd_mark_choices() - Mark one or more option choices from a string.
+ * ppd_mark_option() - Quick mark an option without checking for
+ * conflicts.
*/
/*
* Local functions...
*/
+#ifdef DEBUG
+static void debug_marked(ppd_file_t *ppd, const char *title);
+#else
+# define debug_marked(ppd,title)
+#endif /* DEBUG */
static void ppd_defaults(ppd_file_t *ppd, ppd_group_t *g);
+static void ppd_mark_choices(ppd_file_t *ppd, const char *s);
+static void ppd_mark_option(ppd_file_t *ppd, const char *option,
+ const char *choice);
/*
- * 'ppdConflicts()' - Check to see if there are any conflicts.
+ * 'cupsMarkOptions()' - Mark command-line options in a PPD file.
+ *
+ * This function maps the IPP "finishings", "media", "mirror",
+ * "multiple-document-handling", "output-bin", "printer-resolution", and
+ * "sides" attributes to their corresponding PPD options and choices.
*/
-int /* O - Number of conflicts found */
-ppdConflicts(ppd_file_t *ppd) /* I - PPD to check */
+int /* O - 1 if conflicts exist, 0 otherwise */
+cupsMarkOptions(
+ ppd_file_t *ppd, /* I - PPD file */
+ int num_options, /* I - Number of options */
+ cups_option_t *options) /* I - Options */
{
- int i, /* Looping variable */
- conflicts; /* Number of conflicts */
- ppd_const_t *c; /* Current constraint */
- ppd_option_t *o1, *o2; /* Options */
- ppd_choice_t *c1, *c2; /* Choices */
- ppd_choice_t key; /* Search key */
+ int i, j, k; /* Looping vars */
+ char *val, /* Pointer into value */
+ *ptr, /* Pointer into string */
+ s[255]; /* Temporary string */
+ const char *page_size; /* PageSize option */
+ cups_option_t *optptr; /* Current option */
+ ppd_option_t *option; /* PPD option */
+ ppd_attr_t *attr; /* PPD attribute */
+ static const char * const duplex_options[] =
+ { /* Duplex option names */
+ "Duplex", /* Adobe */
+ "EFDuplex", /* EFI */
+ "EFDuplexing", /* EFI */
+ "KD03Duplex", /* Kodak */
+ "JCLDuplex" /* Samsung */
+ };
+ static const char * const duplex_one[] =
+ { /* one-sided names */
+ "None",
+ "False"
+ };
+ static const char * const duplex_two_long[] =
+ { /* two-sided-long-edge names */
+ "DuplexNoTumble", /* Adobe */
+ "LongEdge", /* EFI */
+ "Top" /* EFI */
+ };
+ static const char * const duplex_two_short[] =
+ { /* two-sided-long-edge names */
+ "DuplexTumble", /* Adobe */
+ "ShortEdge", /* EFI */
+ "Bottom" /* EFI */
+ };
- if (!ppd)
- return (0);
-
/*
- * Clear all conflicts...
+ * Check arguments...
*/
- conflicts = 0;
-
- for (o1 = ppdFirstOption(ppd); o1; o1 = ppdNextOption(ppd))
- o1->conflicted = 0;
+ if (!ppd || num_options <= 0 || !options)
+ return (0);
- cupsArraySave(ppd->marked);
+ debug_marked(ppd, "Before...");
/*
- * Loop through all of the UI constraints and flag any options
- * that conflict...
+ * Mark options...
*/
- for (i = ppd->num_consts, c = ppd->consts, o1 = o2 = NULL, c1 = c2 = NULL;
- i > 0;
- i --, c ++)
- {
- /*
- * Grab pointers to the first option...
- */
-
- if (!o1 || strcmp(c->option1, o1->keyword))
- {
- o1 = ppdFindOption(ppd, c->option1);
- c1 = NULL;
- }
-
- if (!o1)
- continue;
- else if (c->choice1[0] && (!c1 || strcmp(c->choice1, c1->choice)))
+ for (i = num_options, optptr = options; i > 0; i --, optptr ++)
+ if (!strcasecmp(optptr->name, "media"))
{
/*
- * This constraint maps to a specific choice.
+ * Loop through the option string, separating it at commas and
+ * marking each individual option as long as the corresponding
+ * PPD option (PageSize, InputSlot, etc.) is not also set.
+ *
+ * For PageSize, we also check for an empty option value since
+ * some versions of MacOS X use it to specify auto-selection
+ * of the media based solely on the size.
*/
- key.option = o1;
+ page_size = cupsGetOption("PageSize", num_options, options);
+
+ for (val = optptr->value; *val;)
+ {
+ /*
+ * Extract the sub-option from the string...
+ */
+
+ for (ptr = s; *val && *val != ',' && (ptr - s) < (sizeof(s) - 1);)
+ *ptr++ = *val++;
+ *ptr++ = '\0';
+
+ if (*val == ',')
+ val ++;
- if ((c1 = (ppd_choice_t *)cupsArrayFind(ppd->marked, &key)) != NULL &&
- (!c1->marked || strcmp(c->choice1, c1->choice)))
- c1 = NULL;
+ /*
+ * Mark it...
+ */
+
+ if (!page_size || !page_size[0])
+ ppd_mark_option(ppd, "PageSize", s);
+
+ if (cupsGetOption("InputSlot", num_options, options) == NULL)
+ ppd_mark_option(ppd, "InputSlot", s);
+
+ if (cupsGetOption("MediaType", num_options, options) == NULL)
+ ppd_mark_option(ppd, "MediaType", s);
+
+ if (cupsGetOption("EFMediaType", num_options, options) == NULL)
+ ppd_mark_option(ppd, "EFMediaType", s); /* EFI */
+
+ if (cupsGetOption("EFMediaQualityMode", num_options, options) == NULL)
+ ppd_mark_option(ppd, "EFMediaQualityMode", s); /* EFI */
+
+ if (!strcasecmp(s, "manual") &&
+ !cupsGetOption("ManualFeed", num_options, options))
+ ppd_mark_option(ppd, "ManualFeed", "True");
+ }
}
- else if (!c1)
+ else if (!strcasecmp(optptr->name, "sides"))
{
- /*
- * This constraint applies to any choice for this option.
- */
+ for (j = 0;
+ j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0]));
+ j ++)
+ if (cupsGetOption(duplex_options[j], num_options, options))
+ break;
- key.option = o1;
+ if (j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0])))
+ {
+ /*
+ * Don't override the PPD option with the IPP attribute...
+ */
- if ((c1 = (ppd_choice_t *)cupsArrayFind(ppd->marked, &key)) != NULL &&
- (!strcasecmp(c1->choice, "None") || !strcasecmp(c1->choice, "Off") ||
- !strcasecmp(c1->choice, "False")))
- c1 = NULL;
- }
+ continue;
+ }
- /*
- * Grab pointers to the second option...
- */
+ if (!strcasecmp(optptr->value, "one-sided"))
+ {
+ /*
+ * Mark the appropriate duplex option for one-sided output...
+ */
- if (!o2 || strcmp(c->option2, o2->keyword))
+ for (j = 0;
+ j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0]));
+ j ++)
+ if ((option = ppdFindOption(ppd, duplex_options[j])) != NULL)
+ break;
+
+ if (j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0])))
+ {
+ for (k = 0;
+ k < (int)(sizeof(duplex_one) / sizeof(duplex_one[0]));
+ k ++)
+ if (ppdFindChoice(option, duplex_one[k]))
+ {
+ ppd_mark_option(ppd, duplex_options[j], duplex_one[k]);
+ break;
+ }
+ }
+ }
+ else if (!strcasecmp(optptr->value, "two-sided-long-edge"))
+ {
+ /*
+ * Mark the appropriate duplex option for two-sided-long-edge output...
+ */
+
+ for (j = 0;
+ j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0]));
+ j ++)
+ if ((option = ppdFindOption(ppd, duplex_options[j])) != NULL)
+ break;
+
+ if (j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0])))
+ {
+ for (k = 0;
+ k < (int)(sizeof(duplex_two_long) / sizeof(duplex_two_long[0]));
+ k ++)
+ if (ppdFindChoice(option, duplex_two_long[k]))
+ {
+ ppd_mark_option(ppd, duplex_options[j], duplex_two_long[k]);
+ break;
+ }
+ }
+ }
+ else if (!strcasecmp(optptr->value, "two-sided-short-edge"))
+ {
+ /*
+ * Mark the appropriate duplex option for two-sided-short-edge output...
+ */
+
+ for (j = 0;
+ j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0]));
+ j ++)
+ if ((option = ppdFindOption(ppd, duplex_options[j])) != NULL)
+ break;
+
+ if (j < (int)(sizeof(duplex_options) / sizeof(duplex_options[0])))
+ {
+ for (k = 0;
+ k < (int)(sizeof(duplex_two_short) / sizeof(duplex_two_short[0]));
+ k ++)
+ if (ppdFindChoice(option, duplex_two_short[k]))
+ {
+ ppd_mark_option(ppd, duplex_options[j], duplex_two_short[k]);
+ break;
+ }
+ }
+ }
+ }
+ else if (!strcasecmp(optptr->name, "resolution") ||
+ !strcasecmp(optptr->name, "printer-resolution"))
{
- o2 = ppdFindOption(ppd, c->option2);
- c2 = NULL;
+ ppd_mark_option(ppd, "Resolution", optptr->value);
+ ppd_mark_option(ppd, "SetResolution", optptr->value);
+ /* Calcomp, Linotype, QMS, Summagraphics, Tektronix, Varityper */
+ ppd_mark_option(ppd, "JCLResolution", optptr->value);
+ /* HP */
+ ppd_mark_option(ppd, "CNRes_PGP", optptr->value);
+ /* Canon */
}
-
- if (!o2)
- continue;
- else if (c->choice2[0] && (!c2 || strcmp(c->choice2, c2->choice)))
+ else if (!strcasecmp(optptr->name, "output-bin"))
+ {
+ if (!cupsGetOption("OutputBin", num_options, options))
+ ppd_mark_option(ppd, "OutputBin", optptr->value);
+ }
+ else if (!strcasecmp(optptr->name, "multiple-document-handling"))
+ {
+ if (!cupsGetOption("Collate", num_options, options) &&
+ ppdFindOption(ppd, "Collate"))
+ {
+ if (strcasecmp(optptr->value, "separate-documents-uncollated-copies"))
+ ppd_mark_option(ppd, "Collate", "True");
+ else
+ ppd_mark_option(ppd, "Collate", "False");
+ }
+ }
+ else if (!strcasecmp(optptr->name, "finishings"))
{
/*
- * This constraint maps to a specific choice.
+ * Lookup cupsIPPFinishings attributes for each value...
*/
- key.option = o2;
+ for (ptr = optptr->value; *ptr;)
+ {
+ /*
+ * Get the next finishings number...
+ */
+
+ if (!isdigit(*ptr & 255))
+ break;
+
+ if ((j = strtol(ptr, &ptr, 10)) < 3)
+ break;
+
+ /*
+ * Skip separator as needed...
+ */
+
+ if (*ptr == ',')
+ ptr ++;
- if ((c2 = (ppd_choice_t *)cupsArrayFind(ppd->marked, &key)) != NULL &&
- (!c2->marked || strcmp(c->choice2, c2->choice)))
- c2 = NULL;
+ /*
+ * Look it up in the PPD file...
+ */
+
+ sprintf(s, "%d", j);
+
+ if ((attr = ppdFindAttr(ppd, "cupsIPPFinishings", s)) == NULL)
+ continue;
+
+ /*
+ * Apply "*Option Choice" settings from the attribute value...
+ */
+
+ ppd_mark_choices(ppd, attr->value);
+ }
}
- else if (!c2)
+ else if (!strcasecmp(optptr->name, "APPrinterPreset"))
{
/*
- * This constraint applies to any choice for this option.
+ * Lookup APPrinterPreset value...
*/
- key.option = o2;
-
- if ((c2 = (ppd_choice_t *)cupsArrayFind(ppd->marked, &key)) != NULL &&
- (!strcasecmp(c2->choice, "None") || !strcasecmp(c2->choice, "Off") ||
- !strcasecmp(c2->choice, "False")))
- c2 = NULL;
- }
-
- /*
- * If both options are marked then there is a conflict...
- */
+ if ((attr = ppdFindAttr(ppd, "APPrinterPreset", optptr->value)) != NULL)
+ {
+ /*
+ * Apply "*Option Choice" settings from the attribute value...
+ */
- if (c1 && c1->marked && c2 && c2->marked)
- {
- DEBUG_printf(("%s->%s conflicts with %s->%s (%s %s %s %s)\n",
- o1->keyword, c1->choice, o2->keyword, c2->choice,
- c->option1, c->choice1, c->option2, c->choice2));
- conflicts ++;
- o1->conflicted = 1;
- o2->conflicted = 1;
+ ppd_mark_choices(ppd, attr->value);
+ }
}
- }
-
- cupsArrayRestore(ppd->marked);
+ else if (!strcasecmp(optptr->name, "mirror"))
+ ppd_mark_option(ppd, "MirrorPrint", optptr->value);
+ else
+ ppd_mark_option(ppd, optptr->name, optptr->value);
- /*
- * Return the number of conflicts found...
- */
+ debug_marked(ppd, "After...");
- return (conflicts);
+ return (ppdConflicts(ppd) > 0);
}
* 'ppdFindChoice()' - Return a pointer to an option choice.
*/
-ppd_choice_t * /* O - Choice pointer or NULL */
+ppd_choice_t * /* O - Choice pointer or @code NULL@ */
ppdFindChoice(ppd_option_t *o, /* I - Pointer to option */
const char *choice) /* I - Name of choice */
{
ppd_choice_t *c; /* Current choice */
- if (o == NULL || choice == NULL)
+ if (!o || !choice)
return (NULL);
+ if (choice[0] == '{' || !strncasecmp(choice, "Custom.", 7))
+ choice = "Custom";
+
for (i = o->num_choices, c = o->choices; i > 0; i --, c ++)
- if (strcasecmp(c->choice, choice) == 0)
+ if (!strcasecmp(c->choice, choice))
return (c);
return (NULL);
* 'ppdFindMarkedChoice()' - Return the marked choice for the specified option.
*/
-ppd_choice_t * /* O - Pointer to choice or NULL */
+ppd_choice_t * /* O - Pointer to choice or @code NULL@ */
ppdFindMarkedChoice(ppd_file_t *ppd, /* I - PPD file */
const char *option) /* I - Keyword/option name */
{
* 'ppdFindOption()' - Return a pointer to the specified option.
*/
-ppd_option_t * /* O - Pointer to option or NULL */
+ppd_option_t * /* O - Pointer to option or @code NULL@ */
ppdFindOption(ppd_file_t *ppd, /* I - PPD file data */
const char *option) /* I - Option/Keyword name */
{
/*
- * 'ppdIsMarked()' - Check to see if an option is marked...
+ * 'ppdIsMarked()' - Check to see if an option is marked.
*/
int /* O - Non-zero if option is marked */
/*
- * 'ppdMarkOption()' - Mark an option in a PPD file.
- *
- * Notes:
- *
- * -1 is returned if the given option would conflict with any currently
- * selected option.
+ * 'ppdMarkOption()' - Mark an option in a PPD file and return the number of
+ * conflicts.
*/
int /* O - Number of conflicts */
const char *option, /* I - Keyword */
const char *choice) /* I - Option name */
{
- int i, j; /* Looping vars */
- ppd_option_t *o; /* Option pointer */
- ppd_choice_t *c, /* Choice pointer */
- *oldc, /* Old choice pointer */
- key; /* Search key for choice */
- struct lconv *loc; /* Locale data */
-
-
DEBUG_printf(("ppdMarkOption(ppd=%p, option=\"%s\", choice=\"%s\")\n",
ppd, option, choice));
if (!ppd || !option || !choice)
return (0);
+ /*
+ * Mark the option...
+ */
+
+ ppd_mark_option(ppd, option, choice);
+
+ /*
+ * Return the number of conflicts...
+ */
+
+ return (ppdConflicts(ppd));
+}
+
+
+/*
+ * 'ppdFirstOption()' - Return the first option in the PPD file.
+ *
+ * Options are returned from all groups in ascending alphanumeric order.
+ *
+ * @since CUPS 1.2@
+ */
+
+ppd_option_t * /* O - First option or @code NULL@ */
+ppdFirstOption(ppd_file_t *ppd) /* I - PPD file */
+{
+ if (!ppd)
+ return (NULL);
+ else
+ return ((ppd_option_t *)cupsArrayFirst(ppd->options));
+}
+
+
+/*
+ * 'ppdNextOption()' - Return the next option in the PPD file.
+ *
+ * Options are returned from all groups in ascending alphanumeric order.
+ *
+ * @since CUPS 1.2@
+ */
+
+ppd_option_t * /* O - Next option or @code NULL@ */
+ppdNextOption(ppd_file_t *ppd) /* I - PPD file */
+{
+ if (!ppd)
+ return (NULL);
+ else
+ return ((ppd_option_t *)cupsArrayNext(ppd->options));
+}
+
+
+/*
+ * '_ppdParseOptions()' - Parse options from a PPD file.
+ *
+ * This function looks for strings of the form:
+ *
+ * *option choice ... *optionN choiceN
+ *
+ * It stops when it finds a string that doesn't match this format.
+ */
+
+int /* O - Number of options */
+_ppdParseOptions(
+ const char *s, /* I - String to parse */
+ int num_options, /* I - Number of options */
+ cups_option_t **options) /* IO - Options */
+{
+ char option[PPD_MAX_NAME], /* Current option */
+ choice[PPD_MAX_NAME], /* Current choice */
+ *ptr; /* Pointer into option or choice */
+
+
+ if (!s)
+ return (num_options);
+
+ /*
+ * Read all of the "*Option Choice" pairs from the string, marking PPD
+ * options as we go...
+ */
+
+ while (*s)
+ {
+ /*
+ * Skip leading whitespace...
+ */
+
+ while (isspace(*s & 255))
+ s ++;
+
+ if (*s != '*')
+ break;
+
+ /*
+ * Get the option name...
+ */
+
+ s ++;
+ ptr = option;
+ while (*s && !isspace(*s & 255) && ptr < (option + sizeof(option) - 1))
+ *ptr++ = *s++;
+
+ if (ptr == s)
+ break;
+
+ *ptr = '\0';
+
+ /*
+ * Get the choice...
+ */
+
+ while (isspace(*s & 255))
+ s ++;
+
+ if (!*s)
+ break;
+
+ ptr = choice;
+ while (*s && !isspace(*s & 255) && ptr < (choice + sizeof(choice) - 1))
+ *ptr++ = *s++;
+
+ *ptr = '\0';
+
+ /*
+ * Add it to the options array...
+ */
+
+ num_options = cupsAddOption(option, choice, num_options, options);
+ }
+
+ return (num_options);
+}
+
+
+#ifdef DEBUG
+/*
+ * 'debug_marked()' - Output the marked array to stdout...
+ */
+
+static void
+debug_marked(ppd_file_t *ppd, /* I - PPD file data */
+ const char *title) /* I - Title for list */
+{
+ ppd_choice_t *c; /* Current choice */
+
+
+ DEBUG_printf(("cupsMarkOptions: %s\n", title));
+
+ for (c = (ppd_choice_t *)cupsArrayFirst(ppd->marked);
+ c;
+ c = (ppd_choice_t *)cupsArrayNext(ppd->marked))
+ DEBUG_printf(("cupsMarkOptions: %s=%s\n", c->option->keyword, c->choice));
+}
+#endif /* DEBUG */
+
+
+/*
+ * 'ppd_defaults()' - Set the defaults for this group and all sub-groups.
+ */
+
+static void
+ppd_defaults(ppd_file_t *ppd, /* I - PPD file */
+ ppd_group_t *g) /* I - Group to default */
+{
+ int i; /* Looping var */
+ ppd_option_t *o; /* Current option */
+ ppd_group_t *sg; /* Current sub-group */
+
+
+ for (i = g->num_options, o = g->options; i > 0; i --, o ++)
+ if (strcasecmp(o->keyword, "PageRegion") != 0)
+ ppdMarkOption(ppd, o->keyword, o->defchoice);
+
+ for (i = g->num_subgroups, sg = g->subgroups; i > 0; i --, sg ++)
+ ppd_defaults(ppd, sg);
+}
+
+
+/*
+ * 'ppd_mark_choices()' - Mark one or more option choices from a string.
+ */
+
+static void
+ppd_mark_choices(ppd_file_t *ppd, /* I - PPD file */
+ const char *s) /* I - "*Option Choice ..." string */
+{
+ int i, /* Looping var */
+ num_options; /* Number of options */
+ cups_option_t *options, /* Options */
+ *option; /* Current option */
+
+
+ if (!s)
+ return;
+
+ options = NULL;
+ num_options = _ppdParseOptions(s, 0, &options);
+
+ for (i = num_options, option = options; i > 0; i --, option ++)
+ ppd_mark_option(ppd, option->name, option->value);
+
+ cupsFreeOptions(num_options, options);
+}
+
+
+/*
+ * 'ppd_mark_option()' - Quick mark an option without checking for conflicts.
+ */
+
+static void
+ppd_mark_option(ppd_file_t *ppd, /* I - PPD file */
+ const char *option, /* I - Option name */
+ const char *choice) /* I - Choice name */
+{
+ int i, j; /* Looping vars */
+ ppd_option_t *o; /* Option pointer */
+ ppd_choice_t *c, /* Choice pointer */
+ *oldc, /* Old choice pointer */
+ key; /* Search key for choice */
+ struct lconv *loc; /* Locale data */
+
+
+ DEBUG_printf(("ppd_mark_option(ppd=%p, option=\"%s\", choice=\"%s\")\n",
+ ppd, option, choice));
+
/*
* AP_D_InputSlot is the "default input slot" on MacOS X, and setting
* it clears the regular InputSlot choices...
*/
if ((o = ppdFindOption(ppd, option)) == NULL)
- return (0);
+ return;
loc = localeconv();
*/
if ((c = ppdFindChoice(o, "Custom")) == NULL)
- return (0);
+ return;
if (!strcasecmp(option, "PageSize"))
{
if ((coption = ppdFindCustomOption(ppd, option)) != NULL)
{
if ((cparam = (ppd_cparam_t *)cupsArrayFirst(coption->params)) == NULL)
- return (0);
+ return;
switch (cparam->type)
{
case PPD_CUSTOM_PASSWORD :
case PPD_CUSTOM_STRING :
if (cparam->current.custom_string)
- free(cparam->current.custom_string);
+ _cupsStrFree(cparam->current.custom_string);
- cparam->current.custom_string = strdup(choice + 7);
+ cparam->current.custom_string = _cupsStrAlloc(choice + 7);
break;
}
}
if ((c = ppdFindChoice(o, "Custom")) == NULL)
- return (0);
+ return;
if ((coption = ppdFindCustomOption(ppd, option)) != NULL)
{
- num_vals = cupsParseOptions(choice + 1, 0, &vals);
+ num_vals = cupsParseOptions(choice, 0, &vals);
for (i = 0, val = vals; i < num_vals; i ++, val ++)
{
case PPD_CUSTOM_PASSWORD :
case PPD_CUSTOM_STRING :
if (cparam->current.custom_string)
- free(cparam->current.custom_string);
+ _cupsStrFree(cparam->current.custom_string);
- cparam->current.custom_string = strdup(val->value);
+ cparam->current.custom_string = _cupsStrAlloc(val->value);
break;
}
}
break;
if (!i)
- return (0);
+ return;
}
/*
c->marked = 1;
cupsArrayAdd(ppd->marked, c);
-
- /*
- * Return the number of conflicts...
- */
-
- return (ppdConflicts(ppd));
-}
-
-
-/*
- * 'ppdFirstOption()' - Return the first option in the PPD file.
- *
- * Options are returned from all groups in sorted order.
- *
- * @since CUPS 1.2@
- */
-
-ppd_option_t * /* O - First option or NULL */
-ppdFirstOption(ppd_file_t *ppd) /* I - PPD file */
-{
- if (!ppd)
- return (NULL);
- else
- return ((ppd_option_t *)cupsArrayFirst(ppd->options));
-}
-
-
-/*
- * 'ppdNextOption()' - Return the next option in the PPD file.
- *
- * Options are returned from all groups in sorted order.
- *
- * @since CUPS 1.2@
- */
-
-ppd_option_t * /* O - Next option or NULL */
-ppdNextOption(ppd_file_t *ppd) /* I - PPD file */
-{
- if (!ppd)
- return (NULL);
- else
- return ((ppd_option_t *)cupsArrayNext(ppd->options));
-}
-
-
-/*
- * 'ppd_defaults()' - Set the defaults for this group and all sub-groups.
- */
-
-static void
-ppd_defaults(ppd_file_t *ppd, /* I - PPD file */
- ppd_group_t *g) /* I - Group to default */
-{
- int i; /* Looping var */
- ppd_option_t *o; /* Current option */
- ppd_group_t *sg; /* Current sub-group */
-
-
- for (i = g->num_options, o = g->options; i > 0; i --, o ++)
- if (strcasecmp(o->keyword, "PageRegion") != 0)
- ppdMarkOption(ppd, o->keyword, o->defchoice);
-
- for (i = g->num_subgroups, sg = g->subgroups; i > 0; i --, sg ++)
- ppd_defaults(ppd, sg);
}
/*
- * End of "$Id: mark.c 6942 2007-09-10 22:55:00Z mike $".
+ * End of "$Id: mark.c 7819 2008-08-01 00:27:24Z mike $".
*/
projects / thirdparty / cups.git / blobdiff