From 73416a1cdf29bc7b4c8279e81baaed1c90e32e63 Mon Sep 17 00:00:00 2001 From: ManasBagul23 Date: Thu, 5 Nov 2026 12:05:11 +0530 Subject: [PATCH] ppd-cache: fix inverted PWG-to-PPD comparisons for source and type ppdPwgInputSlotForSource() and ppdPwgMediaTypeForType() ran their whole if/else-if chain on the raw, un-negated result of _ppd_strcasecmp(), which returns 0 for a match (standard strcasecmp semantics) - the opposite of what a truthy if-condition needs. Every other comparison in this file already negates it (!_ppd_strcasecmp(...)); these two functions were the only ones that didn't, so they picked the PPD InputSlot/MediaType name for the wrong PWG keyword in almost every case, e.g. media-source "main" got mapped to "Multipurpose" instead of "Cassette". Negate the comparisons like everywhere else. --- ppd/ppd-cache.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/ppd/ppd-cache.c b/ppd/ppd-cache.c index a4ee789b..09c119cc 100644 --- a/ppd/ppd-cache.c +++ b/ppd/ppd-cache.c @@ -4584,27 +4584,27 @@ ppdPwgInputSlotForSource( if (!media_source || !name || namesize < PPD_MAX_NAME) return (NULL); - if (_ppd_strcasecmp(media_source, "main")) + if (!_ppd_strcasecmp(media_source, "main")) strlcpy(name, "Cassette", namesize); - else if (_ppd_strcasecmp(media_source, "alternate")) + else if (!_ppd_strcasecmp(media_source, "alternate")) strlcpy(name, "Multipurpose", namesize); - else if (_ppd_strcasecmp(media_source, "large-capacity")) + else if (!_ppd_strcasecmp(media_source, "large-capacity")) strlcpy(name, "LargeCapacity", namesize); - else if (_ppd_strcasecmp(media_source, "bottom")) + else if (!_ppd_strcasecmp(media_source, "bottom")) strlcpy(name, "Lower", namesize); - else if (_ppd_strcasecmp(media_source, "middle")) + else if (!_ppd_strcasecmp(media_source, "middle")) strlcpy(name, "Middle", namesize); - else if (_ppd_strcasecmp(media_source, "top")) + else if (!_ppd_strcasecmp(media_source, "top")) strlcpy(name, "Upper", namesize); - else if (_ppd_strcasecmp(media_source, "rear")) + else if (!_ppd_strcasecmp(media_source, "rear")) strlcpy(name, "Rear", namesize); - else if (_ppd_strcasecmp(media_source, "side")) + else if (!_ppd_strcasecmp(media_source, "side")) strlcpy(name, "Side", namesize); - else if (_ppd_strcasecmp(media_source, "envelope")) + else if (!_ppd_strcasecmp(media_source, "envelope")) strlcpy(name, "Envelope", namesize); - else if (_ppd_strcasecmp(media_source, "main-roll")) + else if (!_ppd_strcasecmp(media_source, "main-roll")) strlcpy(name, "Roll", namesize); - else if (_ppd_strcasecmp(media_source, "alternate-roll")) + else if (!_ppd_strcasecmp(media_source, "alternate-roll")) strlcpy(name, "Roll2", namesize); else ppdPwgPpdizeName(media_source, name, namesize); @@ -4631,29 +4631,29 @@ ppdPwgMediaTypeForType( if (!media_type || !name || namesize < PPD_MAX_NAME) return (NULL); - if (_ppd_strcasecmp(media_type, "auto")) + if (!_ppd_strcasecmp(media_type, "auto")) strlcpy(name, "Auto", namesize); - else if (_ppd_strcasecmp(media_type, "cardstock")) + else if (!_ppd_strcasecmp(media_type, "cardstock")) strlcpy(name, "Cardstock", namesize); - else if (_ppd_strcasecmp(media_type, "envelope")) + else if (!_ppd_strcasecmp(media_type, "envelope")) strlcpy(name, "Envelope", namesize); - else if (_ppd_strcasecmp(media_type, "photographic-glossy")) + else if (!_ppd_strcasecmp(media_type, "photographic-glossy")) strlcpy(name, "Glossy", namesize); - else if (_ppd_strcasecmp(media_type, "photographic-high-gloss")) + else if (!_ppd_strcasecmp(media_type, "photographic-high-gloss")) strlcpy(name, "HighGloss", namesize); - else if (_ppd_strcasecmp(media_type, "photographic-matte")) + else if (!_ppd_strcasecmp(media_type, "photographic-matte")) strlcpy(name, "Matte", namesize); - else if (_ppd_strcasecmp(media_type, "stationery")) + else if (!_ppd_strcasecmp(media_type, "stationery")) strlcpy(name, "Plain", namesize); - else if (_ppd_strcasecmp(media_type, "stationery-coated")) + else if (!_ppd_strcasecmp(media_type, "stationery-coated")) strlcpy(name, "Coated", namesize); - else if (_ppd_strcasecmp(media_type, "stationery-inkjet")) + else if (!_ppd_strcasecmp(media_type, "stationery-inkjet")) strlcpy(name, "Inkjet", namesize); - else if (_ppd_strcasecmp(media_type, "stationery-letterhead")) + else if (!_ppd_strcasecmp(media_type, "stationery-letterhead")) strlcpy(name, "Letterhead", namesize); - else if (_ppd_strcasecmp(media_type, "stationery-preprinted")) + else if (!_ppd_strcasecmp(media_type, "stationery-preprinted")) strlcpy(name, "Preprinted", namesize); - else if (_ppd_strcasecmp(media_type, "transparency")) + else if (!_ppd_strcasecmp(media_type, "transparency")) strlcpy(name, "Transparency", namesize); else ppdPwgPpdizeName(media_type, name, namesize);