frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Added LC_ALL to the checks for UTF-8 at startup

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-09-01 12:59:35 +02:00
parent c2e2673629
commit 4ae577fcb4
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -1987,3 +1987,6 @@ J
Tomas Berglund <tomber@telia.com> Tomas Berglund <tomber@telia.com>
for reporting a problem with sticky PIDs in CAMs when switching between encrypted for reporting a problem with sticky PIDs in CAMs when switching between encrypted
channels on the same transponder channels on the same transponder
Matthias Schwarzott <zzam@gentoo.org>
for suggesting to add LC_ALL to the checks for UTF-8 at startup

4
HISTORY
View File

@ -4895,3 +4895,7 @@ Video Disk Recorder Revision History
which made it prefer any device that's already receiving and doesn't require which made it prefer any device that's already receiving and doesn't require
detatching receivers. This change has caused some unwanted behavior, so further detatching receivers. This change has caused some unwanted behavior, so further
testing is necessary. testing is necessary.
2006-09-01: Version 1.4.2-1
- Added LC_ALL to the checks for UTF-8 at startup (suggested by Matthias Schwarzott).

4
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: config.h 1.267 2006/08/26 14:16:34 kls Exp $ * $Id: config.h 1.268 2006/09/01 12:59:35 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -21,7 +21,7 @@
// VDR's own version number: // VDR's own version number:
#define VDRVERSION "1.4.2" #define VDRVERSION "1.4.2-1"
#define VDRVERSNUM 10402 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10402 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:

3
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.278 2006/08/05 10:46:38 kls Exp $ * $Id: vdr.c 1.279 2006/09/01 12:57:44 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -450,6 +450,7 @@ int main(int argc, char *argv[])
// Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes // Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
char *LangEnv; char *LangEnv;
if ((LangEnv = getenv("LANG")) != NULL && strcasestr(LangEnv, "utf") || if ((LangEnv = getenv("LANG")) != NULL && strcasestr(LangEnv, "utf") ||
(LangEnv = getenv("LC_ALL")) != NULL && strcasestr(LangEnv, "utf") ||
(LangEnv = getenv("LC_CTYPE")) != NULL && strcasestr(LangEnv, "utf")) { (LangEnv = getenv("LC_CTYPE")) != NULL && strcasestr(LangEnv, "utf")) {
fprintf(stderr, "vdr: please turn off UTF-8 before starting VDR\n"); fprintf(stderr, "vdr: please turn off UTF-8 before starting VDR\n");
return 2; return 2;