diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2007-05-12 09:35:07 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2007-05-12 09:35:07 +0200 |
| commit | df463b5a2a6814b12922dd7b2acad88263979c02 (patch) | |
| tree | 6e5168eac32d6d9eec9903a7388595d91ee67d9c | |
| parent | d472e8b63bdc4e3674e25c8e6dff3902c9255f8f (diff) | |
| download | vdr-df463b5a2a6814b12922dd7b2acad88263979c02.tar.gz vdr-df463b5a2a6814b12922dd7b2acad88263979c02.tar.bz2 | |
Fixed getting the code setting from the locale
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | vdr.c | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index a639d39c..8b5de13a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2051,6 +2051,7 @@ Tomas Berglund <tomber@telia.com> Matthias Schwarzott <zzam@gentoo.org> for suggesting to add LC_ALL to the checks for UTF-8 at startup + for fixing getting the code setting from the locale Martin Ostermann <martin@familie-ostermann.de> for fixing processing the PDCDescriptor in 'libsi' on big endian systems @@ -5180,7 +5180,7 @@ Video Disk Recorder Revision History - Official release. -2007-04-30: Version 1.5.3 +2007-05-12: Version 1.5.3 - Fixed some spelling errors in 'newplugin' (thanks to Ville Skyttä). - Fixed a busy loop in fast forward if the next video data file is missing @@ -5197,3 +5197,4 @@ Video Disk Recorder Revision History Parma and Helmut Auer). - Increased the maximum number of CA system ids to cope with the AlphaCrypt CAM's version 3.11 firmware. +- Fixed getting the code setting from the locale (thanks to Matthias Schwarzott). @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.289 2007/04/30 09:52:51 kls Exp $ + * $Id: vdr.c 1.290 2007/05/12 09:35:07 kls Exp $ */ #include <getopt.h> @@ -493,7 +493,9 @@ int main(int argc, char *argv[]) // Set the system character table: - char *LangEnv = getenv("LANG"); + char *LangEnv = setlocale(LC_CTYPE, ""); + if (!LangEnv) + LangEnv = getenv("LANG"); // last resort in case locale stuff isn't installed if (LangEnv) { char *CodeSet = strchr(LangEnv, '.'); if (CodeSet) { |