summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS3
-rw-r--r--HISTORY4
-rw-r--r--config.h4
-rw-r--r--vdr.c3
4 files changed, 11 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ea619ca9..357eb5d2 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1987,3 +1987,6 @@ Jörn Reder <joern@zyn.de>
Tomas Berglund <tomber@telia.com>
for reporting a problem with sticky PIDs in CAMs when switching between encrypted
channels on the same transponder
+
+Matthias Schwarzott <zzam@gentoo.org>
+ for suggesting to add LC_ALL to the checks for UTF-8 at startup
diff --git a/HISTORY b/HISTORY
index b9ece60b..bfbcc44a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4895,3 +4895,7 @@ Video Disk Recorder Revision History
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
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).
diff --git a/config.h b/config.h
index 4a4cbb20..d1d4e2e1 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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
@@ -21,7 +21,7 @@
// VDR's own version number:
-#define VDRVERSION "1.4.2"
+#define VDRVERSION "1.4.2-1"
#define VDRVERSNUM 10402 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
diff --git a/vdr.c b/vdr.c
index 436bfada..46d65c84 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.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>
@@ -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
char *LangEnv;
if ((LangEnv = getenv("LANG")) != NULL && strcasestr(LangEnv, "utf") ||
+ (LangEnv = getenv("LC_ALL")) != 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;