diff options
| author | Jeremy Allison <jra@samba.org> | 2000-12-07 19:26:04 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-12-07 19:26:04 +0000 |
| commit | cf5b71994d6cdb2f81c390579f4a0e676926c6b9 (patch) | |
| tree | ee7f1164bf48be2c95651e21bb88b41ec84859f6 /source3/printing | |
| parent | 0d658c35eb9d8ec400ad0302ee11d489bb59bd77 (diff) | |
| download | samba-cf5b71994d6cdb2f81c390579f4a0e676926c6b9.tar.gz samba-cf5b71994d6cdb2f81c390579f4a0e676926c6b9.tar.bz2 samba-cf5b71994d6cdb2f81c390579f4a0e676926c6b9.zip | |
file_lines_load/file_lines_pload can now optionally convert unix_to_dos()
on read.
Jeremy.
(This used to be commit 76b8dd376d13eb4469417be217c966d54d333367)
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/print_cups.c | 4 | ||||
| -rw-r--r-- | source3/printing/print_svid.c | 4 | ||||
| -rw-r--r-- | source3/printing/printing.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index fff135e2a2..1e45df0c63 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -121,7 +121,7 @@ void cups_printer_fn(void (*fn)(char *, char *)) if (name == NULL) break; - (*fn)(name, make_model); + (*fn)(unix_to_dos(name,False), make_model); } ippDelete(response); @@ -171,7 +171,7 @@ int cups_printername_ok(char *name) ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, language->language); - snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", name); + snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", dos_to_unix(name,False)); ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri); diff --git a/source3/printing/print_svid.c b/source3/printing/print_svid.c index 301f388671..58a1d03f49 100644 --- a/source3/printing/print_svid.c +++ b/source3/printing/print_svid.c @@ -50,7 +50,7 @@ static void populate_printers(void) char **lines; int i; - lines = file_lines_pload("/usr/bin/lpstat -v", NULL); + lines = file_lines_pload("/usr/bin/lpstat -v", NULL, False); if (!lines) return; for (i=0;lines[i];i++) { @@ -107,7 +107,7 @@ void sysv_printer_fn(void (*fn)(char *, char *)) if (printers == NULL) populate_printers(); for (tmp = printers; tmp != NULL; tmp = tmp->next) - (fn)(tmp->name, ""); + (fn)(unix_to_dos(tmp->name,False), ""); } diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 68c371547f..e8dc4d7f34 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -339,7 +339,7 @@ static void print_queue_update(int snum) print_run_command(snum, cmd, tmp_file, NULL); numlines = 0; - qlines = file_lines_load(tmp_file, &numlines); + qlines = file_lines_load(tmp_file, &numlines, True); unlink(tmp_file); /* turn the lpq output into a series of job structures */ |