summaryrefslogtreecommitdiff
path: root/cups/conflicts.c
diff options
context:
space:
mode:
Diffstat (limited to 'cups/conflicts.c')
-rw-r--r--cups/conflicts.c98
1 files changed, 62 insertions, 36 deletions
diff --git a/cups/conflicts.c b/cups/conflicts.c
index 254138a49..d6de5a39b 100644
--- a/cups/conflicts.c
+++ b/cups/conflicts.c
@@ -47,6 +47,7 @@
enum
{
_PPD_NORMAL_CONSTRAINTS,
+ _PPD_OPTION_CONSTRAINTS,
_PPD_INSTALLABLE_CONSTRAINTS,
_PPD_ALL_CONSTRAINTS
};
@@ -255,7 +256,7 @@ cupsResolveConflicts(
* Resolver loop!
*/
- DEBUG_printf(("ppdResolveConflicts: Resolver loop with %s!\n",
+ DEBUG_printf(("1ppdResolveConflicts: Resolver loop with %s!",
consts->resolver));
goto error;
}
@@ -263,14 +264,14 @@ cupsResolveConflicts(
if ((resolver = ppdFindAttr(ppd, "cupsUIResolver",
consts->resolver)) == NULL)
{
- DEBUG_printf(("ppdResolveConflicts: Resolver %s not found!\n",
+ DEBUG_printf(("1ppdResolveConflicts: Resolver %s not found!",
consts->resolver));
goto error;
}
if (!resolver->value)
{
- DEBUG_printf(("ppdResolveConflicts: Resolver %s has no value!\n",
+ DEBUG_printf(("1ppdResolveConflicts: Resolver %s has no value!",
consts->resolver));
goto error;
}
@@ -428,7 +429,7 @@ cupsResolveConflicts(
(test = ppd_test_constraints(ppd, constptr->option->keyword,
constptr->option->defchoice,
num_newopts, newopts,
- _PPD_ALL_CONSTRAINTS)) == NULL)
+ _PPD_OPTION_CONSTRAINTS)) == NULL)
{
/*
* That worked...
@@ -459,7 +460,7 @@ cupsResolveConflicts(
(test = ppd_test_constraints(ppd, constptr->option->keyword,
cptr->choice, num_newopts,
newopts,
- _PPD_ALL_CONSTRAINTS)) == NULL)
+ _PPD_OPTION_CONSTRAINTS)) == NULL)
{
/*
* This choice works...
@@ -480,7 +481,7 @@ cupsResolveConflicts(
if (!changed)
{
- DEBUG_puts("ppdResolveConflicts: Unable to automatically resolve "
+ DEBUG_puts("1ppdResolveConflicts: Unable to automatically resolve "
"constraint!");
goto error;
}
@@ -519,10 +520,10 @@ cupsResolveConflicts(
cupsArrayRestore(ppd->sorted_attrs);
- DEBUG_printf(("cupsResolveConflicts: Returning %d options:", num_newopts));
+ DEBUG_printf(("1cupsResolveConflicts: Returning %d options:", num_newopts));
#ifdef DEBUG
for (i = 0; i < num_newopts; i ++)
- DEBUG_printf(("cupsResolveConflicts: options[%d]: %s=%s", i,
+ DEBUG_printf(("1cupsResolveConflicts: options[%d]: %s=%s", i,
newopts[i].name, newopts[i].value));
#endif /* DEBUG */
@@ -542,7 +543,7 @@ cupsResolveConflicts(
cupsArrayRestore(ppd->sorted_attrs);
- DEBUG_puts("cupsResolveConflicts: Unable to resolve conflicts!");
+ DEBUG_puts("1cupsResolveConflicts: Unable to resolve conflicts!");
return (0);
}
@@ -628,6 +629,9 @@ ppdInstallableConflict(
cups_array_t *active; /* Active conflicts */
+ DEBUG_printf(("2ppdInstallableConflict(ppd=%p, option=\"%s\", choice=\"%s\")",
+ ppd, option, choice));
+
/*
* Range check input...
*/
@@ -694,6 +698,8 @@ ppd_load_constraints(ppd_file_t *ppd) /* I - PPD file */
*ptr; /* Pointer into option or choice */
+ DEBUG_printf(("7ppd_load_constraints(ppd=%p)", ppd));
+
/*
* Create an array to hold the constraint data...
*/
@@ -737,7 +743,7 @@ ppd_load_constraints(ppd_file_t *ppd) /* I - PPD file */
if ((consts = calloc(1, sizeof(_ppd_cups_uiconsts_t))) == NULL)
{
- DEBUG_puts("ppd_load_constraints: Unable to allocate memory for "
+ DEBUG_puts("8ppd_load_constraints: Unable to allocate memory for "
"UIConstraints!");
return;
}
@@ -745,7 +751,7 @@ ppd_load_constraints(ppd_file_t *ppd) /* I - PPD file */
if ((constptr = calloc(2, sizeof(_ppd_cups_uiconst_t))) == NULL)
{
free(consts);
- DEBUG_puts("ppd_load_constraints: Unable to allocate memory for "
+ DEBUG_puts("8ppd_load_constraints: Unable to allocate memory for "
"UIConstraints!");
return;
}
@@ -775,7 +781,7 @@ ppd_load_constraints(ppd_file_t *ppd) /* I - PPD file */
if (!constptr[0].option || (!constptr[0].choice && oldconst->choice1[0]))
{
- DEBUG_printf(("ppd_load_constraints: Unknown option *%s %s!\n",
+ DEBUG_printf(("8ppd_load_constraints: Unknown option *%s %s!",
oldconst->option1, oldconst->choice1));
free(consts->constraints);
free(consts);
@@ -800,7 +806,7 @@ ppd_load_constraints(ppd_file_t *ppd) /* I - PPD file */
if (!constptr[1].option || (!constptr[1].choice && oldconst->choice2[0]))
{
- DEBUG_printf(("ppd_load_constraints: Unknown option *%s %s!\n",
+ DEBUG_printf(("8ppd_load_constraints: Unknown option *%s %s!",
oldconst->option2, oldconst->choice2));
free(consts->constraints);
free(consts);
@@ -826,7 +832,7 @@ ppd_load_constraints(ppd_file_t *ppd) /* I - PPD file */
{
if (!constattr->value)
{
- DEBUG_puts("ppd_load_constraints: Bad cupsUIConstraints value!");
+ DEBUG_puts("8ppd_load_constraints: Bad cupsUIConstraints value!");
continue;
}
@@ -836,13 +842,13 @@ ppd_load_constraints(ppd_file_t *ppd) /* I - PPD file */
if (i == 0)
{
- DEBUG_puts("ppd_load_constraints: Bad cupsUIConstraints value!");
+ DEBUG_puts("8ppd_load_constraints: Bad cupsUIConstraints value!");
continue;
}
if ((consts = calloc(1, sizeof(_ppd_cups_uiconsts_t))) == NULL)
{
- DEBUG_puts("ppd_load_constraints: Unable to allocate memory for "
+ DEBUG_puts("8ppd_load_constraints: Unable to allocate memory for "
"cupsUIConstraints!");
return;
}
@@ -850,7 +856,7 @@ ppd_load_constraints(ppd_file_t *ppd) /* I - PPD file */
if ((constptr = calloc(i, sizeof(_ppd_cups_uiconst_t))) == NULL)
{
free(consts);
- DEBUG_puts("ppd_load_constraints: Unable to allocate memory for "
+ DEBUG_puts("8ppd_load_constraints: Unable to allocate memory for "
"cupsUIConstraints!");
return;
}
@@ -901,7 +907,7 @@ ppd_load_constraints(ppd_file_t *ppd) /* I - PPD file */
if (!constptr->option || (!constptr->choice && choice[0]))
{
- DEBUG_printf(("ppd_load_constraints: Unknown option *%s %s!\n",
+ DEBUG_printf(("8ppd_load_constraints: Unknown option *%s %s!",
option, choice));
break;
}
@@ -940,13 +946,14 @@ ppd_test_constraints(
const char *value; /* Current value */
- DEBUG_printf(("ppd_test_constraints(ppd=%p, num_options=%d, options=%p, "
- "which=%d)\n", ppd, num_options, options, which));
+ DEBUG_printf(("7ppd_test_constraints(ppd=%p, option=\"%s\", choice=\"%s\", "
+ "num_options=%d, options=%p, which=%d)", ppd, option, choice,
+ num_options, options, which));
if (!ppd->cups_uiconstraints)
ppd_load_constraints(ppd);
- DEBUG_printf(("ppd_test_constraints: %d constraints!\n",
+ DEBUG_printf(("9ppd_test_constraints: %d constraints!",
cupsArrayCount(ppd->cups_uiconstraints)));
cupsArraySave(ppd->marked);
@@ -955,9 +962,9 @@ ppd_test_constraints(
consts;
consts = (_ppd_cups_uiconsts_t *)cupsArrayNext(ppd->cups_uiconstraints))
{
- DEBUG_printf(("ppd_test_constraints: installable=%d, resolver=\"%s\", "
+ DEBUG_printf(("9ppd_test_constraints: installable=%d, resolver=\"%s\", "
"num_constraints=%d option1=\"%s\", choice1=\"%s\", "
- "option2=\"%s\", choice2=\"%s\", ...\n",
+ "option2=\"%s\", choice2=\"%s\", ...",
consts->installable, consts->resolver, consts->num_constraints,
consts->constraints[0].option->keyword,
consts->constraints[0].choice ?
@@ -966,16 +973,35 @@ ppd_test_constraints(
consts->constraints[1].choice ?
consts->constraints[1].choice->choice : ""));
- if (which != _PPD_ALL_CONSTRAINTS && which != consts->installable)
- continue;
+ if (consts->installable && which < _PPD_INSTALLABLE_CONSTRAINTS)
+ continue; /* Skip installable option constraint */
+
+ if (!consts->installable && which == _PPD_INSTALLABLE_CONSTRAINTS)
+ continue; /* Skip non-installable option constraint */
+
+ if (which == _PPD_OPTION_CONSTRAINTS && option)
+ {
+ /*
+ * Skip constraints that do not involve the current option...
+ */
+
+ for (i = consts->num_constraints, constptr = consts->constraints;
+ i > 0;
+ i --, constptr ++)
+ if (!strcasecmp(constptr->option->keyword, option))
+ break;
+
+ if (!i)
+ continue;
+ }
- DEBUG_puts("ppd_test_constraints: Testing...");
+ DEBUG_puts("9ppd_test_constraints: Testing...");
for (i = consts->num_constraints, constptr = consts->constraints;
i > 0;
i --, constptr ++)
{
- DEBUG_printf(("ppd_test_constraints: %s=%s?\n", constptr->option->keyword,
+ DEBUG_printf(("9ppd_test_constraints: %s=%s?", constptr->option->keyword,
constptr->choice ? constptr->choice->choice : ""));
if (constptr->choice &&
@@ -1011,7 +1037,7 @@ ppd_test_constraints(
if (!value || strcasecmp(value, constptr->choice->choice))
{
- DEBUG_puts("ppd_test_constraints: NO");
+ DEBUG_puts("9ppd_test_constraints: NO");
break;
}
}
@@ -1026,7 +1052,7 @@ ppd_test_constraints(
if (strcasecmp(value, constptr->choice->choice))
{
- DEBUG_puts("ppd_test_constraints: NO");
+ DEBUG_puts("9ppd_test_constraints: NO");
break;
}
}
@@ -1038,13 +1064,13 @@ ppd_test_constraints(
if (strcasecmp(value, constptr->choice->choice))
{
- DEBUG_puts("ppd_test_constraints: NO");
+ DEBUG_puts("9ppd_test_constraints: NO");
break;
}
}
else if (!constptr->choice->marked)
{
- DEBUG_puts("ppd_test_constraints: NO");
+ DEBUG_puts("9ppd_test_constraints: NO");
break;
}
}
@@ -1054,7 +1080,7 @@ ppd_test_constraints(
if (!strcasecmp(choice, "None") || !strcasecmp(choice, "Off") ||
!strcasecmp(choice, "False"))
{
- DEBUG_puts("ppd_test_constraints: NO");
+ DEBUG_puts("9ppd_test_constraints: NO");
break;
}
}
@@ -1064,7 +1090,7 @@ ppd_test_constraints(
if (!strcasecmp(value, "None") || !strcasecmp(value, "Off") ||
!strcasecmp(value, "False"))
{
- DEBUG_puts("ppd_test_constraints: NO");
+ DEBUG_puts("9ppd_test_constraints: NO");
break;
}
}
@@ -1078,7 +1104,7 @@ ppd_test_constraints(
!strcasecmp(marked->choice, "Off") ||
!strcasecmp(marked->choice, "False")))
{
- DEBUG_puts("ppd_test_constraints: NO");
+ DEBUG_puts("9ppd_test_constraints: NO");
break;
}
}
@@ -1090,13 +1116,13 @@ ppd_test_constraints(
active = cupsArrayNew(NULL, NULL);
cupsArrayAdd(active, consts);
- DEBUG_puts("ppd_test_constraints: Added...");
+ DEBUG_puts("9ppd_test_constraints: Added...");
}
}
cupsArrayRestore(ppd->marked);
- DEBUG_printf(("ppd_test_constraints: Found %d active constraints!\n",
+ DEBUG_printf(("8ppd_test_constraints: Found %d active constraints!",
cupsArrayCount(active)));
return (active);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 21:48:34 +0000