TicketUploader and FileTransfer plugins: fixes after a round of testing

for one, FileTransfer now would not use current dir as a storage
for temp files.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

3 files changed, 8 insertions, 8 deletions

diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp
index 73736f13..6cf32a68 100644
--- a/src/Daemon/Settings.cpp
+++ b/src/Daemon/Settings.cpp
@@ -77,7 +77,7 @@ static set_string_t ParseList(const char* pList)
     return set;
 }
 
-/* (What format do we parse here?) */
+/* Format: name, name(param),name("param with spaces \"and quotes\"") */
 static vector_pair_string_string_t ParseListWithArgs(const char *pValue)
 {
     VERB3 log(" ParseListWithArgs(%s)", pValue);
@@ -92,7 +92,6 @@ static vector_pair_string_string_t ParseListWithArgs(const char *pValue)
     {
         if (is_quote && pValue[ii] == '\\' && pValue[ii+1])
         {
-            item += pValue[ii];
             ii++;
             item += pValue[ii];
             continue;
@@ -100,7 +99,7 @@ static vector_pair_string_string_t ParseListWithArgs(const char *pValue)
         if (pValue[ii] == '"')
         {
             is_quote = !is_quote;
-            item += pValue[ii];
+            /*item += pValue[ii]; - wrong! name("param") must be == name(param) */
             continue;
         }
         if (is_quote)
diff --git a/src/Daemon/abrt.conf b/src/Daemon/abrt.conf
index acf8566f..406289fe 100644
--- a/src/Daemon/abrt.conf
+++ b/src/Daemon/abrt.conf
@@ -13,11 +13,13 @@ BlackList = nspluginwrapper
 Database = SQLite3
 # Max size for crash storage [MiB]
 MaxCrashReportsSize = 1000
-# Vector of actions and reporters which are activated immediately after a crash occurs
+# Vector of actions and reporters which are activated immediately after a crash occurs,
+# comma separated.
 #ActionsAndReporters = Mailx("[abrt] new crash was detected")
+#ActionsAndReporters = FileTransfer("store")
 ActionsAndReporters = RunApp("test x\"`cat component`\" = x\"xorg-x11-server-Xorg\" && cp /var/log/Xorg.0.log .")
 
-# What actions or reporters to run on specified crash type
+# What actions or reporters to run on each crash type
 [ AnalyzerActionsAndReporters ]
 Kerneloops = KerneloopsReporter
 CCpp = Bugzilla, Logger
@@ -29,3 +31,4 @@ Python = Bugzilla, Logger
 # h:m - at h:m an action plugin is activated
 # s - every s seconds is an action plugin activated
 120 = KerneloopsScanner
+#02:00 = FileTransfer
diff --git a/src/Hooks/hooklib.cpp b/src/Hooks/hooklib.cpp
index 41b9627f..06bde974 100644
--- a/src/Hooks/hooklib.cpp
+++ b/src/Hooks/hooklib.cpp
@@ -47,9 +47,7 @@ void parse_conf(const char *additional_conf, unsigned *setting_MaxCrashReportsSi
             break;
         }
 
-        unsigned len = strlen(line);
-        if (len > 0 && line[len-1] == '\n')
-            line[--len] = '\0';
+        strchrnul(line, '\n')[0] = '\0';
         const char *p = skip_whitespace(line);
 #undef DIRECTIVE
 #define DIRECTIVE "MaxCrashReportsSize"