From fdbb731ab21224bc44f305c34dbc19071ed314ce Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 27 Jul 2002 12:55:14 +0200
Subject: [PATCH] Made VFAT handling more tolerant

---
 CONTRIBUTORS |  3 +++
 HISTORY      |  3 +++
 recording.c  | 22 +++++++++++++++++-----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 58fc6761..c69e3357 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -367,3 +367,6 @@ Paul Lacatus <paul@campina.iiruc.ro>
 
 Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
  for translating OSD texts to the Hungarian language
+
+Christian Rienecker <C.Rienecker@deutschepost.de>
+ for making the VFAT handling more tolerant for users who forget to turn it on
diff --git a/HISTORY b/HISTORY
index 7f6700da..7c4ae84c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1383,3 +1383,6 @@ Video Disk Recorder Revision History
 
 - Re-visited the race condition fix in the cDvbPlayer (thanks again to Andreas
   Schultz).
+- Changed the VFAT handling to allow users who normally use it but have forgotten
+  to set it when compiling a new version of VDR to at least see their recordings
+  made with VFAT enabled (thanks to Christian Rienecker).
diff --git a/recording.c b/recording.c
index 7ebec5c9..afa0e7f6 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.64 2002/06/22 10:11:49 kls Exp $
+ * $Id: recording.c 1.65 2002/07/27 12:55:14 kls Exp $
  */
 
 #include "recording.h"
@@ -22,12 +22,24 @@
 
 #define RECEXT       ".rec"
 #define DELEXT       ".del"
-#ifdef VFAT
-#define DATAFORMAT   "%4d-%02d-%02d.%02d.%02d.%02d.%02d" RECEXT
-#else
+/* This was the original code, which works fine in a Linux only environment.
+   Unfortunately, because of windows and its brain dead file system, we have
+   to use a more complicated approach, in order to allow users who have enabled
+   the VFAT compile time option to see their recordings even if they forget to
+   enable VFAT when compiling a new version of VDR... Gee, do I hate Windows.
+   (kls 2002-07-27)
 #define DATAFORMAT   "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
-#endif
 #define NAMEFORMAT   "%s/%s/" DATAFORMAT
+*/
+// start of implementation for brain dead systems
+#define DATAFORMAT   "%4d-%02d-%02d.%02d%*c%02d.%02d.%02d" RECEXT
+#ifdef VFAT
+#define nameFORMAT   "%4d-%02d-%02d.%02d.%02d.%02d.%02d" RECEXT
+#else
+#define nameFORMAT   "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
+#endif
+#define NAMEFORMAT   "%s/%s/" nameFORMAT
+// end of implementation for brain dead systems
 
 #define RESUMEFILESUFFIX  "/resume.vdr"
 #define SUMMARYFILESUFFIX "/summary.vdr"