[seed] fix #650234 -m Add FreeBSD/OpenBSD support to os/seed-os.c
- From: Alan Knowles <alank src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seed] fix #650234 -m Add FreeBSD/OpenBSD support to os/seed-os.c
- Date: Mon, 16 May 2011 09:36:17 +0000 (UTC)
commit 03c808137331be912e9adde997dd2830cf2e5593
Author: Jasper Lievisse Adriaanse <jasper humppa nl>
Date: Mon May 16 17:38:37 2011 +0800
fix #650234 -m Add FreeBSD/OpenBSD support to os/seed-os.c
modules/os/seed-os.c | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
---
diff --git a/modules/os/seed-os.c b/modules/os/seed-os.c
index e56cd50..6ee73ac 100644
--- a/modules/os/seed-os.c
+++ b/modules/os/seed-os.c
@@ -29,8 +29,19 @@
#include <sys/stat.h>
#include <sys/utsname.h>
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#include <sys/param.h>
+#endif
#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <termios.h>
+#if defined(__OpenBSD__)
+#include <util.h>
+#else
+#include <libutil.h>
+#endif
+#include <unistd.h>
#include <fcntl.h>
@@ -54,18 +65,32 @@ seed_os_realpath (SeedContext ctx,
const SeedValue arguments[],
SeedException * exception)
{
+ SeedValue sv;
gchar *arg;
+ gchar *resolved_path;
gchar *ret;
+ gsize path_max;
if (argument_count != 1)
{
EXPECTED_EXCEPTION("os.realpath", "1 argument");
}
arg = seed_value_to_string (ctx, arguments[0], exception);
- ret = realpath(arg, NULL);
+#ifdef PATH_MAX
+ path_max = PATH_MAX;
+#else
+ path_max = pathconf (arg, _PC_PATH_MAX);
+ if (path_max <= 0)
+ path_max = 4096;
+#endif
+ resolved_path = (gchar *) g_malloc (path_max);
+ ret = realpath(arg, resolved_path);
g_free (arg);
- return seed_value_from_string (ctx, ret, exception);
+ sv = seed_value_from_string (ctx, ret, exception);
+ g_free (resolved_path);
+
+ return sv;
}
SeedValue
@@ -559,7 +584,12 @@ seed_os_unsetenv (SeedContext ctx,
}
arg = seed_value_to_string (ctx, arguments[0], exception);
+#if __FreeBSD_version < 700000
+ ret = 0;
+ unsetenv (arg);
+#else
ret = unsetenv (arg);
+#endif
g_free (arg);
return seed_value_from_int (ctx, ret, exception);
@@ -702,6 +732,7 @@ seed_os_fdatasync (SeedContext ctx,
const SeedValue arguments[],
SeedException * exception)
{
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
gint fd;
if (argument_count != 1)
@@ -711,6 +742,10 @@ seed_os_fdatasync (SeedContext ctx,
fd = seed_value_to_int (ctx, arguments[0], exception);
return seed_value_from_int (ctx, fdatasync (fd), exception);
+#else
+ errno = ENOSYS;
+ return seed_value_from_int (ctx, -1, exception);
+#endif
}
SeedValue
@@ -1113,7 +1148,9 @@ seed_module_init(SeedEngine * eng)
#if defined (O_DIRECT)
OS_DEFINE_QUICK_ENUM (O_DIRECT);
#endif
+#if defined (O_DIRECTORY)
OS_DEFINE_QUICK_ENUM (O_DIRECTORY);
+#endif
OS_DEFINE_QUICK_ENUM (O_NOFOLLOW);
#if defined (O_NOATIME)
OS_DEFINE_QUICK_ENUM (O_NOATIME);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]