The Styleguide section has been moved to the Wireshark Developer's Guide.

[obnox/wireshark/wip.git] / capture_ui_utils.c

diff --git a/capture_ui_utils.c b/capture_ui_utils.c
index 738d5ccd5fd184b9e92f2f340874c2ddfddf6036..c8f9be7dc851ff27db79bb57331bc7e3aac88466 100644 (file)
--- a/capture_ui_utils.c
+++ b/capture_ui_utils.c
@@ -31,10 +31,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include <glib.h>
 
-#include <epan/prefs.h>
-#include "capture-pcap-util.h"
+#include "epan/prefs.h"
+#include "epan/ex-opt.h"
+#include "capture_ifinfo.h"
 #include "capture_ui_utils.h"
 
 /*
@@ -101,7 +103,7 @@ gint
 capture_dev_user_linktype_find(const gchar *if_name)
 {
        gchar *p, *next;
-       gint linktype;
+       long linktype;
 
        if (prefs.capture_devices_linktypes == NULL) {
                /* There are no link-layer header types */
@@ -119,19 +121,23 @@ capture_dev_user_linktype_find(const gchar *if_name)
                /* Syntax error */
                return -1;
        }
+       if (linktype > G_MAXINT) {
+               /* Value doesn't fit in a gint */
+               return -1;
+       }
 
-       return linktype;
+       return (gint)linktype;
 }
 
 /*
  * Return as descriptive a name for an interface as we can get.
  * If the user has specified a comment, use that.  Otherwise,
- * if get_interface_list() supplies a description, use that,
+ * if capture_interface_list() supplies a description, use that,
  * otherwise use the interface name.
  *
  * The result must be g_free()'d when you're done with it.
  *
- * Note: given that this calls get_interface_list(), which attempts to
+ * Note: given that this calls capture_interface_list(), which attempts to
  * open all adapters it finds in order to check whether they can be
  * captured on, this is an expensive routine to call, so don't call it
  * frequently.
@@ -150,11 +156,22 @@ get_interface_descriptive_name(const char *if_name)
   if (descr != NULL) {
     /* Yes - make a copy of that. */
     descr = g_strdup(descr);
+  } else if (strcmp(if_name, "-") == 0) {
+    /*
+     * Strictly speaking, -X (extension) options are for modules, e.g. Lua
+     * and using one here stretches that definition. However, this doesn't
+     * waste a single-letter option on something that might be rarely used
+     * and is backward-compatible to 1.0.
+     */
+    descr = g_strdup(ex_opt_get_nth("stdin_descr", 0));
+    if (!descr) {
+      descr = g_strdup("Standard input");
+    }
   } else {
     /* No, we don't have a user-supplied description; did we get
        one from the OS or libpcap? */
     descr = NULL;
-    if_list = get_interface_list(&err, NULL);
+    if_list = capture_interface_list(&err, NULL);
     if (if_list != NULL && if_name != NULL) {
       if_entry = if_list;
       do {
@@ -254,29 +271,29 @@ build_capture_combo_list(GList *if_list, gboolean do_hide)
       /* Is this interface hidden and, if so, should we include it
          anyway? */
       if (!prefs_is_capture_device_hidden(if_info->name) || !do_hide) {
-       /* It's not hidden, or it is but we should include it in the list. */
-
-       /* Do we have a user-supplied description? */
-       descr = capture_dev_user_descr_find(if_info->name);
-       if (descr != NULL) {
-         /* Yes, we have a user-supplied description; use it. */
-         if_string = g_strdup_printf("%s: %s", descr, if_info->name);
-         g_free(descr);
-       } else {
-         /* No, we don't have a user-supplied description; did we get
-            one from the OS or libpcap? */
-         if (if_info->description != NULL) {
-           /* Yes - use it. */
-           if_string = g_strdup_printf("%s: %s", if_info->description,
+        /* It's not hidden, or it is but we should include it in the list. */
+
+        /* Do we have a user-supplied description? */
+        descr = capture_dev_user_descr_find(if_info->name);
+        if (descr != NULL) {
+             /* Yes, we have a user-supplied description; use it. */
+             if_string = g_strdup_printf("%s: %s", descr, if_info->name);
+          g_free(descr);
+        } else {
+          /* No, we don't have a user-supplied description; did we get
+                one from the OS or libpcap? */
+          if (if_info->description != NULL) {
+            /* Yes - use it. */
+               if_string = g_strdup_printf("%s: %s", if_info->description,
                                        if_info->name);
-         } else {
-           /* No. */
-           if_string = g_strdup(if_info->name);
-         }
-       }
-       combo_list = g_list_append(combo_list, if_string);
+          } else {
+            /* No. */
+            if_string = g_strdup(if_info->name);
+          }
+        }
+        combo_list = g_list_append(combo_list, if_string);
       }
-    }
+    }/*for*/
   }
   return combo_list;
 }