X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=6f487c410020795a73476fa79ba552c2ad29e4fd;hp=a0969e3e651a92983682f29f1ca375b214a6447a;hb=748d1368bc96dd7e1af879df1ea41b4d52842f7e;hpb=b62e2796b85c7d7f3138fe729f4637853e0fafe0

diff --git a/fd.c b/fd.c
index a0969e3e..6f487c41 100644
--- a/fd.c
+++ b/fd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -25,22 +25,40 @@
  * \param buf The buffer to be sent.
  * \param len The length of \a buf.
  *
- * \return Standard. In any case, the number of bytes that have been written is
- * stored in \a len.
+ * \return Standard.
  */
-int write_all(int fd, const char *buf, size_t *len)
+int write_all(int fd, const char *buf, size_t len)
 {
-	size_t total = *len;
+	size_t total = len;
 
 	assert(total);
-	*len = 0;
-	while (*len < total) {
-		int ret = write(fd, buf + *len, total - *len);
+	len = 0;
+	while (len < total) {
+		int ret = write(fd, buf + len, total - len);
 		if (ret == -1)
 			return -ERRNO_TO_PARA_ERROR(errno);
-		*len += ret;
+		len += ret;
 	}
-	return 1;
+	return len;
+}
+
+/**
+ * Send a buffer given by a format string.
+ *
+ * \param fd The file descriptor.
+ * \param fmt A format string.
+ *
+ * \return Standard.
+ */
+__printf_2_3 int write_va_buffer(int fd, const char *fmt, ...)
+{
+	char *msg;
+	int ret;
+
+	PARA_VSPRINTF(fmt, msg);
+	ret = write_buffer(fd, msg);
+	free(msg);
+	return ret;
 }
 
 /**
@@ -446,7 +464,7 @@ int para_chdir(const char *path)
  * \sa getcwd(3).
  *
  */
-int para_opendir(const char *dirname, DIR **dir, int *cwd)
+static int para_opendir(const char *dirname, DIR **dir, int *cwd)
 {
 	int ret;
 
@@ -480,7 +498,7 @@ close_cwd:
  *
  * \return Standard.
  */
-int para_fchdir(int fd)
+static int para_fchdir(int fd)
 {
 	if (fchdir(fd) < 0)
 		return -ERRNO_TO_PARA_ERROR(errno);
@@ -563,6 +581,9 @@ out:
 int para_munmap(void *start, size_t length)
 {
 	int err;
+
+	if (!start)
+		return 0;
 	if (munmap(start, length) >= 0)
 		return 1;
 	err = errno;