plugins/tracklength-gstreamer.c: Rewrite to use `GstDiscoverer'.

[disorder] / lib / syscalls.c

diff --git a/lib/syscalls.c b/lib/syscalls.c
index 66c3d4760ae50853ce440717687460ac25711ebc..62226913f5cb571e34696c53172f19f05be14dca 100644 (file)
--- a/lib/syscalls.c
+++ b/lib/syscalls.c
@@ -1,34 +1,39 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007-9, 2013 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * 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.
- *
+ * 
+ * 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; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+/** @file lib/syscalls.c
+ * @brief Error-checking library call wrappers
+ */
+#include "common.h"
 
-#include <config.h>
-
-#include <unistd.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 #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 <stdio.h>
-#include <stdlib.h>
+#include <time.h>
 
 #include "syscalls.h"
 #include "log.h"
@@ -36,20 +41,22 @@
 
 int mustnotbeminus1(const char *what, int ret) {
   if(ret == -1)
-    fatal(errno, "error calling %s", what);
+    disorder_fatal(errno, "error calling %s", what);
   return ret;
 }
 
+#if !_WIN32
 pid_t xfork(void) {
   pid_t pid;
 
-  if((pid = fork()) < 0) fatal(errno, "error calling fork");
+  if((pid = fork()) < 0)
+    disorder_fatal(errno, "error calling fork");
   return pid;
 }
 
 void xclose_guts(const char *path, int line, int fd) {
   if(close(fd) < 0)
-    fatal(errno, "%s:%d: close %d", path, line, fd);
+    disorder_fatal(errno, "%s:%d: close %d", path, line, fd);
 }
 
 void xdup2(int fd1, int fd2) {
@@ -80,27 +87,32 @@ void cloexec(int fd) {
                        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));
 }
 
-void xshutdown(int fd, int how) {
+void xshutdown(SOCKET fd, int 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));
 }
 
-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));
 }
 
+#if !_WIN32
 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));
 }
+#endif
 
 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;
 }
 
+#if !_WIN32
 int xnice(int inc) {
   int ret;
 
@@ -142,14 +156,31 @@ int xnice(int inc) {
    * be -1 */
   errno = 0;
   ret = nice(inc);
-  if(errno) fatal(errno, "error calling nice");
+  if(errno)
+    disorder_fatal(errno, "error calling nice");
   return ret;
 }
+#endif
 
 void xgettimeofday(struct timeval *tv, struct timezone *tz) {
   mustnotbeminus1("gettimeofday", gettimeofday(tv, tz));
 }
 
+time_t xtime(time_t *whenp) {
+  struct timeval tv;
+
+  xgettimeofday(&tv, NULL);
+  if(whenp)
+    *whenp = tv.tv_sec;
+  return tv.tv_sec;
+}
+
+#if !_WIN32
+void xnanosleep(const struct timespec *req, struct timespec *rem) {
+  mustnotbeminus1("nanosleep", nanosleep(req, rem));
+}
+#endif
+
 /*
 Local Variables:
 c-basic-offset:2