diff options
| author | Herb Lewis <herb@samba.org> | 1998-01-21 09:17:51 +0000 |
|---|---|---|
| committer | Herb Lewis <herb@samba.org> | 1998-01-21 09:17:51 +0000 |
| commit | 12d50e30ec7d898db43bffec5953c2c414e0a330 (patch) | |
| tree | 8de67c3150915c390f0038b826dfce232a94c52e /source3/utils/make_printerdef.c | |
| parent | c247cc7187380564228c12187f6e37e666762d08 (diff) | |
| download | samba-12d50e30ec7d898db43bffec5953c2c414e0a330.tar.gz samba-12d50e30ec7d898db43bffec5953c2c414e0a330.tar.bz2 samba-12d50e30ec7d898db43bffec5953c2c414e0a330.zip | |
fix problems with using inf files from HP for DesignJet 750C (C3195A)
(This used to be commit 4e258eecf7088d78b285440ca87386987196eaec)
Diffstat (limited to 'source3/utils/make_printerdef.c')
| -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); |