Made the executable portable; it will now work on machines other than my

own. It allocates and fills in its own wtap struct.

svn path=/trunk/; revision=257

1 files changed, 13 insertions, 4 deletions

diff --git a/wiretap/wiretap.c b/wiretap/wiretap.c
index 93bb427d0e..bf393e69a7 100644
--- a/wiretap/wiretap.c
+++ b/wiretap/wiretap.c
@@ -15,23 +15,32 @@ char *bpf_image(struct bpf_instruction *p, int n);
 int main(int argc, char **argv)
 {
 	wtap	*wth;
-	char	*fsyntax = "";
+	char	*fsyntax;
 	int	i;
 
 	if (argc <= 1) {
 		fprintf(stderr, "usage: wiretap filter\n");
 		exit(-1);
 	}
+	
+	fsyntax = g_strdup(argv[1]);
 
-	for (i = 1; i < argc; i++) {
+	for (i = 2; i < argc; i++) {
 		fsyntax = g_strjoin(" ", fsyntax, argv[i], NULL);
 	}
+	wth = (wtap*)g_malloc(sizeof(wtap));
+
+	/* initialization */
+	wth->file_encap = WTAP_ENCAP_NONE;
+	wth->filter.offline = NULL;
+	wth->filter_type = WTAP_FILTER_NONE;
+	wth->filter_length = 0;
+	wth->offline_filter_lengths = NULL;
 
-	wth = wtap_open_offline("/home/gram/prj/sniff/test.trace");
 	wtap_offline_filter(wth, fsyntax);
-/*	wtap_offline_filter_compile(wth, WTAP_ENCAP_ETHERNET);*/
 	bpf_dump(wth);
 
+	g_free(wth);
 	return 0;
 }