From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: "Nick S. Grechukh" To: ALT Linux Sisyphus discussion list Subject: Re: [sisyphus] =?koi8-r?b?6SDTzs/XwQ==?= hal+ivman Date: Sun, 13 Nov 2005 00:25:40 +0200 References: <43746FA3.6010009@ntmdt.ru> <200511120159.25266.lav@altlinux.ru> <200511121648.57662.gns@tpway.com> In-Reply-To: <200511121648.57662.gns@tpway.com> MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_kvmdDRhARqrvYdQ" Message-Id: <200511130025.40438.gns@tpway.com> X-BeenThere: sisyphus@lists.altlinux.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ALT Linux Sisyphus discussion list List-Id: ALT Linux Sisyphus discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Nov 2005 20:25:49 -0000 Archived-At: List-Archive: List-Post: --Boundary-00=_kvmdDRhARqrvYdQ Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: base64 Content-Disposition: inline 9yDTz8/C3cXOyckgz9Qg89XCws/UwSwgMTIt7s/RLTIwMDUgMTY6NDggTmljayBTLiBHcmVjaHVr aCDOwdDJ08HMKGEpOgo+IPcg08/Pwt3FzsnJIM/UIPPVwsLP1MEsIDEyLe7P0S0yMDA1IDAwOjU5 IFZpdGFseSBMaXBhdG92IM7B0MnTwcwoYSk6Cj4gPiBPbiBGcmlkYXkgMTEgTm92ZW1iZXIgMjAw NSAxNzo1MCwgTmljayBTLiBHcmVjaHVraCB3cm90ZToKPiA+ID4gxMHXwcrUxSDawdDB1N7JzSBw bW91bnQuINrBICQ1MCDRIMfP1M/XIM7B1d7J1NggxcfPINfTxcfEwQo+ID4g9NXUIMTPzNbFziDC 2dTYIMvPzsvV0tMgIuvUzyDExdvF18zFIj8gOikKPiA+ID4gzc/O1MnSz9fB1Ngg0yDMz8vBzNjA INXLwdrBzs7PyiDXIC9ldGMvc3lzY29uZmlnL2kxOG4uCj4gPiA+IMnMySDJ09DPzNjaz9fB1Ngg bGlibmF0c3BlYywgxdPMySDc1M8g0M/Nz9bF1CDXINPM1d7BxSDawdDV08vBCj4gPiDtz9bF1CDC 2dTYINzUzyDTzsnaydQgw8XO1T8gOikKPiDQ0sXEzMHHwcAg0M/ExczJ1NggOykK08/C09TXxc7O zywgzsUg08/X08XNIMvP28XSztnKIMkgxMHWxSDTz9fTxc0gzsXLz9vF0s7ZyiDQwdTeINfP1C4g CgrRIM7FINrOwcAgy8HLINzUzyDC1cTF1CDSwcLP1MHU2CDQ0skg0sHaztnIIMzPy8HM0cgg1SDQ z8zY2s/XwdTFzMXKLCDOzyAK0NLFxNDPzMHHwcAg3tTPINcg3NTPzSDTzNXewcUg0M/Nz9bF1CDU z8zYy88gwNrF0tPLycogaXZtYW4g1SDPxM7Px88gydogzsnILgooxMzRIM3FztEg0NLPwszFzcEg 1yDMwMLPzSDTzNXewcUgzsXBy9TVwczYzsEgLSDXxdrExSBjcDEyNTEpCgr6+Tog0MHLxdQgz9TQ 0sHXycwg1yDExcTBzAo= --Boundary-00=_kvmdDRhARqrvYdQ Content-Type: text/x-diff; charset="windows-1251"; name="pmount-alt-natspec.gns1.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pmount-alt-natspec.gns1.patch" --- pmount.c 2005-06-27 16:16:23 +0300 +++ pmount.c.gns 2005-11-12 23:52:32 +0200 @@ -28,6 +28,8 @@ #include "utils.h" #include "luks.h" +#include "natspec.h" + /* error codes */ const int E_ARGS = 1; const int E_DEVICE = 2; @@ -626,14 +628,17 @@ /* if no charset was set explicitly, autodetect UTF-8 */ if( !iocharset ) { const char* codeset; - codeset = nl_langinfo( CODESET ); +// codeset = nl_langinfo( CODESET ); + codeset = natspec_get_filename_encoding(""); debug( "no iocharset given, current locale encoding is %s\n", codeset ); - if( codeset && !strcmp( codeset, "UTF-8" ) ) { - debug( "locale encoding uses UTF-8, setting iocharset to 'utf8'\n" ); - iocharset = "utf8"; - } +// if( codeset && !strcmp( codeset, "UTF-8" ) ) { +// debug( "locale encoding uses UTF-8, setting iocharset to 'utf8'\n" ); +// iocharset = "utf8"; +// } + debug("no iocharset given, using libnatspec: %s\n",codeset); + iocharset = strdup(codeset); } /* clean stale locks */ --- Makefile 2005-11-12 23:51:00 +0200 +++ Makefile.gns 2005-11-12 23:52:39 +0200 @@ -1,4 +1,4 @@ -LIBS=-lsysfs +LIBS=-lsysfs -lnatspec CFLAGS?=-Wall -W -O2 HAL_CFLAGS=$(shell pkg-config hal --cflags) HAL_LDFLAGS=$(shell pkg-config hal --libs) --Boundary-00=_kvmdDRhARqrvYdQ--