Remove U3 code and packaging.

svn path=/trunk/; revision=52896

4 files changed, 2 insertions, 252 deletions

diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 02d15a0f04..552f2a408b 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -64,7 +64,6 @@ set(WSUTIL_FILES
   swar.c
   tempfile.c
   type_util.c
-  u3.c
   ${WSUTIL_PLATFORM_FILES}
 )
 
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index 7332d97d8e..0eb65f3ca7 100644
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -56,8 +56,7 @@ LIBWSUTIL_SRC = 	\
 	rc4.c		\
 	report_err.c	\
 	tempfile.c	\
-	type_util.c	\
-	u3.c
+	type_util.c
 
 # Header files that are not generated from other files
 LIBWSUTIL_INCLUDES = 	\
@@ -88,5 +87,4 @@ LIBWSUTIL_INCLUDES = 	\
 	report_err.h	\
 	swar.h		\
 	tempfile.h	\
-	type_util.h	\
-	u3.h
+	type_util.h
diff --git a/wsutil/u3.c b/wsutil/u3.c
deleted file mode 100644
index 217d9f3bac..0000000000
--- a/wsutil/u3.c
+++ /dev/null
@@ -1,199 +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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/*
- * Indentation logic: 2-space
- */
-
-
-#include "config.h"
-
-#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 "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 const char *u3_change_path(const char *path, const char *old, const char *new_u3devicepath);
-
-gboolean u3_active(void)
-{
-
-  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(void)
-{
-  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 = (char *)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(void)
-{
-  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;
-
-  }
-}
-
-const char *u3_expand_device_path(const char *path)
-{
-  return u3_change_path(path, U3_DEVICE_PATH_VAR, NULL);
-}
-
-
-const char *u3_contract_device_path(char *path)
-{
-  return u3_change_path(path, NULL, U3_DEVICE_PATH_VAR);
-}
-
-static const char *u3_change_path(const char *path, const char *old, const char *new_u3devicepath)
-{
-
-  if(u3devicepath == (char*)-1) {
-    /* cache the device path */
-    u3devicepath =
-#ifdef _WIN32
-      getenv_utf8
-#else
-      getenv
-#endif
-      ("U3_DEVICE_PATH");
-  }
-
-  if(new_u3devicepath == NULL)
-    new_u3devicepath = 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_u3devicepath, path + strlen(old), NULL);
-
-    return newpath;
-
-  }
-
-  return path;
-
-}
diff --git a/wsutil/u3.h b/wsutil/u3.h
deleted file mode 100644
index fac385aebe..0000000000
--- a/wsutil/u3.h
+++ /dev/null
@@ -1,48 +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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __U3_H__
-#define __U3_H__
-
-#include "ws_symbol_export.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-WS_DLL_PUBLIC gboolean u3_active(void);
-
-WS_DLL_PUBLIC void u3_runtime_info(GString *str);
-
-WS_DLL_PUBLIC void u3_register_pid(void);
-WS_DLL_PUBLIC void u3_deregister_pid(void);
-
-WS_DLL_PUBLIC const char *u3_expand_device_path(const char *path);
-WS_DLL_PUBLIC const char *u3_contract_device_path(char *path);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __U3_H__ */