Make dumpcap complile again and other minor improvements.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19624 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/dumpcap.c b/dumpcap.c
index 410353618ca621ac53024f83f94934a6393eb8ac..63a52ce0c6f2a2a31d48e8f8a40fc3009de8b34b 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -193,13 +193,17 @@ cmdarg_err_cont(const char *fmt, ...)
 BOOL WINAPI ConsoleCtrlHandlerRoutine(DWORD dwCtrlType)
 {
     g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO,
-        "Console: Ctrl+C");
+        "Console: Control signal");
     g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG,
-        "Console: Ctrl+C CtrlType: %u", dwCtrlType);
+        "Console: Control signal, CtrlType: %u", dwCtrlType);
 
-    capture_loop_stop();
-
-    return TRUE;
+    /* Keep capture running if we're a service and a user logs off */
+    if (capture_child || (dwCtrlType != CTRL_LOGOFF_EVENT)) {
+        capture_loop_stop();
+        return TRUE;
+    } else {
+        return FALSE;
+    }
 }
 #endif
 
@@ -274,7 +278,7 @@ main(int argc, char *argv[])
 
   /* Assemble the run-time version information string */
   runtime_info_str = g_string_new("Running ");
-  get_runtime_version_info(runtime_info_str);
+  get_runtime_version_info(runtime_info_str, NULL);
 
   /* the default_log_handler will use stdout, which makes trouble in */
   /* capture child mode, as it uses stdout for it's sync_pipe */

diff --git a/gtk/main.c b/gtk/main.c
index 396539b107351fb2629738c24ae670032eb78648..5c56984cd31da24cf4b5ae51d362290006649eda 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -2033,8 +2033,6 @@ get_gui_runtime_info(GString *str)
 {
 #ifdef HAVE_AIRPCAP
   get_runtime_airpcap_version(str);
-#else
-  g_string_append(str, "without AirPcap");
 #endif
 }
 

diff --git a/version_info.c b/version_info.c
index 0dbb93f03e07be1d574305d8bbe8418f3ea7b4b5..a0cd6f1c9d9e02b944dd52113ede418a762bae0c 100644 (file)
--- a/version_info.c
+++ b/version_info.c
@@ -465,6 +465,7 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
 #endif
 
        /* Additional application-dependent information */
+       break_point = add_word_wrap_break_point(str);
        if (additional_info) {
                end_item_and_break(str, ",", break_point);
                break_point = add_word_wrap_break_point(str);