On Windows, use the directory in which the binary resides as the

directory in which global data files are stored.  If an installed binary
is being run, that's the correct directory for them; if a build-tree
binary is being run, the "manuf" file will be there, and you can put
other data files there as well, if necessary.

Do the same with plugins, except that, if there's no
"plugins\\{version}" subdirectory of that directory, fall back on the
default installation directory, so you at least have a place where you
can put plugins for use by build-tree binaries.  (Should we, instead,
have the Windows build procedure create a subdirectory of the "plugins"
source directory, with the plugin version number as its name, and copy
the plugins there, so you'd use the build-tree plugin binaries?)

Move "test_for_directory()" out of "util.c" and into
"epan/filesystem.c", with the other file system access portability
wrappers and convenience routines.  Fix "util.h" not to declare it - or
other routines moved to "epan/filesystem.c" a while ago.

svn path=/trunk/; revision=3858

1 files changed, 2 insertions, 35 deletions

diff --git a/util.h b/util.h
index 4d52866e15..0bacc3804e 100644
--- a/util.h
+++ b/util.h
@@ -1,12 +1,11 @@
 /* util.h
  * Utility definitions
  *
- * $Id: util.h,v 1.23 2001/04/02 09:53:43 guy Exp $
+ * $Id: util.h,v 1.24 2001/08/21 06:39:15 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * 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
@@ -30,38 +29,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/*
- * Given a pathname, return:
- *
- *	the errno, if an attempt to "stat()" the file fails;
- *
- *	EISDIR, if the attempt succeeded and the file turned out
- *	to be a directory;
- *
- *	0, if the attempt succeeded and the file turned out not
- *	to be a directory.
- */
-int test_for_directory(const char *);
-
-/*
- * Given a pathname, return a pointer to the last pathname separator
- * character in the pathname, or NULL if the pathname contains no
- * separators.
- */
-char *find_last_pathname_separator(char *);
-
-/*
- * Given a pathname, return the last component.
- */
-char *get_basename(char *);
-
-/*
- * Given a pathname, return a string containing everything but the
- * last component.  NOTE: this overwrites the pathname handed into
- * it....
- */
-char *get_dirname(char *);
-
 int create_tempfile(char *, int, const char *);
 
 /*