ppd-cache.c: Fix generating cupsUrfSupported (fixes #952)

The PPD keyword got the option values concatenated together without
commas, which broke filter processing in libcupsfilters

Sometimes more commas better commas :)

diff --git a/CHANGES.md b/CHANGES.md
index c8349081d4c1ff4085116cabbe1333a2b600fdb9..c10fdd0c3581e0debbd88dda83b6dbd217438938 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,7 @@ CHANGES - OpenPrinting CUPS 2.4.9 - (TBA)
 Changes in CUPS v2.4.9 (TBA)
 ----------------------------
 
+- Fixed creating of `cupsUrfSupported` PPD keyword (Issue #952)
 - Fixed searching for destinations in web ui (Issue #954)
 - Fixed TLS negotiation using OpenSSL with servers that require the TLS SNI
   extension.

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 3650f40f0254afd99908e626814c7ac0f08cb572..e750fccd482bd97498c29804083a77f0f09483ee 100644 (file)
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -3511,7 +3511,7 @@ _ppdCreateFromIPP2(
     for (i = 0, count = ippGetCount(attr); i < count; i ++)
     {
       keyword = ippGetString(attr, i, NULL);
-      cupsFilePrintf(fp, "%s%s", keyword, i ? "" : ",");
+      cupsFilePrintf(fp, "%s%s", keyword, i != count - 1 ? "," : "");
     }
     cupsFilePuts(fp, "\"\n");
   }