From 882a17a6ce473ea1dcea4af52583f810cee4fda2 Mon Sep 17 00:00:00 2001
From: szaka <szaka>
Date: Mon, 22 Dec 2008 00:48:29 +0000
Subject: [PATCH] locale= mount option is not used anymore for filename
 characterset conversion

---
 src/ntfs-3g.8.in |  8 ++------
 src/ntfs-3g.c    | 12 +++---------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/ntfs-3g.8.in b/src/ntfs-3g.8.in
index 8ccfe455..b6a49fe0 100644
--- a/src/ntfs-3g.8.in
+++ b/src/ntfs-3g.8.in
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Szabolcs Szakacsits.
 .\" This file may be copied under the terms of the GNU Public License.
 .\"
-.TH NTFS-3G 8 "April 2008" "ntfs-3g @VERSION@"
+.TH NTFS-3G 8 "December 2008" "ntfs-3g @VERSION@"
 .SH NAME
 ntfs-3g \- Third Generation Read/Write NTFS Driver
 .SH SYNOPSIS
@@ -99,11 +99,7 @@ Mount filesystem read\-only. Useful if Windows is hibernated or the
 NTFS journal file is unclean.
 .TP
 .BI locale= value
-This option can be useful if your language specific locale environment 
-variables are not set correctly or at all in your operating system.
-In such cases, the national characters can be made visible by using this 
-option. Please see more information about this topic at
-http://ntfs-3g.org/support.html#locale
+Prints informative and diagnostic messages in the set locale.
 .TP
 .B force
 Force the mounting even if the NTFS logfile is unclean. The logfile 
diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
index fc0776ab..e968314c 100644
--- a/src/ntfs-3g.c
+++ b/src/ntfs-3g.c
@@ -151,11 +151,6 @@ static char def_opts[] = "silent,allow_other,nonempty,";
 static ntfs_fuse_context_t *ctx;
 static u32 ntfs_sequence;
 
-static const char *locale_msg =
-"WARNING: Couldn't set locale to '%s' thus some file names may not\n"
-"         be correct or visible. Please see the potential solution at\n"
-"         http://ntfs-3g.org/support.html#locale\n";
-
 static const char *usage_msg = 
 "\n"
 "%s %s %s %d - Third Generation NTFS Driver\n"
@@ -165,8 +160,8 @@ static const char *usage_msg =
 "\n"
 "Usage:    %s [-o option[,...]] <device|image_file> <mount_point>\n"
 "\n"
-"Options:  ro (read-only mount), force, remove_hiberfile, locale=,\n" 
-"          uid=, gid=, umask=, fmask=, dmask=, streams_interface=.\n"
+"Options:  ro (read-only mount), force, remove_hiberfile, uid=,\n" 
+"          gid=, umask=, fmask=, dmask=, streams_interface=.\n"
 "          Please see the details in the manual.\n"
 "\n"
 "Examples: ntfs-3g -o force /dev/sda1 /mnt/windows\n"
@@ -1817,8 +1812,7 @@ static char *parse_mount_options(const char *orig_opts)
 		} else if (!strcmp(opt, "locale")) {
 			if (missing_option_value(val, "locale"))
 				goto err_exit;
-			if (!setlocale(LC_ALL, val))
-				ntfs_log_error(locale_msg, val);
+			setlocale(LC_ALL, val);
 		} else if (!strcmp(opt, "streams_interface")) {
 			if (missing_option_value(val, "streams_interface"))
 				goto err_exit;