r24780: More work allowing libutil to be used by external users.

[kai/samba.git] / source4 / lib / charset / charcnv.c

diff --git a/source4/lib/charset/charcnv.c b/source4/lib/charset/charcnv.c
index f46f861fac1a75e6cc4a6f2f577edad877c7d2a7..fcf29d46475dd05ac048e88a59889ba9f5a2b0fe 100644 (file)
--- a/source4/lib/charset/charcnv.c
+++ b/source4/lib/charset/charcnv.c
@@ -7,7 +7,7 @@
    
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 #include "includes.h"
@@ -38,6 +37,10 @@
  * @sa lib/iconv.c
  */
 
+char *unix_charset = NULL;
+char *dos_charset = NULL;
+char *display_charset = NULL;
+
 /**
  * Return the name of a charset to give to iconv().
  **/
@@ -45,9 +48,9 @@ static const char *charset_name(charset_t ch)
 {
        switch (ch) {
        case CH_UTF16: return "UTF-16LE";
-       case CH_UNIX: return lp_unix_charset();
-       case CH_DOS: return lp_dos_charset();
-       case CH_DISPLAY: return lp_display_charset();
+       case CH_UNIX: return unix_charset;
+       case CH_DOS: return dos_charset;
+       case CH_DISPLAY: return display_charset;
        case CH_UTF8: return "UTF8";
        case CH_UTF16BE: return "UTF-16BE";
        default: