fix problems with using inf files from HP for DesignJet 750C (C3195A)

(This used to be commit 4e258eecf7088d78b285440ca87386987196eaec)

diff --git a/source3/utils/make_printerdef.c b/source3/utils/make_printerdef.c
index ef890163f0473ca83f918fbfb75e7c91d848d105..ce61f460ff33bce6c8acde45387e6279bd53cc53 100644 (file)
--- a/source3/utils/make_printerdef.c
+++ b/source3/utils/make_printerdef.c
@@ -157,7 +157,7 @@ char *find_desc(FILE *fichier,char *text)
     fgets(chaine,255,fichier);
 
     long_desc=strtok(chaine,"=");
-    crap=strtok(NULL,",");
+    crap=strtok(NULL,",\r");
 
     p=long_desc;
     while(*p!='"' && *p!='\0')
@@ -217,6 +217,9 @@ void scan_copyfiles(FILE *fichier, char *chaine)
       }        
       i=0;
       while (*buffer[i]!='\0') {
+       part = &buffer[i][strlen(buffer[i])-1];
+       if (*part == '=')
+         *part = '\0';
         if (strlen(files_to_copy) != 0)
           strcat(files_to_copy,",");
        strcat(files_to_copy,direc);