Attachment #2165 for bug #10180

View | Details | Raw Unified | Return to bug 10180
Collapse All | Expand All




#include "utils.h"
#include "luks.h"
#include "config.h"
#include "natspec.h"

/* Using our private realpath function */
#include "realpath.h"

            /* if no charset was set explicitly, autodetect UTF-8 */
            if( !iocharset ) {
                const char* codeset;
                codeset = natspec_get_filename_encoding("");

                debug( "no iocharset given, current locale encoding is %s\n", codeset );

                debug("no iocharset given, using libnatspec: %s\n",codeset);
				iocharset = strdup(codeset);
                    iocharset = "utf8";
                }
            }

            /* clean stale locks */

Lines 19-24 Link Here

(-)./configure.ac.orig (+8 lines)
19	[AC_MSG_ERROR([Missing sysfs library (install libsysfs-dev or similar?)])])],	19	[AC_MSG_ERROR([Missing sysfs library (install libsysfs-dev or similar?)])])],
20	[AC_MSG_ERROR([Missing /usr/include/sysfs/libsysfs.h (install libsysfs-dev or similar?)])])	20	[AC_MSG_ERROR([Missing /usr/include/sysfs/libsysfs.h (install libsysfs-dev or similar?)])])
21		21
		22
		23	AC_CHECK_HEADER(natspec.h,
		24	[AC_CHECK_LIB(natspec, natspec_get_filename_encoding,
		25	[LIBS="$LIBS -lnatspec"],
		26	[AC_MSG_ERROR([Missing natspec library (install libnatspec-devel or similar?)])])],
		27	[AC_MSG_ERROR([Missing /usr/include/natspec.h (install libnatspec-devel or similar?)])])
		28
		29
22	# directory configuration	30	# directory configuration
23	AC_ARG_WITH(media-dir,	31	AC_ARG_WITH(media-dir,
24	AC_HELP_STRING([--with-media-dir=DIR], [Parent directory for mounts; MUST have trailing slash (default: /media/)]),	32	AC_HELP_STRING([--with-media-dir=DIR], [Parent directory for mounts; MUST have trailing slash (default: /media/)]),

Return to bug 10180

Lines 29-34 Link Here

(-)./src/pmount.c.orig (-5 / +4 lines)
29	#include "utils.h"	29	#include "utils.h"
30	#include "luks.h"	30	#include "luks.h"
31	#include "config.h"	31	#include "config.h"
		32	#include "natspec.h"
32		33
33	/* Using our private realpath function */	34	/* Using our private realpath function */
34	#include "realpath.h"	35	#include "realpath.h"
Lines 727-740 Link Here
727	/* if no charset was set explicitly, autodetect UTF-8 */	728	/* if no charset was set explicitly, autodetect UTF-8 */
728	if( !iocharset ) {	729	if( !iocharset ) {
729	const char* codeset;	730	const char* codeset;
730	codeset = nl_langinfo( CODESET );	731	codeset = natspec_get_filename_encoding("");
731		732
732	debug( "no iocharset given, current locale encoding is %s\n", codeset );	733	debug( "no iocharset given, current locale encoding is %s\n", codeset );
733		734
734	if( codeset && !strcmp( codeset, "UTF-8" ) ) {	735	debug("no iocharset given, using libnatspec: %s\n",codeset);
735	debug( "locale encoding uses UTF-8, setting iocharset to 'utf8'\n" );	736	iocharset = strdup(codeset);
736	iocharset = "utf8";
737	}
738	}	737	}
739		738
740	/* clean stale locks */	739	/* clean stale locks */