diff options
| author | David Sommerseth | 2011-12-08 00:40:45 +0100 |
|---|---|---|
| committer | David Sommerseth | 2012-01-10 19:38:35 +0100 |
| commit | ec302f7061b7ab4dd21bdac77dd115e75b50cbc0 (patch) | |
| tree | e55a9cccd3446f94f86e505259aad7b890bae0e5 /compat.h | |
| parent | 8ee5646111625c598efbc82413649b1ab6275877 (diff) | |
| download | openvpn-ec302f7061b7ab4dd21bdac77dd115e75b50cbc0.zip openvpn-ec302f7061b7ab4dd21bdac77dd115e75b50cbc0.tar.gz | |
Move away from openvpn_basename() over to platform provided basename()
This kicks out the openvpn_basename() function from misc.[ch] and puts
glibc equivalents 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
v3: Use glibc versions of basename() and dirname() instead
Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Alon Bar-Lev <alon.barlev@gmail.com>
URL: http://thread.gmane.org/gmane.network.openvpn.devel/5178/focus=5215
Diffstat (limited to 'compat.h')
| -rw-r--r-- | compat.h | 42 |
1 files changed, 42 insertions, 0 deletions
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 <davids@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 */ |