X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=b8d0d77c3ba94091d753714d54b8181ce7c395ac;hp=3a8406d9c9fd1454a0807c8584bae78aa1b2f543;hb=3889b355ca075111a717da36946c779b7474a63d;hpb=26a0b7e457d1dd7e0e40d866d28de00c5d1cfa54 diff --git a/fd.c b/fd.c index 3a8406d9..b8d0d77c 100644 --- a/fd.c +++ b/fd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2012 Andre Noll + * Copyright (C) 2006-2014 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -162,13 +162,13 @@ __printf_2_3 int write_va_buffer(int fd, const char *fmt, ...) * * If \a rfds is not \p NULL and the (non-blocking) file descriptor \a fd is * not set in \a rfds, this function returns early without doing anything. - * Otherwise The function tries to read up to \a sz bytes from \a fd. As for - * xwrite(), EAGAIN is not considered an error condition. However, EOF - * is. + * Otherwise The function tries to read up to \a sz bytes from \a fd, where \a + * sz is the sum of the lengths of all vectors in \a iov. As for xwrite(), + * \p EAGAIN is not considered an error condition. However, \p EOF is. * * \return Zero or a negative error code. If the underlying call to readv(2) * returned zero (indicating an end of file condition) or failed for some - * reason other than \p EAGAIN, a negative return value is returned. + * reason other than \p EAGAIN, a negative error code is returned. * * In any case, \a num_bytes contains the number of bytes that have been * successfully read from \a fd (zero if the first readv() call failed with @@ -526,6 +526,7 @@ static int para_opendir(const char *dirname, DIR **dir, int *cwd) { int ret; + *dir = NULL; if (cwd) { ret = para_open(".", O_RDONLY, 0); if (ret < 0)