Move u3 code to top-level directory since it's not GTK specific

svn path=/trunk/; revision=35046

6 files changed, 3 insertions, 246 deletions

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 794a95530e..5cb2f3e58f 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -136,7 +136,6 @@ WIRESHARK_GTK_SRC = \
 	tap_dfilter_dlg.c	\
 	text_import.c	\
 	text_page_utils.c	\
-	u3.c		\
 	uat_gui.c	\
 	voip_calls.c	\
 	webbrowser.c
@@ -327,7 +326,6 @@ noinst_HEADERS = \
 	text_import.h	\
 	text_import_scanner.h	\
 	text_page_utils.h	\
-	u3.h \
 	uat_gui.h \
 	utf8_entities.h \
 	voip_calls.h	\
diff --git a/gtk/main.c b/gtk/main.c
index 325d6134e1..720881fcda 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -104,6 +104,7 @@
 #include "../merge.h"
 #include "../alert_box.h"
 #include "../log.h"
+#include "../u3.h"
 #include <wsutil/file_util.h>
 
 #ifdef HAVE_LIBPCAP
@@ -131,7 +132,6 @@
 #include "gtk/color_dlg.h"
 #include "gtk/filter_dlg.h"
 #include "gtk/uat_gui.h"
-#include "gtk/u3.h"
 #include "gtk/main.h"
 #include "gtk/main_airpcap_toolbar.h"
 #include "gtk/main_filter_toolbar.h"
diff --git a/gtk/menus.c b/gtk/menus.c
index cc5608d8bd..5353711f6e 100644
--- a/gtk/menus.c
+++ b/gtk/menus.c
@@ -51,6 +51,7 @@
 #include "../main_statusbar.h"
 #include "../color_filters.h"
 #include "../stat_menu.h"
+#include "../u3.h"
 
 #include "gtk/about_dlg.h"
 #include "gtk/capture_dlg.h"
@@ -85,7 +86,6 @@
 #include "gtk/packet_history.h"
 #include "gtk/sctp_stat.h"
 #include "gtk/firewall_dlg.h"
-#include "gtk/u3.h"
 #include "gtk/macros_dlg.h"
 #include "gtk/export_object.h"
 #include "gtk/gui_stat_menu.h"
diff --git a/gtk/recent.c b/gtk/recent.c
index dbcf0480d6..b8a2dfe35d 100644
--- a/gtk/recent.c
+++ b/gtk/recent.c
@@ -40,6 +40,7 @@
 #include <epan/column.h>
 
 #include "../simple_dialog.h"
+#include "../u3.h"
 #include <wsutil/file_util.h>
 
 #include "gtk/recent.h"
@@ -53,7 +54,6 @@
 #endif /*NEW_PACKET_LIST */
 #include "gtk/file_dlg.h"
 #include "gtk/cfilter_combo_utils.h"
-#include "gtk/u3.h"
 
 #ifdef HAVE_PCAP_REMOTE
 #include "gtk/capture_dlg.h"
