X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=899bd5a3d4f6fa1cb81c242ee7547e22c35bc726;hp=a5ea93aa9ffbb29fe6171bcf7dc28649ec081e3f;hb=0a3b9b83c371c71e41ba8470affef0fa0a7fba08;hpb=1f31b52b6816ce2716a3755a1896f77744fa167b

diff --git a/blob.c b/blob.c
index a5ea93aa..899bd5a3 100644
--- a/blob.c
+++ b/blob.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -74,7 +74,7 @@ static int print_blob(struct osl_table *table, struct osl_row *row,
 	}
 	ret = osl_get_object(table, row, BLOBCOL_ID, &obj);
 	if (ret < 0) {
-		para_printf(&lbad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+		para_printf(&lbad->pb, "%s: %s\n", name, para_strerror(-ret));
 		return ret;
 	}
 	id = *(uint32_t *)obj.data;
@@ -100,25 +100,24 @@ static int com_lsblob_callback(struct osl_table *table,
 	if (lbad.flags & BLOB_LS_FLAG_REVERSE)
 		pmd.pm_flags |= PM_REVERSE_LOOP;
 	if (!(lbad.flags & BLOB_LS_FLAG_SORT_BY_ID))
-		pmd.loop_col_num = BLOBCOL_ID;
-	else
 		pmd.loop_col_num = BLOBCOL_NAME;
+	else
+		pmd.loop_col_num = BLOBCOL_ID;
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
-		para_printf(&lbad.pb, "%s\n", PARA_STRERROR(-ret));
+		para_printf(&lbad.pb, "%s\n", para_strerror(-ret));
 	if (!lbad.pb.buf)
 		return 0;
 	result->data = lbad.pb.buf;
-	result->size = lbad.pb.size;
+	result->size = lbad.pb.offset;
 	return 1;
 }
 
 static int com_lsblob(callback_function *f, int fd, int argc, char * const * const argv)
 {
 	uint32_t flags = 0;
-	struct osl_object options = {.data = &flags, .size = sizeof(flags)},
-		result;
-	int i, ret;
+	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
+	int i;
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
@@ -144,13 +143,8 @@ static int com_lsblob(callback_function *f, int fd, int argc, char * const * con
 	}
 //	if (argc > i)
 //		return -E_BLOB_SYNTAX;
-	ret = send_option_arg_callback_request(&options, argc - i,
-		argv + i, f, &result);
-	if (ret > 0) {
-		send_buffer(fd, (char *)result.data);
-		free(result.data);
-	}
-	return ret;
+	return send_option_arg_callback_request(&options, argc - i,
+		argv + i, f, send_result, &fd);
 }
 
 static int cat_blob(struct osl_table *table, struct osl_row *row,
@@ -194,17 +188,9 @@ static int com_catblob_callback(struct osl_table *table,
 static int com_catblob(callback_function *f, int fd, int argc,
 		char * const * const argv)
 {
-	struct osl_object result;
-	int ret;
-
 	if (argc < 2)
 		return -E_BLOB_SYNTAX;
-	ret = send_standard_callback_request(argc - 1, argv + 1, f, &result);
-	if (ret > 0) {
-		ret = send_bin_buffer(fd, (char *)result.data, result.size);
-		free(result.data);
-	}
-	return ret;
+	return send_standard_callback_request(argc - 1, argv + 1, f, send_result, &fd);
 }
 
 /** Used for removing rows from a blob table. */
@@ -221,7 +207,7 @@ static int remove_blob(struct osl_table *table, struct osl_row *row,
 	struct rmblob_data *rmbd = data;
 	int ret = osl_del_row(table, row);
 	if (ret < 0) {
-		para_printf(&rmbd->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+		para_printf(&rmbd->pb, "%s: %s\n", name, para_strerror(-ret));
 		return ret;
 	}
 	rmbd->num_removed++;
@@ -246,7 +232,7 @@ static int com_rmblob_callback(struct osl_table *table,
 	result->data = NULL;
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
-		para_printf(&rmbd.pb, "%s\n", PARA_STRERROR(-ret));
+		para_printf(&rmbd.pb, "%s\n", para_strerror(-ret));
 	if (!rmbd.num_removed)
 		para_printf(&rmbd.pb, "no matches, nothing removed\n");
 	else {
@@ -254,25 +240,17 @@ static int com_rmblob_callback(struct osl_table *table,
 		afs_event(BLOB_RENAME, NULL, table);
 	}
 	result->data = rmbd.pb.buf;
-	result->size = rmbd.pb.size;
+	result->size = rmbd.pb.offset;
 	return 1;
 }
 
 static int com_rmblob(callback_function *f, int fd, int argc,
 		char * const * const argv)
 {
-	int ret;
-	struct osl_object result;
-
 	if (argc < 2)
 		return -E_MOOD_SYNTAX;
-	ret = send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
-		&result);
-	if (ret > 0) {
-		send_buffer(fd, (char *)result.data);
-		free(result.data);
-	}
-	return ret;
+	return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
+		send_result, &fd);
 }
 
 static int com_addblob_callback(struct osl_table *table,
@@ -354,7 +332,7 @@ static int com_addblob(callback_function *f, int fd, int argc,
 	PARA_NOTICE_LOG("argv[1]: %s\n", argv[1]);
 	arg_obj.size = strlen(argv[1]) + 1;
 	arg_obj.data = (char *)argv[1];
-	return stdin_command(fd, &arg_obj, f, 10 * 1024 * 1024, NULL);
+	return stdin_command(fd, &arg_obj, f, 10 * 1024 * 1024, NULL, NULL);
 }
 
 static int com_mvblob_callback(struct osl_table *table,
@@ -384,7 +362,7 @@ static int com_mvblob(callback_function *f, __a_unused int fd,
 	if (argc != 3)
 		return -E_MOOD_SYNTAX;
 	return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
-		NULL);
+		NULL, NULL);
 }
 
 #define DEFINE_BLOB_COMMAND(cmd_name, table_name, cmd_prefix) \