patch for vuplus again

[vuplus_dvbapp] / main / bsod.cpp

diff --git a/main/bsod.cpp b/main/bsod.cpp
old mode 100644 (file)
new mode 100755 (executable)
index fde4146..e2102c7
--- a/main/bsod.cpp
+++ b/main/bsod.cpp
@@ -15,7 +15,11 @@
 
 /************************************************/
 
+#ifdef BUILD_VUPLUS /* ikseong  */
+#define CRASH_EMAILADDR "crashlog"
+#else
 #define CRASH_EMAILADDR "crashlog@dream-multimedia-tv.de"
+#endif
 #define STDBUFFER_SIZE 512
 #define RINGBUFFER_SIZE 16384
 static char ringbuffer[RINGBUFFER_SIZE];
@@ -74,7 +78,7 @@ static std::string getConfigFileValue(const char *entry)
                {
                        return configvalue;
                }
-               else // get Value from enigma2 settings file
+               else // get value from enigma2 settings file
                {
                        FILE *f = fopen(configfile.c_str(), "r");
                        if (!f)
@@ -119,7 +123,21 @@ static std::string getFileContent(const char *file)
                        char line[1024];
                        if (!fgets(line, 1024, f))
                                break;
-                       filecontent += line;
+                       std::string tmp = line;
+                       std::string password;
+                       int pwdpos = tmp.find(".password=", 0);
+                       if( pwdpos != std::string::npos)
+                       {
+                               filecontent += tmp.substr(0,pwdpos +10);
+                               for ( int pos = pwdpos +10; pos < tmp.length()-1; ++pos )
+                               {
+                                       filecontent += "X";
+                               }
+                               filecontent += "\n";
+                       }
+                       else {
+                               filecontent += line;
+                       }
                }
                fclose(f);
        }
@@ -365,10 +383,18 @@ void bsodFatal(const char *component)
                eRect usable_area = eRect(100, 70, my_dc->size().width() - 150, 100);
                
                char text[512];
+#ifdef BUILD_VUPLUS /* ikseong  */
+               snprintf(text, 512, "We are really sorry. Your STB encountered "
+#else
                snprintf(text, 512, "We are really sorry. Your Dreambox encountered "
+#endif
                        "a software problem, and needs to be restarted. "
                        "Please send the logfile created in /hdd/ to %s.\n"
+#ifdef BUILD_VUPLUS /* ikseong  */
+                       "Your STB restarts in 10 seconds!\n"
+#else
                        "Your Dreambox restarts in 10 seconds!\n"
+#endif
                        "Component: %s",
                        crash_emailaddr, crash_component);