Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3410 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups/ppd.c b/cups/ppd.c
index 98e0615d824749cf642db3cdea40793cce46d116..c61325d89d8b497e76501701adb01921d47c6bc6 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.c,v 1.51.2.47 2003/02/25 19:18:24 mike Exp $"
+ * "$Id: ppd.c,v 1.51.2.48 2003/02/28 10:31:13 mike Exp $"
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
@@ -2095,8 +2095,13 @@ ppdOpen(FILE *fp)                        /* I - File to read from */
     {
       char     spec[PPD_MAX_NAME + PPD_MAX_TEXT];
 
-      snprintf(spec, sizeof(spec), "%s/%s", name, text);
-      ppd_add_attr(ppd, keyword, spec, string);
+      if (text[0])
+      {
+        snprintf(spec, sizeof(spec), "%s/%s", name, text);
+        ppd_add_attr(ppd, keyword, spec, string);
+      }
+      else
+        ppd_add_attr(ppd, keyword, name, string);
 
       string = NULL;                   /* Don't free this string below */
     }
@@ -3251,5 +3256,5 @@ ppd_read(FILE *fp,                        /* I - File to read from */
 
 
 /*
- * End of "$Id: ppd.c,v 1.51.2.47 2003/02/25 19:18:24 mike Exp $".
+ * End of "$Id: ppd.c,v 1.51.2.48 2003/02/28 10:31:13 mike Exp $".
  */