lib/configuration.c, lib/home.c: Introduce environment variables.

[disorder] / lib / syscalls.c

diff --git a/lib/syscalls.c b/lib/syscalls.c
index b894ca39bfb80885917dc6bd903c9d47f9c1ae63..62226913f5cb571e34696c53172f19f05be14dca 100644 (file)
--- a/lib/syscalls.c
+++ b/lib/syscalls.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2004, 2005, 2007, 2008, 2013 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007-9, 2013 Richard Kettlewell

  *
  * 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
  *
  * 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


@@ -20,12 +20,18 @@
  */
 #include "common.h"
 
  */
 #include "common.h"
 

-#include <unistd.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif

 #include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>

-#include <sys/socket.h>
-#include <sys/time.h>
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#if HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif

 #include <signal.h>
 #include <time.h>
 
 #include <signal.h>
 #include <time.h>
 


@@ -39,6 +45,7 @@ int mustnotbeminus1(const char *what, int ret) {
   return ret;
 }
 
   return ret;
 }
 

+#if !_WIN32

 pid_t xfork(void) {
   pid_t pid;
 
 pid_t xfork(void) {
   pid_t pid;
 


@@ -80,27 +87,32 @@ void cloexec(int fd) {
                        mustnotbeminus1("fcntl F_GETFD",
                                        fcntl(fd, F_GETFD)) | FD_CLOEXEC));
 }
                        mustnotbeminus1("fcntl F_GETFD",
                                        fcntl(fd, F_GETFD)) | FD_CLOEXEC));
 }

+#endif

 
 

-void xlisten(int fd, int q) {
+void xlisten(SOCKET fd, int q) {

   mustnotbeminus1("listen", listen(fd, q));
 }
 
   mustnotbeminus1("listen", listen(fd, q));
 }
 

-void xshutdown(int fd, int how) {
+void xshutdown(SOCKET fd, int how) {

   mustnotbeminus1("shutdown", shutdown(fd, how));
 }
 
   mustnotbeminus1("shutdown", shutdown(fd, how));
 }
 

-void xsetsockopt(int fd, int l, int o, const void *v, socklen_t vl) {
+void xsetsockopt(SOCKET fd, int l, int o, const void *v, socklen_t vl) {

   mustnotbeminus1("setsockopt", setsockopt(fd, l, o, v, vl));
 }
 
   mustnotbeminus1("setsockopt", setsockopt(fd, l, o, v, vl));
 }
 

-int xsocket(int d, int t, int p) {
-  return mustnotbeminus1("socket", socket(d, t, p));
+SOCKET xsocket(int d, int t, int p) {
+  SOCKET s = socket(d, t, p);
+  if(s == INVALID_SOCKET)
+    disorder_fatal(errno, "error calling socket");
+  return s;

 }
 
 }
 

-void xconnect(int fd, const struct sockaddr *sa, socklen_t sl) {
+void xconnect(SOCKET fd, const struct sockaddr *sa, socklen_t sl) {

   mustnotbeminus1("connect", connect(fd, sa, sl));
 }
 
   mustnotbeminus1("connect", connect(fd, sa, sl));
 }
 

+#if !_WIN32

 void xsigprocmask(int how, const sigset_t *set, sigset_t *oldset) {
   mustnotbeminus1("sigprocmask", sigprocmask(how, set, oldset));
 }
 void xsigprocmask(int how, const sigset_t *set, sigset_t *oldset) {
   mustnotbeminus1("sigprocmask", sigprocmask(how, set, oldset));
 }


@@ -108,6 +120,7 @@ void xsigprocmask(int how, const sigset_t *set, sigset_t *oldset) {
 void xsigaction(int sig, const struct sigaction *sa, struct sigaction *oldsa) {
   mustnotbeminus1("sigaction", sigaction(sig, sa, oldsa));
 }
 void xsigaction(int sig, const struct sigaction *sa, struct sigaction *oldsa) {
   mustnotbeminus1("sigaction", sigaction(sig, sa, oldsa));
 }

+#endif

 
 int xprintf(const char *fmt, ...) {
   va_list ap;
 
 int xprintf(const char *fmt, ...) {
   va_list ap;


@@ -135,6 +148,7 @@ int xstrtoll(long_long *n, const char *s, char **ep, int base) {
   return errno;
 }
 
   return errno;
 }
 

+#if !_WIN32

 int xnice(int inc) {
   int ret;
 
 int xnice(int inc) {
   int ret;
 


@@ -146,6 +160,7 @@ int xnice(int inc) {
     disorder_fatal(errno, "error calling nice");
   return ret;
 }
     disorder_fatal(errno, "error calling nice");
   return ret;
 }

+#endif

 
 void xgettimeofday(struct timeval *tv, struct timezone *tz) {
   mustnotbeminus1("gettimeofday", gettimeofday(tv, tz));
 
 void xgettimeofday(struct timeval *tv, struct timezone *tz) {
   mustnotbeminus1("gettimeofday", gettimeofday(tv, tz));


@@ -160,9 +175,11 @@ time_t xtime(time_t *whenp) {
   return tv.tv_sec;
 }
 
   return tv.tv_sec;
 }
 

+#if !_WIN32

 void xnanosleep(const struct timespec *req, struct timespec *rem) {
   mustnotbeminus1("nanosleep", nanosleep(req, rem));
 }
 void xnanosleep(const struct timespec *req, struct timespec *rem) {
   mustnotbeminus1("nanosleep", nanosleep(req, rem));
 }

+#endif

 
 /*
 Local Variables:
 
 /*
 Local Variables: