X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=46ed6913626482c07eae50c99b943aaa39e275db;hp=ff3c95fe03853b0aaa80d873ea75748a10bf73d2;hb=c59730ef3c559fd79784c55153410db592eebd68;hpb=ef1f130a1f9ac61a51da10ee56c5bd9ef1b52366

diff --git a/afs.c b/afs.c
index ff3c95fe..46ed6913 100644
--- a/afs.c
+++ b/afs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -192,7 +192,7 @@ static int dispatch_result(int result_shmid, callback_result_handler *handler,
  * shmid are passed to that function as an osl object. The private_result_data
  * pointer is passed as the second argument to \a result_handler.
  *
- * \return Standard.
+ * \return Number of shared memory areas dispatched on success, negative on errors.
  *
  * \sa send_option_arg_callback_request(), send_standard_callback_request().
  */
@@ -205,7 +205,7 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	void *query_shm;
 	char buf[sizeof(afs_socket_cookie) + sizeof(int)];
 	size_t query_shm_size = sizeof(*cq);
-	int dispatch_error = 0;
+	int dispatch_error = 0, num_dispatched = 0;
 
 	if (query)
 		query_shm_size += query->size;
@@ -233,7 +233,7 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	if (ret < 0)
 		goto out;
 	fd = ret;
-	ret = send_bin_buffer(fd, buf, sizeof(buf));
+	ret = write_all(fd, buf, sizeof(buf));
 	if (ret < 0)
 		goto out;
 	/*
@@ -261,6 +261,7 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 		if (ret < 0)
 			PARA_CRIT_LOG("destroy result failed: %s\n",
 				para_strerror(-ret));
+		num_dispatched++;
 	}
 out:
 	if (shm_destroy(query_shmid) < 0)
@@ -268,7 +269,7 @@ out:
 	if (fd >= 0)
 		close(fd);
 //	PARA_DEBUG_LOG("callback_ret: %d\n", ret);
-	return ret;
+	return ret < 0? ret : num_dispatched;
 }
 
 /**
@@ -494,7 +495,7 @@ destroy:
 no_admissible_files:
 	*(uint32_t *)buf = NO_ADMISSIBLE_FILES;
 	*(uint32_t *)(buf + 4) = (uint32_t)0;
-	return send_bin_buffer(server_socket, buf, 8);
+	return write_all(server_socket, buf, 8);
 }
 
 /* Never fails if arg == NULL */
@@ -813,7 +814,7 @@ int pass_buffer_as_shm(char *buf, size_t size, void *fd_ptr)
 	ret = shm_detach(shm);
 	if (ret < 0)
 		goto err;
-	ret = send_bin_buffer(fd, (char *)&shmid, sizeof(int));
+	ret = write_all(fd, (char *)&shmid, sizeof(int));
 	if (ret >= 0)
 		return ret;
 err:
@@ -1049,7 +1050,8 @@ int com_init(struct stream_cipher_context *scc, int argc, char * const * const a
 	ret = send_callback_request(create_tables_callback, &query,
 		sc_send_result, scc);
 	if (ret < 0)
-		return sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
+		/* ignore return value */
+		sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
 	return ret;
 }