diff options
| -rw-r--r-- | source3/utils/make_printerdef.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/utils/make_printerdef.c b/source3/utils/make_printerdef.c index ef890163f0..ce61f460ff 100644 --- 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); |