From 87fbb7092b8f8b2f0db0f361c3d625e19de57cd9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 4 Jul 2001 07:15:53 +0000 Subject: The big character set handling changeover! This commit gets rid of all our old codepage handling and replaces it with iconv. All internal strings in Samba are now in "unix" charset, which may be multi-byte. See internals.doc and my posting to samba-technical for a more complete explanation. (This used to be commit debb471267960e56005a741817ebd227ecfc512a) --- source3/printing/print_generic.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'source3/printing/print_generic.c') diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c index ef38d26493..3e5753583e 100644 --- a/source3/printing/print_generic.c +++ b/source3/printing/print_generic.c @@ -83,8 +83,6 @@ static int print_run_command(int snum,char *command, int *outfd, ...) pstring_sub(syscmd, "%p", p); standard_sub_snum(snum,syscmd); - /* Convert script args to unix-codepage */ - dos_to_unix(syscmd, True); ret = smbrun(syscmd,outfd); DEBUG(3,("Running the command `%s' gave %d\n",syscmd,ret)); @@ -195,9 +193,7 @@ static int generic_queue_get(int snum, print_queue_struct **q, print_status_stru print_queue_struct *queue = NULL; fstring printer_name; - /* Convert printer name (i.e. share name) to unix-codepage */ fstrcpy(printer_name, lp_servicename(snum)); - dos_to_unix(printer_name, True); print_run_command(snum, lp_lpqcommand(snum), &fd, NULL); @@ -208,7 +204,7 @@ static int generic_queue_get(int snum, print_queue_struct **q, print_status_stru } numlines = 0; - qlines = fd_lines_load(fd, &numlines, True); + qlines = fd_lines_load(fd, &numlines); close(fd); /* turn the lpq output into a series of job structures */ -- cgit