X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=6a26ce5e3d4d5f2993affc76a544e96db1a5738c;hp=b8d0d77c3ba94091d753714d54b8181ce7c395ac;hb=7c007561e7031f5e33b91a8baf51bb952693a2d0;hpb=a731a7c6e78fb137268b42062d9fb08b4e49a2c8 diff --git a/fd.c b/fd.c index b8d0d77c..6a26ce5e 100644 --- a/fd.c +++ b/fd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 Andre Noll + * Copyright (C) 2006 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -10,14 +10,36 @@ #include #include #include -#include -#include #include "para.h" #include "error.h" #include "string.h" #include "fd.h" +/** + * Change the name or location of a file. + * + * \param oldpath File to be moved. + * \param newpath Destination. + * + * This is just a simple wrapper for the rename(2) system call which returns a + * paraslash error code and prints an error message on failure. + * + * \return Standard. + * + * \sa rename(2). + */ +int xrename(const char *oldpath, const char *newpath) +{ + int ret = rename(oldpath, newpath); + + if (ret >= 0) + return 1; + ret = -ERRNO_TO_PARA_ERROR(errno); + PARA_ERROR_LOG("failed to rename %s -> %s\n", oldpath, newpath); + return ret; +} + /** * Write an array of buffers to a file descriptor. * @@ -146,6 +168,7 @@ __printf_2_3 int write_va_buffer(int fd, const char *fmt, ...) va_start(ap, fmt); ret = xvasprintf(&msg, fmt, ap); + va_end(ap); ret = write_all(fd, msg, ret); free(msg); return ret;