implement abrtd -t TIMEOUT_IN_SEC

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

2 files changed, 14 insertions, 12 deletions

diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index 23bd9db0..849e1699 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -44,17 +44,6 @@ CAnalyzerCCpp::CAnalyzerCCpp() :
     m_bMemoryMap(false), m_bInstallDebuginfo(true)
 {}
 
-static bool is_hexstr(const char* str)
-{
-    while (*str)
-    {
-        if (!isxdigit(*str))
-            return false;
-        str++;
-    }
-    return true;
-}
-
 static std::string CreateHash(const std::string& pInput)
 {
     std::string ret = "";
@@ -452,6 +441,16 @@ static std::string run_unstrip_n(const std::string& pDebugDumpDir)
 
 #if 0
 /* older code */
+static bool is_hexstr(const char* str)
+{
+    while (*str)
+    {
+        if (!isxdigit(*str))
+            return false;
+        str++;
+    }
+    return true;
+}
 static void InstallDebugInfos(const std::string& pDebugDumpDir, std::string& build_ids)
 {
     log("Getting module names, file names, build IDs from core file");
diff --git a/lib/Utils/make_descr.cpp b/lib/Utils/make_descr.cpp
index 71b91912..ee372910 100644
--- a/lib/Utils/make_descr.cpp
+++ b/lib/Utils/make_descr.cpp
@@ -98,6 +98,9 @@ string make_description_logger(const map_crash_report_t& pCrashReport)
          || type == CD_ATT
          || type == CD_BIN
         ) {
+            if (content == "1.\n2.\n3.\n")
+                continue; /* user did not change default "How to reproduce" */
+
             bool was_multiline = 0;
             string tmp;
             add_content(was_multiline, tmp, filename.c_str(), content.c_str());
@@ -115,7 +118,7 @@ string make_description_logger(const map_crash_report_t& pCrashReport)
         }
     }
 
-    if (long_description.size() != 0)
+    if (description.size() != 0 && long_description.size() != 0)
     {
         description += '\n';
         description += long_description;