221 lines
9.5 KiB
Diff
221 lines
9.5 KiB
Diff
|
diff -up cups-2.3.3op2/cups/ppd-cache.c.quote-ppd-strings cups-2.3.3op2/cups/ppd-cache.c
|
||
|
|
--- cups-2.3.3op2/cups/ppd-cache.c.quote-ppd-strings 2024-09-30 17:24:43.345405200 +0200
|
||
|
|
+++ cups-2.3.3op2/cups/ppd-cache.c 2024-09-30 17:29:35.752595925 +0200
|
||
|
|
@@ -29,6 +29,7 @@
|
||
|
|
*/
|
||
|
|
|
||
|
|
static int cups_get_url(http_t **http, const char *url, char *name, size_t namesize);
|
||
|
|
+static void ppd_put_string(cups_file_t *fp, cups_lang_t *lang, cups_array_t *strings, const char *ppd_option, const char *ppd_choice, const char *pwg_msgid);
|
||
|
|
static void pwg_add_finishing(cups_array_t *finishings, ipp_finishings_t template, const char *name, const char *value);
|
||
|
|
static void pwg_add_message(cups_array_t *a, const char *msg, const char *str);
|
||
|
|
static int pwg_compare_finishings(_pwg_finishings_t *a, _pwg_finishings_t *b);
|
||
|
|
@@ -3211,7 +3212,7 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
if ((attr = ippFindAttribute(response, "printer-charge-info-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr))
|
||
|
|
cupsFilePrintf(fp, "*cupsChargeInfoURI: \"%s\"\n", ippGetString(attr, 0, NULL));
|
||
|
|
|
||
|
|
- if ((attr = ippFindAttribute(response, "printer-strings-uri", IPP_TAG_URI)) != NULL)
|
||
|
|
+ if ((attr = ippFindAttribute(response, "printer-strings-uri", IPP_TAG_URI)) != NULL && ippValidateAttribute(attr))
|
||
|
|
{
|
||
|
|
http_t *http = NULL; /* Connection to printer */
|
||
|
|
char stringsfile[1024]; /* Temporary strings file */
|
||
|
|
@@ -3768,13 +3769,16 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
cupsFilePrintf(fp, "*DefaultInputSlot: %s\n", ppdname);
|
||
|
|
|
||
|
|
for (j = 0; j < (int)(sizeof(sources) / sizeof(sources[0])); j ++)
|
||
|
|
+ {
|
||
|
|
if (!strcmp(sources[j], keyword))
|
||
|
|
{
|
||
|
|
snprintf(msgid, sizeof(msgid), "media-source.%s", keyword);
|
||
|
|
+
|
||
|
|
cupsFilePrintf(fp, "*InputSlot %s: \"<</MediaPosition %d>>setpagedevice\"\n", ppdname, j);
|
||
|
|
- cupsFilePrintf(fp, "*%s.InputSlot %s/%s: \"\"\n", lang->language, ppdname, _cupsLangString(lang, msgid));
|
||
|
|
+ ppd_put_string(fp, lang, strings, "InputSlot", ppdname, msgid);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
cupsFilePuts(fp, "*CloseUI: *InputSlot\n");
|
||
|
|
}
|
||
|
|
@@ -3800,12 +3804,9 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
pwg_ppdize_name(keyword, ppdname, sizeof(ppdname));
|
||
|
|
|
||
|
|
snprintf(msgid, sizeof(msgid), "media-type.%s", keyword);
|
||
|
|
- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr))
|
||
|
|
- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid)
|
||
|
|
- msgstr = keyword;
|
||
|
|
|
||
|
|
cupsFilePrintf(fp, "*MediaType %s: \"<</MediaType(%s)>>setpagedevice\"\n", ppdname, ppdname);
|
||
|
|
- cupsFilePrintf(fp, "*%s.MediaType %s/%s: \"\"\n", lang->language, ppdname, msgstr);
|
||
|
|
+ ppd_put_string(fp, lang, strings, "MediaType", ppdname, msgid);
|
||
|
|
}
|
||
|
|
cupsFilePuts(fp, "*CloseUI: *MediaType\n");
|
||
|
|
}
|
||
|
|
@@ -4035,12 +4036,9 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
pwg_ppdize_name(keyword, ppdname, sizeof(ppdname));
|
||
|
|
|
||
|
|
snprintf(msgid, sizeof(msgid), "output-bin.%s", keyword);
|
||
|
|
- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr))
|
||
|
|
- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid)
|
||
|
|
- msgstr = keyword;
|
||
|
|
|
||
|
|
cupsFilePrintf(fp, "*OutputBin %s: \"\"\n", ppdname);
|
||
|
|
- cupsFilePrintf(fp, "*%s.OutputBin %s/%s: \"\"\n", lang->language, ppdname, msgstr);
|
||
|
|
+ ppd_put_string(fp, lang, strings, "OutputBin", ppdname, msgid);
|
||
|
|
|
||
|
|
if ((tray_ptr = ippGetOctetString(trays, i, &tray_len)) != NULL)
|
||
|
|
{
|
||
|
|
@@ -4159,9 +4157,6 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
cupsArrayAdd(names, (char *)keyword);
|
||
|
|
|
||
|
|
snprintf(msgid, sizeof(msgid), "finishings.%d", value);
|
||
|
|
- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr))
|
||
|
|
- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid)
|
||
|
|
- msgstr = keyword;
|
||
|
|
|
||
|
|
if (value >= IPP_FINISHINGS_NONE && value <= IPP_FINISHINGS_LAMINATE)
|
||
|
|
ppd_keyword = base_keywords[value - IPP_FINISHINGS_NONE];
|
||
|
|
@@ -4176,7 +4171,7 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
continue;
|
||
|
|
|
||
|
|
cupsFilePrintf(fp, "*StapleLocation %s: \"\"\n", ppd_keyword);
|
||
|
|
- cupsFilePrintf(fp, "*%s.StapleLocation %s/%s: \"\"\n", lang->language, ppd_keyword, msgstr);
|
||
|
|
+ ppd_put_string(fp, lang, strings, "StapleLocation", ppd_keyword, msgid);
|
||
|
|
cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*StapleLocation %s\"\n", value, keyword, ppd_keyword);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -4239,9 +4234,6 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
cupsArrayAdd(names, (char *)keyword);
|
||
|
|
|
||
|
|
snprintf(msgid, sizeof(msgid), "finishings.%d", value);
|
||
|
|
- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr))
|
||
|
|
- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid)
|
||
|
|
- msgstr = keyword;
|
||
|
|
|
||
|
|
if (value >= IPP_FINISHINGS_NONE && value <= IPP_FINISHINGS_LAMINATE)
|
||
|
|
ppd_keyword = base_keywords[value - IPP_FINISHINGS_NONE];
|
||
|
|
@@ -4256,7 +4248,7 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
continue;
|
||
|
|
|
||
|
|
cupsFilePrintf(fp, "*FoldType %s: \"\"\n", ppd_keyword);
|
||
|
|
- cupsFilePrintf(fp, "*%s.FoldType %s/%s: \"\"\n", lang->language, ppd_keyword, msgstr);
|
||
|
|
+ ppd_put_string(fp, lang, strings, "FoldType", ppd_keyword, msgid);
|
||
|
|
cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*FoldType %s\"\n", value, keyword, ppd_keyword);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -4327,9 +4319,6 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
cupsArrayAdd(names, (char *)keyword);
|
||
|
|
|
||
|
|
snprintf(msgid, sizeof(msgid), "finishings.%d", value);
|
||
|
|
- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr))
|
||
|
|
- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid)
|
||
|
|
- msgstr = keyword;
|
||
|
|
|
||
|
|
if (value >= IPP_FINISHINGS_NONE && value <= IPP_FINISHINGS_LAMINATE)
|
||
|
|
ppd_keyword = base_keywords[value - IPP_FINISHINGS_NONE];
|
||
|
|
@@ -4344,7 +4333,7 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
continue;
|
||
|
|
|
||
|
|
cupsFilePrintf(fp, "*PunchMedia %s: \"\"\n", ppd_keyword);
|
||
|
|
- cupsFilePrintf(fp, "*%s.PunchMedia %s/%s: \"\"\n", lang->language, ppd_keyword, msgstr);
|
||
|
|
+ ppd_put_string(fp, lang, strings, "PunchMedia", ppd_keyword, msgid);
|
||
|
|
cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*PunchMedia %s\"\n", value, keyword, ppd_keyword);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -4415,9 +4404,6 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
cupsArrayAdd(names, (char *)keyword);
|
||
|
|
|
||
|
|
snprintf(msgid, sizeof(msgid), "finishings.%d", value);
|
||
|
|
- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr))
|
||
|
|
- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid)
|
||
|
|
- msgstr = keyword;
|
||
|
|
|
||
|
|
if (value == IPP_FINISHINGS_TRIM)
|
||
|
|
ppd_keyword = "Auto";
|
||
|
|
@@ -4425,7 +4411,7 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
ppd_keyword = trim_keywords[value - IPP_FINISHINGS_TRIM_AFTER_PAGES];
|
||
|
|
|
||
|
|
cupsFilePrintf(fp, "*CutMedia %s: \"\"\n", ppd_keyword);
|
||
|
|
- cupsFilePrintf(fp, "*%s.CutMedia %s/%s: \"\"\n", lang->language, ppd_keyword, msgstr);
|
||
|
|
+ ppd_put_string(fp, lang, strings, "CutMedia", ppd_keyword, msgid);
|
||
|
|
cupsFilePrintf(fp, "*cupsIPPFinishings %d/%s: \"*CutMedia %s\"\n", value, keyword, ppd_keyword);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -4467,9 +4453,6 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
pwg_ppdize_name(keyword, ppdname, sizeof(ppdname));
|
||
|
|
|
||
|
|
snprintf(msgid, sizeof(msgid), "finishing-template.%s", keyword);
|
||
|
|
- if ((msgstr = _cupsLangString(lang, msgid)) == msgid || !strcmp(msgid, msgstr))
|
||
|
|
- if ((msgstr = _cupsMessageLookup(strings, msgid)) == msgid)
|
||
|
|
- msgstr = keyword;
|
||
|
|
|
||
|
|
cupsFilePrintf(fp, "*cupsFinishingTemplate %s: \"\n", ppdname);
|
||
|
|
for (finishing_attr = ippFirstAttribute(finishing_col); finishing_attr; finishing_attr = ippNextAttribute(finishing_col))
|
||
|
|
@@ -4484,7 +4467,7 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
}
|
||
|
|
}
|
||
|
|
cupsFilePuts(fp, "\"\n");
|
||
|
|
- cupsFilePrintf(fp, "*%s.cupsFinishingTemplate %s/%s: \"\"\n", lang->language, ppdname, msgstr);
|
||
|
|
+ ppd_put_string(fp, lang, strings, "cupsFinishingTemplate", ppdname, msgid);
|
||
|
|
cupsFilePuts(fp, "*End\n");
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -4811,11 +4794,9 @@ _ppdCreateFromIPP(char *buffer, /* I -
|
||
|
|
|
||
|
|
cupsFilePuts(fp, "\"\n*End\n");
|
||
|
|
|
||
|
|
- if ((localized_name = _cupsMessageLookup(strings, preset_name)) != preset_name)
|
||
|
|
- {
|
||
|
|
- pwg_ppdize_name(preset_name, ppdname, sizeof(ppdname));
|
||
|
|
- cupsFilePrintf(fp, "*%s.APPrinterPreset %s/%s: \"\"\n", lang->language, ppdname, localized_name);
|
||
|
|
- }
|
||
|
|
+ snprintf(msgid, sizeof(msgid), "preset-name.%s", preset_name);
|
||
|
|
+ pwg_ppdize_name(preset_name, ppdname, sizeof(ppdname));
|
||
|
|
+ ppd_put_string(fp, lang, strings, "APPrinterPreset", ppdname, msgid);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -5054,6 +5035,43 @@ cups_get_url(http_t **http, /* IO -
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
+/*
|
||
|
|
+ * 'ppd_put_strings()' - Write localization attributes to a PPD file.
|
||
|
|
+ */
|
||
|
|
+
|
||
|
|
+static void
|
||
|
|
+ppd_put_string(cups_file_t *fp, /* I - PPD file */
|
||
|
|
+ cups_lang_t *lang, /* I - Language */
|
||
|
|
+ cups_array_t *strings, /* I - Strings */
|
||
|
|
+ const char *ppd_option,/* I - PPD option */
|
||
|
|
+ const char *ppd_choice,/* I - PPD choice */
|
||
|
|
+ const char *pwg_msgid) /* I - PWG message ID */
|
||
|
|
+{
|
||
|
|
+ const char *text; /* Localized text */
|
||
|
|
+
|
||
|
|
+
|
||
|
|
+ if ((text = _cupsLangString(lang, pwg_msgid)) == pwg_msgid || !strcmp(pwg_msgid, text))
|
||
|
|
+ {
|
||
|
|
+ if ((text = _cupsMessageLookup(strings, pwg_msgid)) == pwg_msgid)
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ // Add the first line of localized text...
|
||
|
|
+ cupsFilePrintf(fp, "*%s.%s %s/", lang->language, ppd_option, ppd_choice);
|
||
|
|
+ while (*text && *text != '\n')
|
||
|
|
+ {
|
||
|
|
+ // Escape ":" and "<"...
|
||
|
|
+ if (*text == ':' || *text == '<')
|
||
|
|
+ cupsFilePrintf(fp, "<%02X>", *text);
|
||
|
|
+ else
|
||
|
|
+ cupsFilePutChar(fp, *text);
|
||
|
|
+
|
||
|
|
+ text ++;
|
||
|
|
+ }
|
||
|
|
+ cupsFilePuts(fp, ": \"\"\n");
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* 'pwg_add_finishing()' - Add a finishings value.
|
||
|
|
*/
|