Include <string.h> to get "strcmp()" declared.

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

diff --git a/dftest.c b/dftest.c
index 95d85f59effbc796cb7d78ec5842ab9d1f21c010..35a46b4e7de620bca83c9c9b279c4be2c5a88427 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -1,9 +1,9 @@
 /* dftest.c.c
  *
- * $Id: dftest.c,v 1.1 2001/02/01 20:21:13 gram Exp $
+ * $Id: dftest.c,v 1.6 2003/08/18 18:35:21 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
  * Shows display filter byte-code, for debugging dfilter routines.
@@ -12,12 +12,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -34,53 +34,28 @@
 #include <string.h>
 #include <errno.h>
 
-#if 0
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#include <signal.h>
-
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-#endif
-
 #ifdef NEED_STRERROR_H
 #include "strerror.h"
 #endif
 
 #include <glib.h>
-#include <epan.h>
+#include <epan/epan.h>
 
 #if 0
 #include "globals.h"
-#include "packet.h"
+#include <epan/packet.h>
 #include "file.h"
 #include "column.h"
 #include "print.h"
-#include "resolv.h"
-#include "conversation.h"
+#include <epan/resolv.h>
+#include <epan/conversation.h>
 #endif
-#include "timestamp.h"
-#include "plugins.h"
+#include <epan/timestamp.h>
+#include <epan/plugins.h>
 #include "prefs.h"
 #include "util.h"
 #include "epan/dfilter/dfilter.h"
+#include "register.h"
 
 packet_info    pi;
 ts_type                timestamp_type = RELATIVE;
@@ -90,7 +65,8 @@ main(int argc, char **argv)
 {
        char            *text;
        char            *gpf_path, *pf_path;
-       int             gpf_open_errno, pf_open_errno;
+       int             gpf_open_errno, gpf_read_errno;
+       int             pf_open_errno, pf_read_errno;
        e_prefs         *prefs;
        dfilter_t       *df;
 
@@ -98,7 +74,8 @@ main(int argc, char **argv)
        "-g" flag, as the "-g" flag dumps a list of fields registered
        by the dissectors, and we must do it before we read the preferences,
        in case any dissectors register preferences. */
-       epan_init(PLUGIN_DIR);
+       epan_init(PLUGIN_DIR,register_all_protocols,
+                 register_all_protocol_handoffs);
 
        /* now register the preferences for any non-dissector modules.
        we must do that before we read the preferences as well. */
@@ -107,14 +84,31 @@ main(int argc, char **argv)
        /* set the c-language locale to the native environment. */
        setlocale(LC_ALL, "");
 
-       prefs = read_prefs(&gpf_open_errno, &gpf_path, &pf_open_errno, &pf_path);
+       prefs = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path,
+           &pf_open_errno, &pf_read_errno, &pf_path);
        if (gpf_path != NULL) {
-               fprintf(stderr, "can't open global preferences file \"%s\": %s.\n",
-                               pf_path, strerror(gpf_open_errno));
+               if (gpf_open_errno != 0) {
+                       fprintf(stderr,
+                           "can't open global preferences file \"%s\": %s.\n",
+                           pf_path, strerror(gpf_open_errno));
+               }
+               if (gpf_read_errno != 0) {
+                       fprintf(stderr,
+                           "I/O error reading global preferences file \"%s\": %s.\n",
+                           pf_path, strerror(gpf_read_errno));
+               }
        }
        if (pf_path != NULL) {
-               fprintf(stderr, "can't open your preferences file \"%s\": %s.\n",
-                               pf_path, strerror(pf_open_errno));
+               if (pf_open_errno != 0) {
+                       fprintf(stderr,
+                           "can't open your preferences file \"%s\": %s.\n",
+                           pf_path, strerror(pf_open_errno));
+               }
+               if (pf_read_errno != 0) {
+                       fprintf(stderr,
+                           "I/O error reading your preferences file \"%s\": %s.\n",
+                           pf_path, strerror(pf_read_errno));
+               }
        }
 
        /* notify all registered modules that have had any of their preferences
@@ -132,7 +126,7 @@ main(int argc, char **argv)
        text = get_args_as_string(argc, argv, 1);
 
        printf("Filter: \"%s\"\n", text);
- 
+
        /* Compile it */
        if (!dfilter_compile(text, &df)) {
                fprintf(stderr, "dftest: %s\n", dfilter_error_msg);