From a481a5200c266dd387d1dca8a0253abfb208f031 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 12 Feb 2005 15:07:09 +0100 Subject: [PATCH] Fixed a typo in detecting UTF-8 --- CONTRIBUTORS | 1 + HISTORY | 1 + vdr.c | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 13f2115b..ba8931d4 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -929,6 +929,7 @@ Reinhard Nissl for modifying cDolbyRepacker to make sure PES packets don't exceed the requested length for fixing a possible freeze in pause mode in case a device's PlayPesPacket() function permanently returns 0 + for fixing a typo in detecting UTF-8 Richard Robson for reporting freezing replay if a timer starts while in Transfer Mode from the diff --git a/HISTORY b/HISTORY index d87b984a..bab60b65 100644 --- a/HISTORY +++ b/HISTORY @@ -3398,3 +3398,4 @@ Video Disk Recorder Revision History clearing the buffer. - Added DeviceClrAvailableTracks() and DeviceSetCurrentAudioTrack() to cPlayer (thanks to Marco Schlüßler). +- Fixed a typo in detecting UTF-8 (thanks to Reinhard Nissl). diff --git a/vdr.c b/vdr.c index 6b2ac379..15aff949 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.201 2005/01/30 14:15:50 kls Exp $ + * $Id: vdr.c 1.202 2005/02/12 15:06:16 kls Exp $ */ #include @@ -100,8 +100,8 @@ int main(int argc, char *argv[]) // Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes char *LangEnv; - if ((LangEnv = getenv("LANG")) != NULL && strcasestr(LangEnv, "utf") || - (LangEnv = getenv("LC_TYPE")) != NULL && strcasestr(LangEnv, "utf")) { + if ((LangEnv = getenv("LANG")) != NULL && strcasestr(LangEnv, "utf") || + (LangEnv = getenv("LC_CTYPE")) != NULL && strcasestr(LangEnv, "utf")) { fprintf(stderr, "vdr: please turn off UTF-8 before starting VDR\n"); return 2; }