diff --git a/gtk/u3.c b/gtk/u3.c
deleted file mode 100644
index a2bc304875..0000000000
--- a/gtk/u3.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* u3.c
- * u3   2006 Graeme Lunt
- *
- * $Id$
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * 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
- * 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.
- */
-
-/*
- * Indentation logic: 2-space
- */
-
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef _WIN32
-#include <process.h>    /* getpid */
-#endif
-
-#include <wsutil/file_util.h>
-
-#include <epan/filesystem.h>
-
-#include <gtk/u3.h>
-
-
-#define U3_DEVICE_PATH_VAR   "$U3_DEVICE_PATH"
-
-static char *pid_file = NULL;
-static char *u3devicepath = (char*)-1;
-static gchar *newpath = NULL;
-
-static char *u3_change_path(char *path, const char *old, const char *new);
-
-gboolean u3_active()
-{
-
-  return (
-#ifdef _WIN32
-      getenv_utf8
-#else
-      getenv
-#endif
-      ("U3_HOST_EXEC_PATH") != NULL);
-
-}
-
-void u3_runtime_info(GString *str)
-{
-
-  char *u3devicepath_lcl = NULL;
-  char *u3deviceproduct = NULL;
-
-  if((u3deviceproduct =
-#ifdef _WIN32
-      getenv_utf8
-#else
-      getenv
-#endif
-      ("U3_DEVICE_PRODUCT")) != NULL) {
-    g_string_append(str, " from the ");
-    g_string_append(str, u3deviceproduct);
-  } else {
-    g_string_append(str, " from a ");
-  }
-
-  g_string_append(str, " U3 device");
-
-  if((u3devicepath_lcl =
-#ifdef _WIN32
-      getenv_utf8
-#else
-      getenv
-#endif
-      ("U3_DEVICE_PATH")) != NULL) {
-    g_string_append(str, " in drive ");
-    g_string_append(str, u3devicepath_lcl);
-  }
-
-}
-
-void u3_register_pid()
-{
-  int	pid;
-  int   pid_fd;
-  char *u3hostexecpath;
-  int   pf_size;
-
-  if((u3hostexecpath =
-#ifdef _WIN32
-      getenv_utf8
-#else
-      getenv
-#endif
-      ("U3_HOST_EXEC_PATH")) != NULL) {
-
-    pid = getpid();
-
-    pf_size = (int) strlen(u3hostexecpath) + 32;
-    pid_file = g_malloc(pf_size);
-
-    g_snprintf(pid_file, pf_size, "%s\\%d.pid", u3hostexecpath, pid);
-
-    pid_fd = ws_open(pid_file, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
-
-    if(pid_fd != -1)
-      ws_close(pid_fd);
-    else {
-      g_free(pid_file);
-      pid_file = NULL;
-    }
-  }
-}
-
-
-void u3_deregister_pid()
-{
-  if(pid_file) {
-    /* we don't care if we succeed or fail - u3utils may have deleted the file */
-    ws_unlink(pid_file);
-
-    g_free(pid_file);
-
-    pid_file = NULL;
-
-  }
-}
-
-char *u3_expand_device_path(char *path)
-{
-  return u3_change_path(path, U3_DEVICE_PATH_VAR, NULL);
-}
-
-
-char *u3_contract_device_path(char *path)
-{
-  return u3_change_path(path, NULL, U3_DEVICE_PATH_VAR);
-}
-
-static char *u3_change_path(char *path, const char *old, const char *new)
-{
-
-  if(u3devicepath == (char*)-1) {
-    /* cache the device path */
-    u3devicepath =
-#ifdef _WIN32
-      getenv_utf8
-#else
-      getenv
-#endif
-      ("U3_DEVICE_PATH");
-  }
-
-  if(new == NULL)
-    new = u3devicepath;
-  if(old == NULL)
-    old = u3devicepath;
-
-  if(newpath != NULL) {
-    g_free(newpath);
-    newpath = NULL;
-  }
-
-  if((path != NULL) && (u3devicepath != NULL) && (strncmp(path, old, strlen(old)) == 0)) {
-
-    newpath = g_strconcat(new, path + strlen(old), NULL);
-
-    return newpath;
-
-  }
-
-  return path;
-
-}
diff --git a/gtk/u3.h b/gtk/u3.h
deleted file mode 100644
index 3239c69759..0000000000
--- a/gtk/u3.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* u3.h
- * u3   2006 Graeme Lunt
- *
- * $Id$
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * 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
- * 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.
- */
-
-#ifndef __GTK_U3_H__
-#define __GTK_U3_H__
-
-gboolean u3_active(void);
-
-void u3_runtime_info(GString *str);
-
-void u3_register_pid(void);
-void u3_deregister_pid(void);
-
-char * u3_expand_device_path(char *path);
-char * u3_contract_device_path(char *path);
-
-#endif /* __GTK_U3_H__ */