Ticket #154: FB12720_v2.patch

frm/frmBackupServer.cpp

@@ -147 +147 @@
         cmd += wxT(" --host ") + server->GetName();
 
     cmd +=  wxT(" --port ") + NumToStr((long)server->GetPort())
-         +  wxT(" --username ") + server->GetUsername();
+         +  wxT(" --username ") + commandLineCleanOption(server->GetUsername());
     return cmd;
 }
 

frm/frmBackup.cpp

@@ -297 +297 @@
         cmd += wxT(" --host ") + server->GetName();
 
     cmd +=  wxT(" --port ") + NumToStr((long)server->GetPort())
-         +  wxT(" --username ") + server->GetUsername();
+         +  wxT(" --username ") + commandLineCleanOption(server->GetUsername());
 
     if (object->GetConnection()->GetIsGreenplum())
         cmd += wxT(" --gp-syntax ");
@@ -401 +401 @@
                     if (pgAppMinimumVersion(backupExecutable, 8, 2))
                     {
 #ifdef WIN32
-                        tmpTables.Append(wxT(" --table \"\\\"") + ctvObjects->GetItemText(schema) +
-                                   wxT("\\\".\\\"") + ctvObjects->GetItemText(table) + wxT("\\\"\""));
+                        tmpTables.Append(wxT(" --table ") + 
+                              commandLineCleanOption(wxT("\"") +ctvObjects->GetItemText(schema) +
+                                    wxT("\".\"") + ctvObjects->GetItemText(table) + wxT("\"\"")));
 #else
-                        tmpTables.Append(wxT(" --table '") + ctvObjects->GetItemText(schema) +
-                                   wxT(".") + ctvObjects->GetItemText(table) + wxT("'"));
+                        tmpTables.Append(wxT(" --table ") +
+                              commandLineCleanOption(wxT("'") + ctvObjects->GetItemText(schema) +
+                                   wxT(".") + ctvObjects->GetItemText(table) + wxT("'")));
 #endif
                     }
                     else
                     {
-                        tmpTables.Append(wxT(" --table ") + ctvObjects->GetItemText(table));
-                        tmpTables.Append(wxT(" --schema ") + ctvObjects->GetItemText(schema));
+                        tmpTables.Append(wxT(" --table ") + commandLineCleanOption(ctvObjects->GetItemText(table)));
+                        tmpTables.Append(wxT(" --schema ") + commandLineCleanOption(ctvObjects->GetItemText(schema)));
                     }
                 }
                 else
@@ -429 +431 @@
             else
             {
 #ifdef WIN32
-                cmdSchemas.Append(wxT(" --schema \\\"") + ctvObjects->GetItemText(schema) + wxT("\\\""));
+                cmdSchemas.Append(wxT(" --schema ") + commandLineCleanOption(wxT("\"") + ctvObjects->GetItemText(schema) + wxT("\"")));
 #else
-                cmdSchemas.Append(wxT(" --schema '") + ctvObjects->GetItemText(schema) + wxT("'"));
+                cmdSchemas.Append(wxT(" --schema '") + commandLineCleanOption(ctvObjects->GetItemText(schema) + wxT("'")));
 #endif
             }
         }

frm/frmBackupGlobals.cpp

@@ -162 +162 @@
         cmd += wxT(" --host ") + server->GetName();
 
     cmd +=  wxT(" --port ") + NumToStr((long)server->GetPort())
-         +  wxT(" --username ") + server->GetUsername();
+         +  wxT(" --username ") + commandLineCleanOption(server->GetUsername());
     return cmd;
 }
 

frm/frmRestore.cpp

@@ -400 +400 @@
             switch (object->GetMetaType())
             {
                 case PGM_FUNCTION:
-                    cmd.Append(wxT(" --function ") + object->GetFullName());
+                    cmd.Append(wxT(" --function ") + commandLineCleanOption(object->GetFullName()));
                     break;
                 case PGM_INDEX:
-                    cmd.Append(wxT(" --index ") + object->GetQuotedIdentifier());
+                    cmd.Append(wxT(" --index ") + commandLineCleanOption(object->GetQuotedIdentifier()));
                     break;
                 case PGM_SCHEMA:
-                    cmd.Append(wxT(" --schema ") + object->GetQuotedIdentifier());
+                    cmd.Append(wxT(" --schema ") + commandLineCleanOption(object->GetQuotedIdentifier()));
                     break;
                 case PGM_TABLE:
-                    cmd.Append(wxT(" --table ") + object->GetQuotedIdentifier());
+                    cmd.Append(wxT(" --table ") + commandLineCleanOption(object->GetQuotedIdentifier()));
                     break;
                 case PGM_TRIGGER:
-                    cmd.Append(wxT(" --trigger ") + object->GetQuotedIdentifier());
+                    cmd.Append(wxT(" --trigger ") + commandLineCleanOption(object->GetQuotedIdentifier()));
                     break;
                 default:
                     break;