X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=dftest.c;h=c7ad6f363c41d80cf0f69a11241d1127af2119e8;hp=e42ff526b1af7cc0e978e2e3427bc3d7892537e2;hb=ad98c396ee7ef837733e885e502853b1ac236bbf;hpb=428f602b2d61191b07d92f6fa43413084754e39f

diff --git a/dftest.c b/dftest.c
index e42ff526b1..c7ad6f363c 100644
--- a/dftest.c
+++ b/dftest.c
@@ -1,4 +1,5 @@
-/* dftest.c.c
+/* dftest.c
+ * Shows display filter byte-code, for debugging dfilter routines.
  *
  * $Id$
  *
@@ -6,8 +7,6 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * Shows display filter byte-code, for debugging dfilter routines.
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -34,7 +33,7 @@
 #include <errno.h>
 
 #ifdef NEED_STRERROR_H
-#include "strerror.h"
+#include "wsutil/strerror.h"
 #endif
 
 #include <glib.h>
@@ -43,45 +42,44 @@
 #include <epan/timestamp.h>
 #include <epan/plugins.h>
 #include <epan/filesystem.h>
-#include <epan/privileges.h>
+#include <wsutil/privileges.h>
 #include <epan/prefs.h>
 #include "util.h"
 #include "epan/dfilter/dfilter.h"
 #include "register.h"
 
-packet_info	pi;
-
 static void failure_message(const char *msg_format, va_list ap);
 static void open_failure_message(const char *filename, int err,
-    gboolean for_writing);
+	gboolean for_writing);
 static void read_failure_message(const char *filename, int err);
+static void write_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;
 	int		pf_open_errno, pf_read_errno;
-	e_prefs		*prefs;
 	dfilter_t	*df;
 
-	/*
-	 * Attempt to get the pathname of the executable file.
-	 */
-	init_progfile_dir(argv[0]);
-
 	/*
 	 * Get credential information for later use.
 	 */
-	get_credential_info();
+	init_process_policies();
 
 	/*
-	 * Now attempt to get the pathname of the plugins.
+	 * Attempt to get the pathname of the executable file.
 	 */
-	init_plugin_dir();
+	init_progfile_dir_error = init_progfile_dir(argv[0], main);
+	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);
+	timestamp_set_seconds_type(TS_SECONDS_DEFAULT);
 
 	/* Register all dissectors; we must do this before checking for the
 	   "-g" flag, as the "-g" flag dumps a list of fields registered
@@ -89,7 +87,8 @@ main(int argc, char **argv)
 	   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);
+		  failure_message, open_failure_message, read_failure_message,
+		  write_failure_message);
 
 	/* now register the preferences for any non-dissector modules.
 	we must do that before we read the preferences as well. */
@@ -98,30 +97,30 @@ main(int argc, char **argv)
 	/* set the c-language locale to the native environment. */
 	setlocale(LC_ALL, "");
 
-	prefs = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path,
-	    &pf_open_errno, &pf_read_errno, &pf_path);
+	read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path,
+		&pf_open_errno, &pf_read_errno, &pf_path);
 	if (gpf_path != NULL) {
 		if (gpf_open_errno != 0) {
 			fprintf(stderr,
-			    "can't open global preferences file \"%s\": %s.\n",
-			    pf_path, strerror(gpf_open_errno));
+				"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));
+				"I/O error reading global preferences file \"%s\": %s.\n",
+				pf_path, strerror(gpf_read_errno));
 		}
 	}
 	if (pf_path != NULL) {
 		if (pf_open_errno != 0) {
 			fprintf(stderr,
-			    "can't open your preferences file \"%s\": %s.\n",
-			    pf_path, strerror(pf_open_errno));
+				"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));
+				"I/O error reading your preferences file \"%s\": %s.\n",
+				pf_path, strerror(pf_read_errno));
 		}
 	}
 
@@ -156,6 +155,7 @@ main(int argc, char **argv)
 	else
 		dfilter_dump(df);
 
+	dfilter_free(df);
 	epan_cleanup();
 	exit(0);
 }
@@ -189,5 +189,15 @@ static void
 read_failure_message(const char *filename, int err)
 {
 	fprintf(stderr, "dftest: An error occurred while reading from the file \"%s\": %s.\n",
-	    filename, strerror(err));
+		filename, strerror(err));
+}
+
+/*
+ * Write errors are reported with an console message in "dftest".
+ */
+static void
+write_failure_message(const char *filename, int err)
+{
+	fprintf(stderr, "dftest: An error occurred while writing to the file \"%s\": %s.\n",
+		filename, strerror(err));
 }