Index: uspace/lib/libc/generic/async.c
===================================================================
--- uspace/lib/libc/generic/async.c	(revision b4cbef1df4af24ecf6ce8b7e766827011666ebf1)
+++ uspace/lib/libc/generic/async.c	(revision eda925ad3905a0c8e5cc3f1d3908e5bb1d14bcae)
@@ -1383,16 +1383,19 @@
 }
 
-/** Wrapper for receiving binary data
+/** Wrapper for receiving binary data or strings
  *
  * This wrapper only makes it more comfortable to use async_data_write_*
- * functions to receive binary data.
+ * functions to receive binary data or strings.
  *
  * @param data       Pointer to data pointer (which should be later disposed
  *                   by free()). If the operation fails, the pointer is not
  *                   touched.
+ * @param nullterm   If true then the received data is always zero terminated.
+ *                   This also causes to allocate one extra byte beyond the
+ *                   raw transmitted data.
  * @param min_size   Minimum size (in bytes) of the data to receive.
  * @param max_size   Maximum size (in bytes) of the data to receive. 0 means
  *                   no limit.
- * @param granulariy If non-zero, then the size of the received data has to
+ * @param granulariy If non-zero then the size of the received data has to
  *                   be divisible by this value.
  * @param received   If not NULL, the size of the received data is stored here.
@@ -1401,6 +1404,7 @@
  *
  */
-int async_data_receive(void **data, const size_t min_size,
-    const size_t max_size, const size_t granularity, size_t *received)
+int async_data_write_accept(void **data, const bool nullterm,
+    const size_t min_size, const size_t max_size, const size_t granularity,
+    size_t *received)
 {
 	ipc_callid_t callid;
@@ -1426,5 +1430,11 @@
 	}
 	
-	void *_data = malloc(size);
+	void *_data;
+	
+	if (nullterm)
+		_data = malloc(size + 1);
+	else
+		_data = malloc(size);
+	
 	if (_data == NULL) {
 		ipc_answer_0(callid, ENOMEM);
@@ -1438,4 +1448,7 @@
 	}
 	
+	if (nullterm)
+		((char *) _data)[size] = 0;
+	
 	*data = _data;
 	if (received != NULL)
@@ -1445,53 +1458,4 @@
 }
 
-/** Wrapper for receiving strings
- *
- * This wrapper only makes it more comfortable to use async_data_write_*
- * functions to receive strings.
- *
- * @param str      Pointer to string pointer (which should be later disposed
- *                 by free()). If the operation fails, the pointer is not
- *                 touched.
- * @param max_size Maximum size (in bytes) of the string to receive. 0 means
- *                 no limit.
- * @param received If not NULL, the size of the received data is stored here.
- *
- * @return Zero on success or a value from @ref errno.h on failure.
- *
- */
-int async_string_receive(char **str, const size_t max_size, size_t *received)
-{
-	ipc_callid_t callid;
-	size_t size;
-	if (!async_data_write_receive(&callid, &size)) {
-		ipc_answer_0(callid, EINVAL);
-		return EINVAL;
-	}
-	
-	if ((max_size > 0) && (size > max_size)) {
-		ipc_answer_0(callid, EINVAL);
-		return EINVAL;
-	}
-	
-	char *data = (char *) malloc(size + 1);
-	if (data == NULL) {
-		ipc_answer_0(callid, ENOMEM);
-		return ENOMEM;
-	}
-	
-	int rc = async_data_write_finalize(callid, data, size);
-	if (rc != EOK) {
-		free(data);
-		return rc;
-	}
-	
-	data[size] = 0;
-	*str = data;
-	if (received != NULL)
-		*received = size;
-	
-	return EOK;
-}
-
 /** Wrapper for voiding any data that is about to be received
  *
@@ -1501,5 +1465,5 @@
  *
  */
