This kicks out the openvpn_basename() function from misc.[ch] andputs
it into compat.[ch]. This is to provide the same functionality on
platforms not having a native basename() function available.
In addition this patch adds dirname() which commit 0f2bc0dd92f43c91e
depends. Without dirname(), openvpn won't build in Visual Studio.
v2: Move all functions from compat.h to compat.c
Signed-off-by: David Sommerseth <dav...@redhat.com>
---
Makefile.am | 1 +
compat.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
compat.h | 42 +++++++++++++++++++++++++++++
configure.ac | 2 +-
init.c | 6 +++-
misc.c | 23 ++--------------
misc.h | 3 --
options.c | 1 -
syshead.h | 2 +
9 files changed, 135 insertions(+), 27 deletions(-)
create mode 100644 compat.c
create mode 100644 compat.h
diff --git a/Makefile.am b/Makefile.am
index 075270f..437f939 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,6 +84,7 @@ openvpn_SOURCES = \
circ_list.h \
clinat.c clinat.h \
common.h \
+ compat.h compat.c \
config-win32.h \
crypto.c crypto.h crypto_backend.h \
crypto_openssl.c crypto_openssl.h \
diff --git a/compat.c b/compat.c
new file mode 100644
index 0000000..bade0a1
--- /dev/null
+++ b/compat.c
@@ -0,0 +1,82 @@
+/*
+ * OpenVPN -- An application to securely tunnel IP networks
+ * over a single UDP port, with support for SSL/TLS-based
+ * session authentication and key exchange,
+ * packet encryption, packet authentication, and
+ * packet compression.
+ *
+ * Copyright (C) 2011 - David Sommerseth <dav...@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * 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 (see the file COPYING included with this
+ * distribution); if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "syshead.h"
+#include "compat.h"
+#include <string.h>
+
+#if !defined(HAVE_BASENAME) || !defined(HAVE_DIRNAME)
+enum ovpn_dirbasename_e { DIRNAME, BASENAME };
+
+char *
+openvpn_dirbasename(char *path, enum ovpn_dirbasename_e mode)
+ {
+ char *ret;
+ const int dirsep = OS_SPECIFIC_DIRSEP;
+
+ if (path) {
+ ret = strrchr (path, dirsep);
+ if (ret && *ret)
+ ++ret;
+ else
+ ret = path;
+
+ if (*ret)
+ switch( mode ) {
+ case BASENAME:
+ return ret;
+
+ case DIRNAME:
+ /* This implements the POSIX variant of dirname(),
+ * which do modify the input
+ */
+ *(ret-1) = 0;
+ return path;
+ }
+ }
+ return NULL;
+ }
+#endif /* !defined(HAVE_BASENAME) || !defined(HAVE_DIRNAME) */
+
+
+#ifndef HAVE_DIRNAME
+char *
+dirname(char *str)
+{
+ return openvpn_dirbasename(str, DIRNAME);
+}
+#endif /* HAVE_DIRNAME */
+
+
+#ifndef HAVE_BASENAME
+char *
+basename(char *str)
+{
+ /* the path is recasted as non-const, as we are sure it will not be modified
+ * in the basename type
+ */
+ return openvpn_dirbasename(str, BASENAME);
+
+}
+#endif /* HAVE_BASENAME */
diff --git a/compat.h b/compat.h
new file mode 100644
index 0000000..b380f0b
--- /dev/null
+++ b/compat.h
@@ -0,0 +1,42 @@
+/*
+ * OpenVPN -- An application to securely tunnel IP networks
+ * over a single UDP port, with support for SSL/TLS-based
+ * session authentication and key exchange,
+ * packet encryption, packet authentication, and
+ * packet compression.
+ *
+ * Copyright (C) 2011 - David Sommerseth <dav...@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * 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 (see the file COPYING included with this
+ * distribution); if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef COMPAT_H
+#define COMPAT_H
+
+#include "config.h"
+
+#if defined(HAVE_BASENAME) || defined(HAVE_DIRNAME)
+#include <libgen.h>
+#endif
+
+#ifndef HAVE_DIRNAME
+char * dirname(char *str);
+#endif /* HAVE_DIRNAME */
+
+#ifndef HAVE_BASENAME
+char * basename(char *str);
+#endif /* HAVE_BASENAME */
+
+#endif /* COMPAT_H */
diff --git a/configure.ac b/configure.ac
index a4d68e6..173d6e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -515,7 +515,7 @@ AC_CHECK_FUNCS(daemon chroot getpwnam setuid nice system
getpid dup dup2 dnl
getpass strerror syslog openlog mlockall getgrnam setgid dnl
setgroups stat flock readv writev time dnl
setsid chdir putenv getpeername unlink dnl
- chsize ftruncate execve getpeereid umask)
+ chsize ftruncate execve getpeereid umask basename dirname)
# Windows use stdcall for winsock so we cannot auto detect these
m4_define([SOCKET_FUNCS], [socket recv recvfrom send sendto listen dnl
diff --git a/init.c b/init.c
index 82c1000..368adb4 100644
--- a/init.c
+++ b/init.c
@@ -862,8 +862,10 @@ init_verb_mute (struct context *c, unsigned int flags)
void
init_options_dev (struct options *options)
{
- if (!options->dev)
- options->dev = openvpn_basename (options->dev_node);
+ if (!options->dev && options->dev_node) {
+ char *dev_node = strdup(options->dev_node); /* POSIX basename()
implementaions may modify its arguments */
+ options->dev = basename (dev_node);
+ }
}
bool
diff --git a/misc.c b/misc.c
index 99e5bc5..aec12b8 100644
--- a/misc.c
+++ b/misc.c
@@ -2022,13 +2022,15 @@ argv_extract_cmd_name (const char *path)
{
if (path)
{
- const char *bn = openvpn_basename (path);
+ char *path_cp = strdup(path); /* POSIX basename() implementaions may
modify its arguments */
+ const char *bn = basename (path_cp);
if (bn)
{
char *ret = string_alloc (bn, NULL);
char *dot = strrchr (ret, '.');
if (dot)
*dot = '\0';
+ free(path_cp);
if (ret[0] != '\0')
return ret;
}
@@ -2370,25 +2372,6 @@ argv_test (void)
}
#endif
-const char *
-openvpn_basename (const char *path)
-{
- const char *ret;
- const int dirsep = OS_SPECIFIC_DIRSEP;
-
- if (path)
- {
- ret = strrchr (path, dirsep);
- if (ret && *ret)
- ++ret;
- else
- ret = path;
- if (*ret)
- return ret;
- }
- return NULL;
-}
-
/*
* Remove security-sensitive strings from control message
* so that they will not be output to log file.
diff --git a/misc.h b/misc.h
index b2e6f91..b1badd9 100644
--- a/misc.h
+++ b/misc.h
@@ -381,9 +381,6 @@ extern int script_method; /* GLOBAL */
/* return the next largest power of 2 */
size_t adjust_power_of_2 (size_t u);
-/* return the basename of path */
-const char *openvpn_basename (const char *path);
-
/*
* A printf-like function (that only recognizes a subset of standard printf
* format operators) that prints arguments to an argv list instead
diff --git a/options.c b/options.c
index 3a819c9..2280e9b 100644
--- a/options.c
+++ b/options.c
@@ -53,7 +53,6 @@
#include "forward.h"
#include <ctype.h>
#include <unistd.h>
-#include <libgen.h>
#include "memdbg.h"
diff --git a/syshead.h b/syshead.h
index f3c0ac9..020b81f 100644
--- a/syshead.h
+++ b/syshead.h
@@ -36,6 +36,8 @@
#include "config.h"
#endif
+#include "compat.h"
+
/* branch prediction hints */
#if defined(__GNUC__)
# define likely(x) __builtin_expect((x),1)
--
1.7.4.4
