1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed getting the code setting from the locale

This commit is contained in:
Klaus Schmidinger 2007-05-12 09:35:07 +02:00
parent d472e8b63b
commit df463b5a2a
3 changed files with 7 additions and 3 deletions

View File

@ -2051,6 +2051,7 @@ Tomas Berglund <tomber@telia.com>
Matthias Schwarzott <zzam@gentoo.org> Matthias Schwarzott <zzam@gentoo.org>
for suggesting to add LC_ALL to the checks for UTF-8 at startup 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> Martin Ostermann <martin@familie-ostermann.de>
for fixing processing the PDCDescriptor in 'libsi' on big endian systems for fixing processing the PDCDescriptor in 'libsi' on big endian systems

View File

@ -5180,7 +5180,7 @@ Video Disk Recorder Revision History
- Official release. - 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 some spelling errors in 'newplugin' (thanks to Ville Skyttä).
- Fixed a busy loop in fast forward if the next video data file is missing - 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). Parma and Helmut Auer).
- Increased the maximum number of CA system ids to cope with the AlphaCrypt - Increased the maximum number of CA system ids to cope with the AlphaCrypt
CAM's version 3.11 firmware. CAM's version 3.11 firmware.
- Fixed getting the code setting from the locale (thanks to Matthias Schwarzott).

6
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * 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> #include <getopt.h>
@ -493,7 +493,9 @@ int main(int argc, char *argv[])
// Set the system character table: // 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) { if (LangEnv) {
char *CodeSet = strchr(LangEnv, '.'); char *CodeSet = strchr(LangEnv, '.');
if (CodeSet) { if (CodeSet) {