-void async_data_void(const int retval)
+void async_data_write_void(const int retval)
 {
 	ipc_callid_t callid;
@@ -1512,5 +1476,5 @@
  *
  */
-int async_data_forward_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
+int async_data_write_forward_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr)
 {
Index: uspace/lib/libc/include/async.h
===================================================================
--- uspace/lib/libc/include/async.h	(revision b4cbef1df4af24ecf6ce8b7e766827011666ebf1)
+++ uspace/lib/libc/include/async.h	(revision eda925ad3905a0c8e5cc3f1d3908e5bb1d14bcae)
@@ -310,34 +310,37 @@
 extern int async_data_read_receive(ipc_callid_t *, size_t *);
 extern int async_data_read_finalize(ipc_callid_t, const void *, size_t);
+
 extern int async_data_read_forward_fast(int, ipcarg_t, ipcarg_t, ipcarg_t,
     ipcarg_t, ipcarg_t, ipc_call_t *);
 
 /*
- * User-friendly wrappers for async_data_forward_fast().
- */
-#define async_data_forward_0_0(phoneid, method, answer) \
-	async_data_forward_fast((phoneid), (method), 0, 0, 0, 0, NULL)
-#define async_data_forward_0_1(phoneid, method, answer) \
-	async_data_forward_fast((phoneid), (method), 0, 0, 0, 0, (answer))
-#define async_data_forward_1_0(phoneid, method, arg1, answer) \
-	async_data_forward_fast((phoneid), (method), (arg1), 0, 0, 0, NULL)
-#define async_data_forward_1_1(phoneid, method, arg1, answer) \
-	async_data_forward_fast((phoneid), (method), (arg1), 0, 0, 0, (answer))
-#define async_data_forward_2_0(phoneid, method, arg1, arg2, answer) \
-	async_data_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, NULL)
-#define async_data_forward_2_1(phoneid, method, arg1, arg2, answer) \
-	async_data_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, \
+ * User-friendly wrappers for async_data_write_forward_fast().
+ */
+#define async_data_write_forward_0_0(phoneid, method, answer) \
+	async_data_write_forward_fast((phoneid), (method), 0, 0, 0, 0, NULL)
+#define async_data_write_forward_0_1(phoneid, method, answer) \
+	async_data_write_forward_fast((phoneid), (method), 0, 0, 0, 0, (answer))
+#define async_data_write_forward_1_0(phoneid, method, arg1, answer) \
+	async_data_write_forward_fast((phoneid), (method), (arg1), 0, 0, 0, NULL)
+#define async_data_write_forward_1_1(phoneid, method, arg1, answer) \
+	async_data_write_forward_fast((phoneid), (method), (arg1), 0, 0, 0, \
 	    (answer))
-#define async_data_forward_3_0(phoneid, method, arg1, arg2, arg3, answer) \
-	async_data_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, \
-	    NULL)
-#define async_data_forward_3_1(phoneid, method, arg1, arg2, arg3, answer) \
-	async_data_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, \
+#define async_data_write_forward_2_0(phoneid, method, arg1, arg2, answer) \
+	async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, \
+	    NULL)
+#define async_data_write_forward_2_1(phoneid, method, arg1, arg2, answer) \
+	async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, \
 	    (answer))
-#define async_data_forward_4_0(phoneid, method, arg1, arg2, arg3, arg4, answer) \
-	async_data_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \
+#define async_data_write_forward_3_0(phoneid, method, arg1, arg2, arg3, answer) \
+	async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \
+	    0, NULL)
+#define async_data_write_forward_3_1(phoneid, method, arg1, arg2, arg3, answer) \
+	async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \
+	    0, (answer))
+#define async_data_write_forward_4_0(phoneid, method, arg1, arg2, arg3, arg4, answer) \
+	async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \
 	    (arg4), NULL)
-#define async_data_forward_4_1(phoneid, method, arg1, arg2, arg3, arg4, answer) \
-	async_data_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \
+#define async_data_write_forward_4_1(phoneid, method, arg1, arg2, arg3, arg4, answer) \
+	async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \
 	    (arg4), (answer))
 
@@ -345,10 +348,11 @@
 extern int async_data_write_receive(ipc_callid_t *, size_t *);
 extern int async_data_write_finalize(ipc_callid_t, void *, size_t);
-extern int async_data_receive(void **, const size_t, const size_t,
-    const size_t, size_t *);
-extern int async_string_receive(char **, const size_t, size_t *);
-extern void async_data_void(const int);
-extern int async_data_forward_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipc_call_t *);
+
+extern int async_data_write_accept(void **, const bool, const size_t,
+    const size_t, const size_t, size_t *);
+extern void async_data_write_void(const int);
+
+extern int async_data_write_forward_fast(int, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t, ipcarg_t, ipc_call_t *);
 
 #endif
