X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/132a5a4a47f9dbc7c52ee15234d70258c59ccf8e..70d2939adaa6ee884690256fccba884f6cc606b0:/lib/syscalls.c diff --git a/lib/syscalls.c b/lib/syscalls.c index 0d5dc18..b894ca3 100644 --- a/lib/syscalls.c +++ b/lib/syscalls.c @@ -1,6 +1,6 @@ /* * 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 @@ -27,6 +27,7 @@ #include #include #include +#include #include "syscalls.h" #include "log.h" @@ -34,20 +35,21 @@ 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; - 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) { @@ -140,7 +142,8 @@ 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; } @@ -148,6 +151,19 @@ 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; +} + +void xnanosleep(const struct timespec *req, struct timespec *rem) { + mustnotbeminus1("nanosleep", nanosleep(req, rem)); +} + /* Local Variables: c-basic-offset:2