Merge tag 'branchpoint-5.1' into release

[disorder] / lib / syscalls.c

diff --git a/lib/syscalls.c b/lib/syscalls.c
index b1756667fe22386283ea81f7054e2e7c9fcaf653..b894ca39bfb80885917dc6bd903c9d47f9c1ae63 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 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008, 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


@@ -27,6 +27,7 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <signal.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <signal.h>

+#include <time.h>

 
 #include "syscalls.h"
 #include "log.h"
 
 #include "syscalls.h"
 #include "log.h"


@@ -34,20 +35,21 @@
 
 int mustnotbeminus1(const char *what, int ret) {
   if(ret == -1)
 
 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;
 }
 
 pid_t xfork(void) {
   pid_t pid;
 
   return ret;
 }
 
 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)
   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) {
 }
 
 void xdup2(int fd1, int fd2) {


@@ -140,7 +142,8 @@ int xnice(int inc) {
    * be -1 */
   errno = 0;
   ret = nice(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;
 }
 
   return ret;
 }
 


@@ -157,6 +160,10 @@ time_t xtime(time_t *whenp) {
   return tv.tv_sec;
 }
 
   return tv.tv_sec;
 }
 

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

 /*
 Local Variables:
 c-basic-offset:2
 /*
 Local Variables:
 c-basic-offset:2