13 files changed, 2 insertions, 817 deletions

diff --git a/source3/utils/make_smbcodepage.c b/source3/utils/make_smbcodepage.c
deleted file mode 100644
index 1bd3edc263..0000000000
--- a/source3/utils/make_smbcodepage.c
+++ /dev/null
@@ -1,476 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
-   Create codepage files from codepage_def.XXX files.
-
-   Copyright (C) Jeremy Allison 1997-1999.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-static char *prog_name = NULL;
-
-/*
- * Print program usage and die.
- */
-
-static void codepage_usage(char *progname)
-{
-  fprintf(stderr, "Usage is : %s [c|d] <codepage> <inputfile> <outputfile>\n",
-         progname);
-  exit(1);
-}
-
-/*
- * Read a line from a buffer into a line buffer. Ensure null
- * terminated.
- */
-
-static void read_line( char **buf, char *line_buf, int size)
-{
-  char *p = *buf;
-  int num = 0;
-
-  for(; *p && (*p != '\n'); p++)
-  {
-    if(num < (size - 1))
-      line_buf[num++] = *p;
-  }
-  if(*p)
-    p++; /* Go past the '\n' */
-  line_buf[num] = '\0';
-  *buf = p;
-}
-
-/*
- * Strip comment lines and blank lines from the data.
- * Copies into a new buffer and frees the old.
- * Returns the number of lines copied.
- */
-
-static int clean_data( char **buf, size_t *size)
-{
-  pstring linebuf;
-  char *p = *buf;
-  int num_lines = 0;
-  char *newbuf = (char *)malloc( *size + 1);
-  char *newbuf_p = NULL;
-
-  if(newbuf == NULL)
-  {
-    fprintf(stderr, "%s: malloc fail for size %d.\n", prog_name, *size + 1);
-    exit(1);
-  }
-
-  newbuf_p = newbuf;
-  *newbuf_p = '\0';
-
-  while( *p )
-  {
-    char *cp;
-
-    read_line( &p, linebuf, sizeof(linebuf));
-    /* Null terminate after comment. */
-    if((cp = strchr( linebuf, '#'))!= NULL)
-      *cp = '\0';
-
-    for(cp = linebuf;*cp && isspace(*cp); cp++)
-      ;
-
-    if(*cp == '\0')
-      continue;
-
-    safe_strcpy(newbuf_p, cp, *size - (newbuf_p - newbuf));
-    num_lines++;
-    newbuf_p += (strlen(newbuf_p) + 1);
-  }
-
-  free(*buf);
-  *buf = newbuf;
-  return num_lines;
-}
-
-/*
- * Parse a byte from a codepage file.
- */
-
-static BOOL parse_byte(char *buf, unsigned char *bp)
-{
-  unsigned int b;
-  char *endptr = NULL;
-
-  b = (unsigned int)strtol(buf, &endptr, 0);
-  if(endptr == buf || b > 255)
-    return False;
-
-  *bp = (unsigned char)b;
-  return True;
-}
-
-/*
- * Parse a bool from a codepage file.
- */
-
-static BOOL parse_bool(char *buf, unsigned char *bp)
-{
-  if(isdigit((int)*buf))
-  {
-    char *endptr = NULL;
-
-    *bp = (unsigned char)strtol(buf, &endptr, 0);
-    if(endptr == buf )
-      return False;
-    if(*bp != 0)
-      *bp = 1;
-  } else {
-    if(strcasecmp(buf, "True") && strcasecmp(buf, "False"))
-      return False;
-    if(strcasecmp(buf, "True")==0)
-      *bp = 1;
-    else
-      *bp = 0;
-  }
-  return True;
-}
-
-/*
- * Print a parse error and exit.
- */
-
-static void parse_error(char *buf, char *msg)
-{
-  fprintf(stderr, "%s: %s whilst parsing line \n%s\n", prog_name,
-          msg, buf);
-  exit(1);
-}
-    
-/*
- * Create a compiled codepage file from a codepage definition file.
- */
-
-static int do_compile(int codepage, char *input_file, char *output_file)
-{
-  FILE *fp = NULL;
-  size_t size = 0;
-  char *buf = NULL;
-  char *orig_buf = NULL;
-  char output_buf[CODEPAGE_HEADER_SIZE + 4 * MAXCODEPAGELINES];
-  int num_lines = 0;
-  int i = 0;
-  SMB_STRUCT_STAT st;
-
-  /* Get the size of the input file. Read the entire thing into memory. */
-  if(sys_stat((char *)input_file, &st)!= 0)
-  {
-    fprintf(stderr, "%s: failed to get the file size for file %s. Error was %s\n",
-            prog_name, input_file, strerror(errno));
-    exit(1);
-  }
-
-  size = (uint32)st.st_size;
-
-  /* I don't believe these things should be bigger than 100k :-) */
-  if(size > 100*1024)
-  {
-    fprintf(stderr, "%s: filesize %d is too large for a codepage definition file. \
-The maximum size I will believe is 100k.\n", prog_name, size);
-    exit(1);
-  }
-
-  if((fp = sys_fopen(input_file, "r")) == NULL)
-  {
-    fprintf(stderr, "%s: cannot open file %s for input.\n", prog_name, input_file);
-    exit(1);
-  }
-
-  /* As we will be reading text, allocate one more byte for a '\0' */
-  if((buf = (char *)malloc( size + 1 )) == NULL)
-  {
-    fprintf(stderr, "%s: malloc fail for size %d.\n", prog_name, size + 1);
-    fclose(fp);
-    exit(1);
-  }
-
-  if(fread( buf, 1, size, fp) != size)
-  {
-    fprintf(stderr, "%s: read failed for file %s. Error was %s.\n", prog_name,
-            input_file, strerror(errno));
-    free((char *)buf);
-    fclose(fp);
-    exit(1);
-  }
-
-  /* Null terminate the text read. */
-  buf[size] = '\0';
-
-  /* Go through the data line by line, strip out comments (anything
-     after a '#' to end-of-line) and blank lines. The rest should be
-     the codepage data.
-   */
-
-  num_lines = clean_data( &buf, &size);
-
-  orig_buf = buf; /* Save for free(). */
-
-  /* There can be a maximum of MAXCODEPAGELINES lines. */
-  if(num_lines > MAXCODEPAGELINES)
-  {
-    fprintf(stderr, "%s: There can be a maximum %d lines of data in a codepage \
-definition file. File %s has %d.\n", prog_name, MAXCODEPAGELINES, input_file, num_lines);
-    exit(1);
-  }
-
-  /* Setup the output file header. */
-  SSVAL(output_buf,CODEPAGE_VERSION_OFFSET,CODEPAGE_FILE_VERSION_ID);
-  SSVAL(output_buf,CODEPAGE_CLIENT_CODEPAGE_OFFSET,(uint16)codepage);
-  SIVAL(output_buf,CODEPAGE_LENGTH_OFFSET,(num_lines * 4));
-
-  /* Now convert the lines into the compiled form. */
-  for(i = 0; i < num_lines; i++)
-  {
-    char token_buf[512];
-    char *p = buf;
-    unsigned char b = 0;
-
-    /* Get the 'lower' value. */
-    if(!next_token(&p, token_buf, NULL, sizeof(token_buf)))
-      parse_error(buf, "cannot parse first value");
-    if(!parse_byte( token_buf, &b))
-      parse_error(buf, "first value doesn't resolve to a byte");
-
-    /* Add this to the output buffer. */
-    SCVAL(output_buf,CODEPAGE_HEADER_SIZE+(i*4),b);
-
-    /* Get the 'upper' value. */
-    if(!next_token(&p, token_buf, NULL, sizeof(token_buf)))
-      parse_error(buf, "cannot parse second value");
-    if(!parse_byte( token_buf, &b))
-      parse_error(buf, "second value doesn't resolve to a byte");
-
-    /* Add this to the output buffer. */
-    SCVAL(output_buf,CODEPAGE_HEADER_SIZE+(i*4) + 1,b);
-
-    /* Get the 'upper to lower' value. */
-    if(!next_token(&p, token_buf, NULL, sizeof(token_buf)))
-      parse_error(buf, "cannot parse third value");
-    if(!parse_bool( token_buf, &b))
-      parse_error(buf, "third value doesn't resolve to a boolean");
-
-    /* Add this to the output buffer. */
-    SCVAL(output_buf,CODEPAGE_HEADER_SIZE+(i*4) + 2,b);
-
-    /* Get the 'lower to upper' value. */
-    if(!next_token(&p, token_buf, NULL, sizeof(token_buf)))
-      parse_error(buf, "cannot parse fourth value");
-    if(!parse_bool( token_buf, &b))
-      parse_error(buf, "fourth value doesn't resolve to a boolean");
-
-    /* Add this to the output buffer. */
-    SCVAL(output_buf,CODEPAGE_HEADER_SIZE+(i*4) + 3,b);
-
-    buf += (strlen(buf) + 1);
-  }
-
-  /* Now write out the output_buf. */
-  if((fp = sys_fopen(output_file, "w"))==NULL)
-  {
-    fprintf(stderr, "%s: Cannot open output file %s. Error was %s.\n",
-            prog_name, output_file, strerror(errno));
-    exit(1);
-  }
-
-  if(fwrite(output_buf, 1, CODEPAGE_HEADER_SIZE + (num_lines*4), fp) !=
-         CODEPAGE_HEADER_SIZE + (num_lines*4))
-  {
-    fprintf(stderr, "%s: Cannot write output file %s. Error was %s.\n",
-            prog_name, output_file, strerror(errno));
-    exit(1);
-  }  
-
-  fclose(fp);
-
-  free(orig_buf);
-  return 0;
-}
-
-/*
- * Placeholder for now.
- */
-
-static int do_decompile( int codepage, char *input_file, char *output_file)
-{
-  size_t size = 0;
-  SMB_STRUCT_STAT st;
-  char header_buf[CODEPAGE_HEADER_SIZE];
-  char *buf = NULL;
-  FILE *fp = NULL;
-  int num_lines = 0;
-  int i = 0;
-
-  /* Get the size of the input file. Read the entire thing into memory. */
-  if(sys_stat((char *)input_file, &st)!= 0)
-  {
-    fprintf(stderr, "%s: failed to get the file size for file %s. Error was %s\n",
-            prog_name, input_file, strerror(errno));
-    exit(1);
-  }
-
-  size = (size_t)st.st_size;
-
-  if( size < CODEPAGE_HEADER_SIZE || size > (CODEPAGE_HEADER_SIZE + 256))
-  { 
-    fprintf(stderr, "%s: file %s is an incorrect size for a \
-code page file.\n", prog_name, input_file);
-    exit(1);
-  } 
-  
-  /* Read the first 8 bytes of the codepage file - check
-     the version number and code page number. All the data
-     is held in little endian format.
-   */
-    
-  if((fp = sys_fopen( input_file, "r")) == NULL)
-  { 
-    fprintf(stderr, "%s: cannot open file %s. Error was %s\n",
-              prog_name, input_file, strerror(errno));
-    exit(1);
-  } 
-  
-  if(fread( header_buf, 1, CODEPAGE_HEADER_SIZE, fp)!=CODEPAGE_HEADER_SIZE)
-  { 
-    fprintf(stderr, "%s: cannot read header from file %s. Error was %s\n",
-              prog_name, input_file, strerror(errno));
-    exit(1);
-  } 
-  
-  /* Check the version value */
-  if(SVAL(header_buf,CODEPAGE_VERSION_OFFSET) != CODEPAGE_FILE_VERSION_ID)
-  { 
-    fprintf(stderr, "%s: filename %s has incorrect version id. \
-Needed %hu, got %hu.\n",
-          prog_name, input_file, (uint16)CODEPAGE_FILE_VERSION_ID, 
-          SVAL(header_buf,CODEPAGE_VERSION_OFFSET));
-    exit(1);
-  } 
-  
-  /* Check the codepage matches */
-  if(SVAL(header_buf,CODEPAGE_CLIENT_CODEPAGE_OFFSET) != (uint16)codepage)
-  { 
-    fprintf(stderr, "%s: filename %s has incorrect codepage. \
-Needed %hu, got %hu.\n",
-           prog_name, input_file, (uint16)codepage, 
-           SVAL(header_buf,CODEPAGE_CLIENT_CODEPAGE_OFFSET));
-    exit(1);
-  } 
-  
-  /* Check the length is correct. */
-  if(IVAL(header_buf,CODEPAGE_LENGTH_OFFSET) !=
-                 (unsigned int)(size - CODEPAGE_HEADER_SIZE))
-  { 
-    fprintf(stderr, "%s: filename %s has incorrect size headers. \
-Needed %u, got %u.\n", prog_name, input_file, size - CODEPAGE_HEADER_SIZE,
-               IVAL(header_buf,CODEPAGE_LENGTH_OFFSET));
-    exit(1);
-  } 
-  
-  size -= CODEPAGE_HEADER_SIZE; /* Remove header */
-    
-  /* Make sure the size is a multiple of 4. */
-  if((size % 4 ) != 0)
-  { 
-    fprintf(stderr, "%s: filename %s has a codepage size not a \
-multiple of 4.\n", prog_name, input_file);
-    exit(1);
-  } 
-  
-  /* Allocate space for the code page file and read it all in. */
-  if((buf = (char *)malloc( size )) == NULL)
-  { 
-    fprintf (stderr, "%s: malloc fail for size %d.\n",
-             prog_name, size );
-    exit(1);
-  } 
-  
-  if(fread( buf, 1, size, fp)!=size)
-  { 
-    fprintf(stderr, "%s: read fail on file %s. Error was %s.\n",
-              prog_name, input_file, strerror(errno));
-    exit(1);
-  } 
-  
-  fclose(fp);
-    
-  /* Now dump the codepage into an ascii file. */
-  if((fp = sys_fopen(output_file, "w")) == NULL)
-  {
-    fprintf(stderr, "%s: cannot open file %s. Error was %s\n",
-              prog_name, output_file, strerror(errno));
-    exit(1);
-  } 
-
-  fprintf(fp, "#\n# Codepage definition file for IBM Code Page %d.\n#\n",
-          codepage);
-  fprintf(fp, "# This file was automatically generated.\n#\n");
-  fprintf(fp, "# defines lower->upper mapping.\n");
-  fprintf(fp, "#\n#The columns are :\n# lower\tupper\tu-t-l\tl-t-u\n#\n");
-
-  num_lines = size / 4;
-  for( i = 0; i < num_lines; i++)
-  {
-    fprintf(fp, "0x%02X\t0x%02X\t%s\t%s\n", CVAL(buf, (i*4)), CVAL(buf, (i*4)+1),
-           CVAL(buf, (i*4)+2) ? "True" : "False",
-           CVAL(buf, (i*4)+3) ? "True" : "False");
-  }
-  fclose(fp);
-  return 0;
-}
-
-int main(int argc, char **argv)
-{
-  int codepage = 0;
-  char *input_file = NULL;
-  char *output_file = NULL;
-  BOOL compile = False;
-
-  prog_name = argv[0];
-
-  if(argc != 5)
-    codepage_usage(prog_name);
-
-  if(argv[1][0] != 'c' && argv[1][0] != 'C' && argv[1][0] != 'd' &&
-     argv[1][0] != 'D')
-    codepage_usage(prog_name);
-
-  input_file = argv[3];
-  output_file = argv[4];
-
-  /* Are we compiling or decompiling. */
-  if(argv[1][0] == 'c' || argv[1][0] == 'C')
-    compile = True;
- 
-  /* Convert the second argument into a client codepage value. */
-  if((codepage = atoi(argv[2])) == 0)
-  {
-    fprintf(stderr, "%s: %s is not a valid codepage.\n", prog_name, argv[2]);
-    exit(1);
-  }
-
-  if(compile)
-    return do_compile( codepage, input_file, output_file);
-  else
-    return do_decompile( codepage, input_file, output_file);
-}
diff --git a/source3/utils/make_unicodemap.c b/source3/utils/make_unicodemap.c
deleted file mode 100644
index 3584facbf6..0000000000
--- a/source3/utils/make_unicodemap.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 2.0.x.
-   Create unicode map files from unicode_def.XXX files.
-
-   Copyright (C) Jeremy Allison 1997-1999.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-static char *prog_name = NULL;
-
-/*
- * Print program usage and die.
- */
-
-static void unicode_map_usage(char *progname)
-{
-  fprintf(stderr, "Usage is : %s <codepage> <inputfile> <outputfile>\n",
-         progname);
-  exit(1);
-}
-
-/*
- * Read a line from a buffer into a line buffer. Ensure null
- * terminated.
- */
-
-static void read_line( char **buf, char *line_buf, size_t size)
-{
-  char *p = *buf;
-  size_t num = 0;
-
-  for(; *p && (*p != '\n') && (*p != '\032'); p++) {
-    if(num < (size - 1))
-      line_buf[num++] = *p;
-  }
-  if(*p)
-    p++; /* Go past the '\n' */
-  line_buf[num] = '\0';
-  *buf = p;
-}
-
-/*
- * Strip comment lines and blank lines from the data.
- * Copies into a new buffer and frees the old.
- * Returns the number of lines copied.
- */
-
-static size_t clean_data( char **buf, size_t *size)
-{
-  pstring linebuf;
-  char *p = *buf;
-  size_t num_lines = 0;
-  char *newbuf = (char *)malloc( *size + 1);
-  char *newbuf_p = NULL;
-
-  if(newbuf == NULL) {
-    fprintf(stderr, "%s: malloc fail for size %u.\n", prog_name, (unsigned int)(*size + 1));
-    exit(1);
-  }
-
-  newbuf_p = newbuf;
-  *newbuf_p = '\0';
-
-  while( *p ) {
-    char *cp;
-
-    read_line( &p, linebuf, sizeof(linebuf));
-    /* Null terminate after comment. */
-    if((cp = strchr( linebuf, '#'))!= NULL)
-      *cp = '\0';
-
-    for(cp = linebuf;*cp && isspace(*cp); cp++)
-      ;
-
-    if(*cp == '\0')
-      continue;
-
-    safe_strcpy(newbuf_p, cp, *size - (newbuf_p - newbuf));
-    num_lines++;
-    newbuf_p += (strlen(newbuf_p) + 1);
-  }
-
-  free(*buf);
-  *buf = newbuf;
-  return num_lines;
-}
-
-/*
- * Parse a uint16 from a codepage file.
- */
-
-static BOOL parse_uint16(char *buf, uint16 *uip)
-{
-  unsigned int ui;
-  char *endptr = NULL;
-
-  ui = (unsigned int)strtol(buf, &endptr, 0);
-  if(endptr == buf || ui > 65535)
-    return False;
-
-  *uip = (uint16)ui;
-  return True;
-}
-
-/*
- * Print a parse error and exit.
- */
-
-static void parse_error(const char *buf, const char *input_file, const char *msg)
-{
-  fprintf(stderr, "%s: In file %s : %s whilst parsing line \n%s\n", prog_name,
-          input_file, msg, buf);
-  exit(1);
-}
-    
-/*
- * Create a compiled unicode map file from a unicode map definition file.
- */
-
-static int do_compile(const char *codepage, const char *input_file, const char *output_file)
-{
-  FILE *fp = NULL;
-  size_t size = 0;
-  size_t offset = 0;
-  char *buf = NULL;
-  char *orig_buf = NULL;
-  char *output_buf = NULL;
-  uint16 cp_to_ucs2[65536];
-  uint16 ucs2_to_cp[65536];
-  BOOL multibyte_code_page = False;
-  int num_lines = 0;
-  int i = 0;
-  SMB_STRUCT_STAT st;
-
-  /* Get the size of the input file. Read the entire thing into memory. */
-  if(sys_stat(input_file, &st)!= 0) {
-    fprintf(stderr, "%s: failed to get the file size for file %s. Error was %s\n",
-            prog_name, input_file, strerror(errno));
-    exit(1);
-  }
-
-  size = (size_t)st.st_size;
-
-  if((fp = sys_fopen(input_file, "r")) == NULL) {
-    fprintf(stderr, "%s: cannot open file %s for input.\n", prog_name, input_file);
-    exit(1);
-  }
-
-  /* As we will be reading text, allocate one more byte for a '\0' */
-  if((buf = (char *)malloc( size + 1 )) == NULL) {
-    fprintf(stderr, "%s: malloc fail for size %d.\n", prog_name, size + 1);
-    fclose(fp);
-    exit(1);
-  }
-
-  if(fread( buf, 1, size, fp) != size) {
-    fprintf(stderr, "%s: read failed for file %s. Error was %s.\n", prog_name,
-            input_file, strerror(errno));
-    free((char *)buf);
-    fclose(fp);
-    exit(1);
-  }
-
-  /* Null terminate the text read. */
-  buf[size] = '\0';
-
-  /* Go through the data line by line, strip out comments (anything
-     after a '#' to end-of-line) and blank lines. The rest should be
-     the codepage data.
-   */
-
-  num_lines = clean_data( &buf, &size);
-
-  orig_buf = buf; /* Store for free(). */
-
-  /*
-   * Initialize the output data.
-   */
-
-  memset(cp_to_ucs2, '\0', sizeof(cp_to_ucs2));
-  ucs2_to_cp[0] = 0;
-  for (i = 1; i < 65536; i++)
-    ucs2_to_cp[i] = (uint16)'_';
-
-  /* Now convert the lines into the compiled form. */
-
-  for(i = 0; i < num_lines; i++) {
-    char token_buf[512];
-    char *p = buf;
-    uint16 cp = 0;
-    uint16 ucs2 = 0;
-
-    /* Get the codepage value. */
-    if(!next_token(&p, token_buf, NULL, sizeof(token_buf)))
-      parse_error(buf, input_file, "cannot parse first value");
-
-    if(!parse_uint16( token_buf, &cp))
-      parse_error(buf, input_file, "first value doesn't resolve to an unsigned 16 bit integer");
-
-    if(cp > 255)
-      multibyte_code_page = True;
-
-    /* Get the ucs2 value. */
-
-    if(!next_token(&p, token_buf, NULL, sizeof(token_buf))) {
-
-      /*
-       * Some of the multibyte codepage to unicode map files
-       * list a single byte as a leading multibyte and have no
-       * second value.
-       */
-
-      buf += (strlen(buf) + 1);
-      continue;
-    }
-
-    if(!parse_uint16( token_buf, &ucs2))
-      parse_error(buf, input_file, "second value doesn't resolve to an unsigned 16 bit integer");
-
-    /*
-     * Set up the cross reference in little-endian format.
-     */
-
-    SSVAL(((char *)&cp_to_ucs2[cp]),0,ucs2);
-    SSVAL(((char *)&ucs2_to_cp[ucs2]),0,cp);
-
-    /*
-     * Next line.
-     */
-    buf += (strlen(buf) + 1);
-  }
-
-  size = UNICODE_MAP_HEADER_SIZE + (multibyte_code_page ? (4*65536) : (2*256 + 2*65536));
-
-  if((output_buf = (char *)malloc( size )) == NULL) {
-    fprintf(stderr, "%s: output buffer malloc fail for size %d.\n", prog_name, size);
-    fclose(fp);
-    exit(1);
-  }
-
-  /* Setup the output file header. */
-  SSVAL(output_buf,UNICODE_MAP_VERSION_OFFSET,UNICODE_MAP_FILE_VERSION_ID);
-  memset(&output_buf[UNICODE_MAP_CLIENT_CODEPAGE_OFFSET],'\0',UNICODE_MAP_CODEPAGE_ID_SIZE);
-  safe_strcpy(&output_buf[UNICODE_MAP_CLIENT_CODEPAGE_OFFSET], codepage, UNICODE_MAP_CODEPAGE_ID_SIZE - 1);
-  output_buf[UNICODE_MAP_CLIENT_CODEPAGE_OFFSET+UNICODE_MAP_CODEPAGE_ID_SIZE-1] = '\0';
-
-  offset = UNICODE_MAP_HEADER_SIZE;
-
-  if (multibyte_code_page) {
-    SIVAL(output_buf,UNICODE_MAP_CP_TO_UNICODE_LENGTH_OFFSET,2*65536);
-    memcpy(output_buf+offset, (char *)cp_to_ucs2, 2*65536);
-    offset += 2*65536;
-  } else {
-    SIVAL(output_buf,UNICODE_MAP_CP_TO_UNICODE_LENGTH_OFFSET,2*256);
-    memcpy(output_buf+offset, (char *)cp_to_ucs2, 2*256);
-    offset += 2*256;
-  }
-  SIVAL(output_buf,UNICODE_MAP_UNICODE_TO_CP_LENGTH_OFFSET,65536*2);
-  memcpy(output_buf+offset, (char *)ucs2_to_cp, 2*65536);
-
-  /* Now write out the output_buf. */
-  if((fp = sys_fopen(output_file, "w"))==NULL) {
-    fprintf(stderr, "%s: Cannot open output file %s. Error was %s.\n",
-            prog_name, output_file, strerror(errno));
-    exit(1);
-  }
-
-  if(fwrite(output_buf, 1, size, fp) != size) {
-    fprintf(stderr, "%s: Cannot write output file %s. Error was %s.\n",
-            prog_name, output_file, strerror(errno));
-    exit(1);
-  }  
-
-  fclose(fp);
-  
-  free(orig_buf);
-  free(output_buf);
-  return 0;
-}
-
-int main(int argc, char **argv)
-{
-  const char *codepage = NULL;
-  char *input_file = NULL;
-  char *output_file = NULL;
-
-  prog_name = argv[0];
-
-  if(argc != 4)
-    unicode_map_usage(prog_name);
-
-  codepage = argv[1];
-  input_file = argv[2];
-  output_file = argv[3];
-
-  return do_compile( codepage, input_file, output_file);
-}
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 0f978a6cf3..adb75e6104 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -206,8 +206,6 @@ int main(int argc,char *argv[])
 
   setup_logging(argv[0],True);
 
