Ticket #6597: 6597-datadirect-win32.patch

libs/libmythtv/datadirect.cpp

@@ -1014 +1014 @@
     poststream << flush;
     postfile.close();
 
-    // Allow for single quotes in userid and password (shell escape)
-    password.replace('\'', "'\\''");
-    userid.replace('\'', "'\\''");
-
     QString command;
     {
         QMutexLocker locker(&user_agent_lock);
+#ifdef USING_MINGW 
+        // win32 doesn't understand single-quoted strings, uses ^ as escape;
+        // also, windows seems to have problems with the gzip pipe here
+        password.replace("\"", "^\"");
+        userid.replace("\"", "^\"");
+
         command = QString(
+            "wget --http-user=\"%1\" --http-passwd=\"%2\" --post-file=\"%3\" "
+            " %4 --user-agent=\"%5\" --output-document=- ")
+            .arg(userid).arg(password).arg(postFilename).arg(ddurl)
+            .arg(user_agent);
+    }
+#else
+        // Allow for single quotes in userid and password (shell escape)
+        password.replace('\'', "'\\''");
+        userid.replace('\'', "'\\''");
+
+        command = QString(
             "wget --http-user='%1' --http-passwd='%2' --post-file='%3' "
             "--header='Accept-Encoding:gzip' %4 "
             "--user-agent='%5' --output-document=- ")
@@ -1033 +1046 @@
     //    command += " 2> /dev/null ";
 
     command += " | gzip -df";
-
+#endif
     if (SHOW_WGET_OUTPUT)
         VERBOSE(VB_GENERAL, "command: "<<command<<endl);
 
@@ -1093 +1106 @@
     QString command;
     {
         QMutexLocker locker(&user_agent_lock);
+#ifdef USING_MINGW  // single quotes don't work in win32
         command = QString(
+            "wget --http-user=\"%1\" --http-passwd=\"%2\" --post-file=\"%3\" "
+            " %4 --user-agent=\"%5\" --output-document=\"%6\"")
+            .arg(GetUserID().replace("\"", "^\""))
+            .arg(GetPassword().replace("\"", "^\"")).arg(postFilename)
+            .arg(ddurl).arg(user_agent).arg(resultFilename);
+#else
+        command = QString(
             "wget --http-user='%1' --http-passwd='%2' --post-file='%3' %4 "
             "--user-agent='%5' --output-document='%6'")
             .arg(GetUserID().replace('\'', "'\\''"))
             .arg(GetPassword().replace('\'', "'\\''")).arg(postFilename)
             .arg(ddurl).arg(user_agent).arg(resultFilename);
+#endif
     }
 
     if (SHOW_WGET_OUTPUT)
         VERBOSE(VB_GENERAL, "command: "<<command<<endl);
+#ifndef USING_MINGW
     else
         command += " 2> /dev/null ";
+#endif
 
     myth_system(command);
 
@@ -1991 +2015 @@
     }
 
     if (post_data.length())
+#ifdef USING_MINGW        
+        command += "--post-data=\"" + post_data + "\" ";
+#else
         command += "--post-data='" + post_data + "' ";
+#endif    
 
     command += url;
     command += " ";
 
     {
         QMutexLocker locker(&user_agent_lock);
-        command += QString("--user-agent='%1' ").arg(user_agent);
+#ifdef USING_MINGW                
+        command += QString("--user-agent=\"%1\" ").arg(user_agent);
+#else
+        command += QString("--user-agent='%1' ").arg(user_agent);        
+#endif
     }
 
     command += "--output-document=";