X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=fd.c;h=b889d9d2144a4ad78cf6442997d80fec643aad87;hp=b0089d3051c0676d4171bcc80c6ed15338e73f2e;hb=7b6c89298d2367d3bf6f488f74f15aba655f21de;hpb=21417b06a9c9b83a82252b4294b1ddede0c38af2

diff --git a/fd.c b/fd.c
index b0089d3..b889d9d 100644
--- a/fd.c
+++ b/fd.c
@@ -13,8 +13,36 @@
 #include <sys/select.h>
 
 #include "log.h"
+#include "osl.h"
 #include "error.h"
 
+/**
+ * Wrapper for the write system call.
+ *
+ * \param fd The file descriptor to write to.
+ * \param buf The buffer to write.
+ * \param size The length of \a buf in bytes.
+ *
+ * This function writes out the given buffer and retries if an interrupt
+ * occurred during the write.
+ *
+ * \return On success, the number of bytes written is returned, otherwise, a
+ * negative error code is returned.
+ *
+ * \sa write(2).
+ */
+static ssize_t __write(int fd, const void *buf, size_t size)
+{
+	ssize_t ret;
+
+	for (;;) {
+		ret = write(fd, buf, size);
+		if ((ret < 0) && (errno == EAGAIN || errno == EINTR))
+			continue;
+		return ret >= 0? ret : -ERRNO_TO_ERROR(errno);
+	}
+}
+
 /**
  * Write a buffer to a file descriptor, re-write on short writes.
  *
@@ -32,9 +60,9 @@ int write_all(int fd, const char *buf, size_t *len)
 	assert(total);
 	*len = 0;
 	while (*len < total) {
-		int ret = write(fd, buf + *len, total - *len);
-		if (ret == -1)
-			return -ERRNO_TO_ERROR(errno);
+		int ret = __write(fd, buf + *len, total - *len);
+		if (ret < 0)
+			return ret;
 		*len += ret;
 	}
 	return 1;
@@ -63,6 +91,32 @@ int osl_open(const char *path, int flags, mode_t mode)
 	return -ERRNO_TO_ERROR(errno);
 }
 
+/**
+ * Open a file, write the given buffer and close the file.
+ *
+ * \param filename Full path to the file to open.
+ * \param buf The buffer to write to the file.
+ * \param size The size of \a buf.
+ *
+ * \return Standard.
+ */
+int write_file(const char *filename, const void *buf, size_t size)
+{
+	int ret, fd;
+
+	ret = osl_open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
+	if (ret < 0)
+		return ret;
+	fd = ret;
+	ret = write_all(fd, buf, &size);
+	if (ret < 0)
+		goto out;
+	ret = 1;
+out:
+	close(fd);
+	return ret;
+}
+
 /**
  * Wrapper for chdir(2).
  *
@@ -143,21 +197,6 @@ int para_fchdir(int fd)
 	return 1;
 }
 
-/**
- * A wrapper for mkdir(2).
- *
- * \param path Name of the directory to create.
- * \param mode The permissions to use.
- *
- * \return Standard.
- */
-int para_mkdir(const char *path, mode_t mode)
-{
-	if (!mkdir(path, mode))
-		return 1;
-	return -ERRNO_TO_ERROR(errno);
-}
-
 /**
  * Open a file and map it into memory.
  *
@@ -197,14 +236,14 @@ int mmap_full_file(const char *path, int open_mode, void **map,
 		goto out;
 	}
 	*size = file_status.st_size;
-	ret = -E_EMPTY;
+	ret = -E_OSL_EMPTY;
 	DEBUG_LOG("%s: size %zu\n", path, *size);
 	if (!*size)
 		goto out;
 	*map = mmap(NULL, *size, mmap_prot, mmap_flags, fd, 0);
 	if (*map == MAP_FAILED) {
 		*map = NULL;
-		ret = -E_MMAP;
+		ret = -E_OSL_MMAP;
 		goto out;
 	}
 	ret = 1;
@@ -226,7 +265,7 @@ out:
  *
  * \sa munmap(2), mmap_full_file().
  */
-int para_munmap(void *start, size_t length)
+int osl_munmap(void *start, size_t length)
 {
 	int err;
 	if (munmap(start, length) >= 0)
@@ -236,3 +275,50 @@ int para_munmap(void *start, size_t length)
 		strerror(err));
 	return -ERRNO_TO_ERROR(err);
 }
+
+/**
+ * Allocate a sufficiently large string and print into it.
+ *
+ * \param fmt A usual format string.
+ *
+ * Produce output according to \p fmt. No artificial bound on the length of the
+ * resulting string is imposed.
+ *
+ * \return This function either returns a pointer to a string that must be
+ * freed by the caller or \p NULL if memory allocation failed.
+ *
+ * \sa printf(3).
+ */
+__must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...)
+{
+	int n;
+	size_t size = 100;
+	char *p = malloc(size);
+
+	if (!p)
+		return NULL;
+	while (1) {
+		char *q;
+		va_list ap;
+		/* Try to print in the allocated space. */
+		va_start(ap, fmt);
+		n = vsnprintf(p, size, fmt, ap);
+		va_end(ap);
+		/* If that worked, return the string. */
+		if (n > -1 && n < size)
+			break;
+		/* Else try again with more space. */
+		if (n > -1) /* glibc 2.1 */
+			size = n + 1; /* precisely what is needed */
+		else /* glibc 2.0 */
+			size *= 2; /* twice the old size */
+		q = realloc(p, size);
+		if (!q) {
+			free(p);
+			return NULL;
+		}
+		p = q;
+	}
+	return p;
+}
+