support for additionally SIZE constrained Typereference

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

diff --git a/dftest.c b/dftest.c
index 5be160feee669f83e28a27b013b6543ea671ccb0..8dd5bce8d2147df420c37602fba41a487879995e 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -59,6 +59,7 @@ static void read_failure_message(const char *filename, int err);
 int
 main(int argc, char **argv)
 {
+       char            *init_progfile_dir_error;
        char            *text;
        char            *gpf_path, *pf_path;
        int             gpf_open_errno, gpf_read_errno;
@@ -71,14 +72,23 @@ main(int argc, char **argv)
         */
        get_credential_info();
 
+       /*
+        * Attempt to get the pathname of the executable file.
+        */
+       init_progfile_dir_error = init_progfile_dir(argv[0]);
+       if (init_progfile_dir_error != NULL) {
+               fprintf(stderr, "dftest: Can't get pathname of dftest program: %s.\n",
+                   init_progfile_dir_error);
+       }
+
        timestamp_set_type(TS_RELATIVE);
 
-       /* register all dissectors; we must do this before checking for the
-       "-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,register_all_protocols,
-                 register_all_protocol_handoffs,
+       /* Register all dissectors; we must do this before checking for the
+          "-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(register_all_protocols,
+                 register_all_protocol_handoffs, NULL, NULL,
                  failure_message, open_failure_message, read_failure_message);
 
        /* now register the preferences for any non-dissector modules.
@@ -122,7 +132,7 @@ main(int argc, char **argv)
 
        /* Check for filter on command line */
        if (argc <= 1) {
-               fprintf(stderr, "Usage: dftest filter\n");
+               fprintf(stderr, "Usage: dftest <filter>\n");
                exit(1);
        }