Index: uspace/lib/libfs/libfs.c
===================================================================
--- uspace/lib/libfs/libfs.c	(revision b4cbef1df4af24ecf6ce8b7e766827011666ebf1)
+++ uspace/lib/libfs/libfs.c	(revision eda925ad3905a0c8e5cc3f1d3908e5bb1d14bcae)
@@ -176,5 +176,5 @@
 	if ((res != EOK) || (!fn)) {
 		ipc_hangup(mountee_phone);
-		async_data_void(combine_rc(res, ENOENT));
+		async_data_write_void(combine_rc(res, ENOENT));
 		ipc_answer_0(rid, combine_rc(res, ENOENT));
 		return;
@@ -184,5 +184,5 @@
 		ipc_hangup(mountee_phone);
 		(void) ops->node_put(fn);
-		async_data_void(EBUSY);
+		async_data_write_void(EBUSY);
 		ipc_answer_0(rid, EBUSY);
 		return;
@@ -193,5 +193,5 @@
 		ipc_hangup(mountee_phone);
 		(void) ops->node_put(fn);
-		async_data_void(rc);
+		async_data_write_void(rc);
 		ipc_answer_0(rid, rc);
 		return;
@@ -199,6 +199,6 @@
 	
 	ipc_call_t answer;
-	rc = async_data_forward_1_1(mountee_phone, VFS_OUT_MOUNTED, mr_dev_handle,
-	    &answer);
+	rc = async_data_write_forward_1_1(mountee_phone, VFS_OUT_MOUNTED,
+	    mr_dev_handle, &answer);
 	
 	if (rc == EOK) {
Index: uspace/srv/clip/clip.c
===================================================================
--- uspace/srv/clip/clip.c	(revision b4cbef1df4af24ecf6ce8b7e766827011666ebf1)
+++ uspace/srv/clip/clip.c	(revision eda925ad3905a0c8e5cc3f1d3908e5bb1d14bcae)
@@ -65,5 +65,5 @@
 		break;
 	case CLIPBOARD_TAG_DATA:
-		rc = async_data_receive(&data, 0, 0, 0, &size);
+		rc = async_data_write_accept((char **) &data, false, 0, 0, 0, &size);
 		if (rc != EOK) {
 			ipc_answer_0(rid, rc);
Index: uspace/srv/devmap/devmap.c
===================================================================
--- uspace/srv/devmap/devmap.c	(revision b4cbef1df4af24ecf6ce8b7e766827011666ebf1)
+++ uspace/srv/devmap/devmap.c	(revision eda925ad3905a0c8e5cc3f1d3908e5bb1d14bcae)
@@ -396,5 +396,6 @@
 	 * Get driver name
 	 */
-	int rc = async_string_receive(&driver->name, DEVMAP_NAME_MAXLEN, NULL);
+	int rc = async_data_write_accept((char **) &driver->name, true, 0,
+	    DEVMAP_NAME_MAXLEN, 0, NULL);
 	if (rc != EOK) {
 		free(driver);
@@ -510,5 +511,6 @@
 	/* Get fqdn */
 	char *fqdn;
-	int rc = async_string_receive(&fqdn, DEVMAP_NAME_MAXLEN, NULL);
+	int rc = async_data_write_accept((char **) &fqdn, true, 0,
+	    DEVMAP_NAME_MAXLEN, 0, NULL);
 	if (rc != EOK) {
 		free(device);
@@ -622,5 +624,6 @@
 	
 	/* Get fqdn */
-	int rc = async_string_receive(&fqdn, DEVMAP_NAME_MAXLEN, NULL);
+	int rc = async_data_write_accept((char **) &fqdn, true, 0,
+	    DEVMAP_NAME_MAXLEN, 0, NULL);
 	if (rc != EOK) {
 		ipc_answer_0(iid, rc);
@@ -683,5 +686,6 @@
 	
 	/* Get device name */
-	int rc = async_string_receive(&name, DEVMAP_NAME_MAXLEN, NULL);
+	int rc = async_data_write_accept((char **) &name, true, 0,
+	    DEVMAP_NAME_MAXLEN, 0, NULL);
 	if (rc != EOK) {
 		ipc_answer_0(iid, rc);
Index: uspace/srv/fs/devfs/devfs_ops.c
===================================================================
--- uspace/srv/fs/devfs/devfs_ops.c	(revision b4cbef1df4af24ecf6ce8b7e766827011666ebf1)
+++ uspace/srv/fs/devfs/devfs_ops.c	(revision eda925ad3905a0c8e5cc3f1d3908e5bb1d14bcae)
@@ -419,5 +419,6 @@
 	
 	/* Accept the mount options */
-	ipcarg_t retval = async_string_receive(&opts, 0, NULL);
+	ipcarg_t retval = async_data_write_accept((char **) &opts, true, 0, 0,
+	    0, NULL);
 	if (retval != EOK) {
 		ipc_answer_0(rid, retval);
Index: uspace/srv/fs/fat/fat_ops.c
===================================================================
--- uspace/srv/fs/fat/fat_ops.c	(revision b4cbef1df4af24ecf6ce8b7e766827011666ebf1)
+++ uspace/srv/fs/fat/fat_ops.c	(revision eda925ad3905a0c8e5cc3f1d3908e5bb1d14bcae)
@@ -977,5 +977,5 @@
 	/* Accept the mount options */
 	char *opts;
-	int rc = async_string_receive(&opts, 0, NULL);
+	int rc = async_data_write_accept((char **) &opts, true, 0, 0, 0, NULL);
 	
 	if (rc != EOK) {
Index: uspace/srv/fs/tmpfs/tmpfs_ops.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision b4cbef1df4af24ecf6ce8b7e766827011666ebf1)
+++ uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision eda925ad3905a0c8e5cc3f1d3908e5bb1d14bcae)
@@ -442,5 +442,5 @@
 	/* Accept the mount options */
 	char *opts;
-	int rc = async_string_receive(&opts, 0, NULL);
+	int rc = async_data_write_accept((char **) &opts, true, 0, 0, 0, NULL);
 	
 	if (rc != EOK) {
Index: uspace/srv/hid/console/console.c
===================================================================
--- uspace/srv/hid/console/console.c	(revision b4cbef1df4af24ecf6ce8b7e766827011666ebf1)
+++ uspace/srv/hid/console/console.c	(revision eda925ad3905a0c8e5cc3f1d3908e5bb1d14bcae)
@@ -477,5 +477,5 @@
 	void *buf;
 	size_t size;
-	int rc = async_data_receive(&buf, 0, 0, 0, &size);
+	int rc = async_data_write_accept(&buf, false, 0, 0, 0, &size);
 	
 	if (rc != EOK) {
Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision b4cbef1df4af24ecf6ce8b7e766827011666ebf1)
+++ uspace/srv/loader/main.c	(revision eda925ad3905a0c8e5cc3f1d3908e5bb1d14bcae)
@@ -126,5 +126,5 @@
 {
 	char *buf;
-	int rc = async_string_receive(&buf, 0, NULL);
+	int rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, NULL);
 	
 	if (rc == EOK) {
@@ -146,5 +146,5 @@
 {
 	char *buf;
-	int rc = async_string_receive(&buf, 0, NULL);
+	int rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, NULL);
 	
 	if (rc == EOK) {
@@ -167,5 +167,5 @@
 	char *buf;
 	size_t buf_size;
-	int rc = async_string_receive(&buf, 0, &buf_size);
+	int rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, &buf_size);
 	
 	if (rc == EOK) {
@@ -232,5 +232,6 @@
 	fdi_node_t *buf;
 	size_t buf_size;
-	int rc = async_data_receive(&buf, 0, 0, sizeof(fdi_node_t), &buf_size);
+	int rc = async_data_write_accept((void **) &buf, false, 0, 0,
+	    sizeof(fdi_node_t), &buf_size);
 	
 	if (rc == EOK) {
Index: uspace/srv/vfs/vfs_ops.c
===================================================================
--- uspace/srv/vfs/vfs_ops.c	(revision b4cbef1df4af24ecf6ce8b7e766827011666ebf1)
+++ uspace/srv/vfs/vfs_ops.c	(revision eda925ad3905a0c8e5cc3f1d3908e5bb1d14bcae)
@@ -267,5 +267,6 @@
 	/* We want the client to send us the mount point. */
 	char *mp;
-	int rc = async_string_receive(&mp, MAX_PATH_LEN, NULL);
+	int rc = async_data_write_accept((char **) &mp, true, 0, MAX_PATH_LEN,
+	    0, NULL);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
@@ -275,5 +276,6 @@
 	/* Now we expect to receive the mount options. */
 	char *opts;
-	rc = async_string_receive(&opts, MAX_MNTOPTS_LEN, NULL);
+	rc = async_data_write_accept((char **) &opts, true, 0, MAX_MNTOPTS_LEN,
+	    0, NULL);
 	if (rc != EOK) {
 		free(mp);
@@ -287,5 +289,6 @@
 	 */
 	char *fs_name;
-	rc = async_string_receive(&fs_name, FS_NAME_MAXLEN, NULL);
+	rc = async_data_write_accept((char **) &fs_name, true, 0, FS_NAME_MAXLEN,
+	    0, NULL);
 	if (rc != EOK) {
 		free(mp);
@@ -357,5 +360,6 @@
 	 * Receive the mount point path.
 	 */
-	rc = async_string_receive(&mp, MAX_PATH_LEN, NULL);
+	rc = async_data_write_accept((char **) &mp, true, 0, MAX_PATH_LEN,
+	    0, NULL);
 	if (rc != EOK)
 		ipc_answer_0(rid, rc);
@@ -522,5 +526,5 @@
 	
 	char *path;
-	int rc = async_string_receive(&path, 0, NULL);
+	int rc = async_data_write_accept((char **) &path, true, 0, 0, 0, NULL);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
@@ -836,5 +840,5 @@
 		    &answer);
 	} else {
-		rc = async_data_forward_3_1(fs_phone, VFS_OUT_WRITE,
+		rc = async_data_write_forward_3_1(fs_phone, VFS_OUT_WRITE,
 		    file->node->dev_handle, file->node->index, file->pos,
 		    &answer);
@@ -1007,5 +1011,5 @@
 {
 	char *path;
-	int rc = async_string_receive(&path, 0, NULL);
+	int rc = async_data_write_accept((char **) &path, true, 0, 0, 0, NULL);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
@@ -1061,5 +1065,5 @@
 	
 	char *path;
-	int rc = async_string_receive(&path, 0, NULL);
+	int rc = async_data_write_accept((char **) &path, true, 0, 0, 0, NULL);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
@@ -1083,5 +1087,5 @@
 	
 	char *path;
-	int rc = async_string_receive(&path, 0, NULL);
+	int rc = async_data_write_accept((char **) &path, true, 0, 0, 0, NULL);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
@@ -1118,5 +1122,5 @@
 	/* Retrieve the old path. */
 	char *old;
-	int rc = async_string_receive(&old, 0, NULL);
+	int rc = async_data_write_accept((char **) &old, true, 0, 0, 0, NULL);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
@@ -1126,5 +1130,5 @@
 	/* Retrieve the new path. */
 	char *new;
-	rc = async_string_receive(&new, 0, NULL);
+	rc = async_data_write_accept((char **) &new, true, 0, 0, 0, NULL);
 	if (rc != EOK) {
 		free(old);
Index: uspace/srv/vfs/vfs_register.c
===================================================================
--- uspace/srv/vfs/vfs_register.c	(revision b4cbef1df4af24ecf6ce8b7e766827011666ebf1)
+++ uspace/srv/vfs/vfs_register.c	(revision eda925ad3905a0c8e5cc3f1d3908e5bb1d14bcae)
@@ -114,6 +114,6 @@
 	
 	vfs_info_t *vfs_info;
-	int rc = async_data_receive(&vfs_info, sizeof(vfs_info_t),
-	    sizeof(vfs_info_t), 0, NULL);
+	int rc = async_data_write_accept((void **) &vfs_info, false,
+	    sizeof(vfs_info_t), sizeof(vfs_info_t), 0, NULL);
 	
 	if (rc != EOK) {