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.

2 files changed, 8 insertions, 21 deletions

diff --git a/source/web/statuspage.c b/source/web/statuspage.c
index f3b07425b78..2efc37a0510 100644
--- a/source/web/statuspage.c
+++ b/source/web/statuspage.c
@@ -68,7 +68,7 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 	printf("</td>");
 
 	printf("<td>%s</td><td>%s</td></tr>\n",
-	       dos_to_unix(fname,False),tstring(e->time.tv_sec));
+	       fname,tstring(e->time.tv_sec));
 }
 
 
diff --git a/source/web/swat.c b/source/web/swat.c
index 8374cd445ab..5dcfe3d658d 100644
--- a/source/web/swat.c
+++ b/source/web/swat.c
@@ -354,13 +354,13 @@ static BOOL load_config(BOOL save_def)
 /****************************************************************************
   write a config file 
 ****************************************************************************/
-static void write_config(FILE *f, BOOL show_defaults, char *(*dos_to_ext)(char *, BOOL))
+static void write_config(FILE *f, BOOL show_defaults)
 {
 	fprintf(f, "# Samba config file created using SWAT\n");
 	fprintf(f, "# from %s (%s)\n", cgi_remote_host(), cgi_remote_addr());
 	fprintf(f, "# Date: %s\n\n", timestring(False));
 	
-	lp_dump(f, show_defaults, iNumNonAutoPrintServices, dos_to_ext);	
+	lp_dump(f, show_defaults, iNumNonAutoPrintServices);
 }
 
 /****************************************************************************
@@ -383,9 +383,9 @@ static int save_reload(int snum)
 		fchmod(fileno(f), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
 	}
 
-	write_config(f, False, _dos_to_unix);
+	write_config(f, False);
 	if (snum)
-		lp_dump_one(f, False, snum, _dos_to_unix);
+		lp_dump_one(f, False, snum);
 	fclose(f);
 
 	lp_killunused(NULL);
@@ -408,10 +408,6 @@ static void commit_parameter(int snum, struct parm_struct *parm, char *v)
 	int i;
 	char *s;
 
-	/* lp_do_parameter() will do unix_to_dos(v). */
-	if(parm->flags & FLAG_DOS_STRING)
-		dos_to_unix(v, True);
-
 	if (snum < 0 && parm->class == P_LOCAL) {
 		/* this handles the case where we are changing a local
 		   variable globally. We need to change the parameter in 
@@ -511,7 +507,7 @@ static void viewconfig_page(void)
 	}
 
 	printf("<p><pre>");
-	write_config(stdout, full_view, _dos_to_dos);
+	write_config(stdout, full_view);
 	printf("</pre>");
 	printf("</form>\n");
 }
@@ -591,12 +587,8 @@ static void shares_page(void)
 	}
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
-		/* add_a_service() which is called by lp_copy_service()
-			will do unix_to_dos() conversion, so we need dos_to_unix() before the lp_copy_service(). */
-		pstring unix_share;
-		pstrcpy(unix_share, dos_to_unix(share, False));
 		load_config(False);
-		lp_copy_service(GLOBALS_SNUM, unix_share);
+		lp_copy_service(GLOBALS_SNUM, share);
 		iNumNonAutoPrintServices = lp_numservices();
 		save_reload(0);
 		snum = lp_servicenumber(share);
@@ -930,12 +922,8 @@ static void printers_page(void)
 	}
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
-		/* add_a_service() which is called by lp_copy_service()
-			will do unix_to_dos() conversion, so we need dos_to_unix() before the lp_copy_service(). */
-		pstring unix_share;
-		pstrcpy(unix_share, dos_to_unix(share, False));
 		load_config(False);
-		lp_copy_service(GLOBALS_SNUM, unix_share);
+		lp_copy_service(GLOBALS_SNUM, share);
 		iNumNonAutoPrintServices = lp_numservices();
 		snum = lp_servicenumber(share);
 		lp_do_parameter(snum, "print ok", "Yes");
@@ -1047,7 +1035,6 @@ static void printers_page(void)
 	}
 
 	setup_logging(argv[0],False);
-	charset_initialise();
 	load_config(True);
 	iNumNonAutoPrintServices = lp_numservices();
 	load_printers();