-  charset_initialise();
-
   while ((opt = getopt(argc, argv, "d:B:U:i:s:SMrhART")) != EOF)
     switch (opt)
       {
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index ef62fe32df..2b1dfe9f92 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -592,8 +592,6 @@ int main (int argc, char **argv)
 	
 	setup_logging("tdbedit", True);
 
-	charset_initialise();
-
 	if (argc < 2)
 
 	{
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 51ae05b52a..9edc35f800 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -836,10 +836,8 @@ You can string acls together with spaces, commas or newlines\n\
 	argv += 2;
 
 	TimeInit();
-	charset_initialise();
 
 	lp_load(servicesf,True,False,False);
-	codepage_initialise(lp_client_code_page());
 	load_interfaces();
 
 	if (getenv("USER")) {
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 27a3b61170..fef4ded218 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -342,7 +342,6 @@ static BOOL do_command(char *dest, char *msg_name, char **params)
 	TimeInit();
 	setup_logging(argv[0],True);
 	
-	charset_initialise();
 	lp_load(servicesf,False,False,False);
 
 	if (!message_init()) exit(1);
diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index db83873e69..8550159955 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -210,8 +210,6 @@ int main(int argc, char *argv[])
 
 	setup_logging(argv[0],True);
   
-	charset_initialise();
-
 	pstrcpy(configfile,CONFIGFILE);
  
 	if (argc < 2) {
diff --git a/source3/utils/smbgroupedit.c b/source3/utils/smbgroupedit.c
index 76624312d5..ffaacca102 100644
--- a/source3/utils/smbgroupedit.c
+++ b/source3/utils/smbgroupedit.c
@@ -220,8 +220,6 @@ int main (int argc, char **argv)
 	
 	setup_logging("groupedit", True);
 
-	charset_initialise();
-
 	if (argc < 2) {
 		usage();
 		return 0;
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 3442efc3a8..ebc588eb64 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -901,8 +901,6 @@ int main(int argc, char **argv)
 	
 	setup_logging("smbpasswd", True);
 	
-	charset_initialise();
-	
 	if(!initialize_password_db(True)) {
 		fprintf(stderr, "Can't setup password database vectors.\n");
 		exit(1);
@@ -927,8 +925,6 @@ int main(int argc, char **argv)
 	}           
 	strupper(global_myname);
 
-	codepage_initialise(lp_client_code_page());
-
 	secrets_init();
 
 	/* Check the effective uid - make sure we are not setuid */
diff --git a/source3/utils/smbw_sample.c b/source3/utils/smbw_sample.c
index db92af9510..7d6eb7f353 100644
--- a/source3/utils/smbw_sample.c
+++ b/source3/utils/smbw_sample.c
@@ -33,9 +33,7 @@ int main(int argc, char *argv[])
 	extern int optind;
 	char *path;
 
-	charset_initialise();
 	lp_load(CONFIGFILE,1,0,0);
-	codepage_initialise(lp_client_code_page());
 	smbw_setup_shared();
 
 	while ((opt = getopt(argc, argv, "W:U:R:d:P:l:hL:")) != EOF) {
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 448239baba..ea683ad19c 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -135,7 +135,7 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 	  else
 		printf("NONE            ");
 
-	  printf(" %s   %s",dos_to_unix(fname,False),
+	  printf(" %s   %s",fname,
              asctime(LocalTime((time_t *)&e->time.tv_sec)));
 	}
 }
@@ -252,8 +252,6 @@ static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void *st
 	TimeInit();
 	setup_logging(argv[0],True);
 	
-	charset_initialise();
-	
 	DEBUGLEVEL = 0;
 	dbf = stderr;
 	
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index b8536d4b9d..c9080e1994 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -180,8 +180,6 @@ int main(int argc, char *argv[])
 
   setup_logging(argv[0],True);
   
-  charset_initialise();
-
   while ((opt = getopt(argc, argv,"shL:t:")) != EOF) {
   switch (opt) {
     case 's':
@@ -270,16 +268,13 @@ Level II oplocks can only be set if oplocks are also set.\n",
     }
   }
 
-  if (*term_code)
-    interpret_coding_system(term_code);
-
   if (argc < 3) {
     if (!silent_mode) {
       printf("Press enter to see a dump of your service definitions\n");
       fflush(stdout);
       getc(stdin);
     }
-    lp_dump(stdout,True, lp_numservices(), _dos_to_unix);
+    lp_dump(stdout,True, lp_numservices());
   }
   
   if (argc >= 3) {
diff --git a/source3/utils/testprns.c b/source3/utils/testprns.c
index c03fa0436a..f8fdcd63a1 100644
--- a/source3/utils/testprns.c
+++ b/source3/utils/testprns.c
@@ -46,8 +46,6 @@ int main(int argc, char *argv[])
 
    setup_logging(argv[0],True);
 
-   charset_initialise();
-
    if (argc < 2 || argc > 3)
       printf("Usage: testprns printername [printcapfile]\n");
    else