X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=409e348709de83de48090c0535f3aced79dda2c8;hp=dfe4e37431226bb80b298b7b676928897e645413;hb=869f0e06ec4e15abc9230c1b2d7615da5250802e;hpb=e4db7671a91a7552c642acc979f0eb278f8d467f

diff --git a/blob.c b/blob.c
index dfe4e374..409e3487 100644
--- a/blob.c
+++ b/blob.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.
  */
@@ -16,9 +16,9 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "net.h"
 #include "ipc.h"
 #include "portable_io.h"
+#include "command.h"
 
 /**
  * Compare two osl objects pointing to unsigned integers of 32 bit size.
@@ -81,12 +81,13 @@ static struct osl_column_description blob_cols[] = {
 	DEFINE_BLOB_TABLE_DESC(table_name); \
 	DEFINE_BLOB_TABLE_PTR(table_name);
 
-/** \cond doxygen isn't smart enough to recognize these */
+/* doxygen isn't smart enough to recognize these */
+/** \cond blob_table */
 INIT_BLOB_TABLE(lyrics);
 INIT_BLOB_TABLE(images);
 INIT_BLOB_TABLE(moods);
 INIT_BLOB_TABLE(playlists);
-/** \endcond */
+/** \endcond blob_table */
 
 /** Flags that may be passed to the \p ls functions of each blob  type. */
 enum blob_ls_flags {
@@ -131,7 +132,7 @@ static void com_lsblob_callback(struct osl_table *table,
 	struct lsblob_action_data lbad = {
 		.flags = *(uint32_t *)query->data,
 		.pb = {
-			.max_size = SHMMAX,
+			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
 			.max_size_handler = pass_buffer_as_shm
 		}
@@ -156,19 +157,21 @@ static void com_lsblob_callback(struct osl_table *table,
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
 		para_printf(&lbad.pb, "%s\n", para_strerror(-ret));
+	else if (pmd.num_matches == 0 && pmd.patterns.size > 0)
+		para_printf(&lbad.pb, "no matches\n");
 	if (lbad.pb.offset)
 		pass_buffer_as_shm(lbad.pb.buf, lbad.pb.offset, &fd);
 	free(lbad.pb.buf);
 }
 
-static int com_lsblob(callback_function *f, struct stream_cipher_context *scc, int argc, char * const * const argv)
+static int com_lsblob(callback_function *f, struct command_context *cc)
 {
 	uint32_t flags = 0;
 	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
 	int i;
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
@@ -191,8 +194,8 @@ static int com_lsblob(callback_function *f, struct stream_cipher_context *scc, i
 	}
 //	if (argc > i)
 //		return -E_BLOB_SYNTAX;
-	return send_option_arg_callback_request(&options, argc - i,
-		argv + i, f, sc_send_result, scc);
+	return send_option_arg_callback_request(&options, cc->argc - i,
+		cc->argv + i, f, sc_send_result, cc);
 }
 
 static int cat_blob(struct osl_table *table, struct osl_row *row,
@@ -203,9 +206,9 @@ static int cat_blob(struct osl_table *table, struct osl_row *row,
 
 	ret = osl(osl_open_disk_object(table, row, BLOBCOL_DEF, &obj));
 	if (ret < 0)
-		return ret;
-	if (obj.size)
-		ret = pass_buffer_as_shm(obj.data, obj.size, data);
+		return (ret == osl(-E_OSL_EMPTY))? 0 : ret;
+	assert(obj.size > 0);
+	ret = pass_buffer_as_shm(obj.data, obj.size, data);
 	ret2 = osl(osl_close_disk_object(&obj));
 	return (ret < 0)? ret : ret2;
 }
@@ -223,23 +226,24 @@ static void com_catblob_callback(struct osl_table *table, int fd,
 		.action = cat_blob
 	};
 	for_each_matching_row(&pmd);
+	if (pmd.num_matches == 0) {
+		char err_msg[] = "no matches\n";
+		pass_buffer_as_shm(err_msg, sizeof(err_msg), &fd);
+	}
 }
 
-static int com_catblob(callback_function *f, struct stream_cipher_context *scc, int argc,
-		char * const * const argv)
+static int com_catblob(callback_function *f, struct command_context *cc)
 {
-	if (argc < 2)
+	if (cc->argc < 2)
 		return -E_BLOB_SYNTAX;
-	return send_standard_callback_request(argc - 1, argv + 1, f,
-		sc_send_result, scc);
+	return send_standard_callback_request(cc->argc - 1, cc->argv + 1, f,
+		sc_send_result, cc);
 }
 
 /** Used for removing rows from a blob table. */
 struct rmblob_data {
 	/** Message buffer. */
 	struct para_buffer pb;
-	/** Number of removed blobs. */
-	unsigned num_removed;
 };
 
 static int remove_blob(struct osl_table *table, struct osl_row *row,
@@ -251,7 +255,6 @@ static int remove_blob(struct osl_table *table, struct osl_row *row,
 		para_printf(&rmbd->pb, "%s: %s\n", name, para_strerror(-ret));
 		return ret;
 	}
-	rmbd->num_removed++;
 	return 1;
 }
 
@@ -260,9 +263,8 @@ static void com_rmblob_callback(struct osl_table *table, int fd,
 {
 	int ret, ret2 = 0;
 	struct rmblob_data rmbd = {
-		.num_removed = 0,
 		.pb = {
-			.max_size = SHMMAX,
+			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
 			.max_size_handler = pass_buffer_as_shm
 		}
@@ -282,10 +284,10 @@ static void com_rmblob_callback(struct osl_table *table, int fd,
 		if (ret2 < 0)
 			goto out;
 	}
-	if (!rmbd.num_removed)
+	if (pmd.num_matches == 0)
 		ret2 = para_printf(&rmbd.pb, "no matches, nothing removed\n");
 	else {
-		ret2 = para_printf(&rmbd.pb, "removed %d blobs\n", rmbd.num_removed);
+		ret2 = para_printf(&rmbd.pb, "removed %d blobs\n", pmd.num_matches);
 		afs_event(BLOB_RENAME, NULL, table);
 	}
 out:
@@ -294,13 +296,12 @@ out:
 	free(rmbd.pb.buf);
 }
 
-static int com_rmblob(callback_function *f, struct stream_cipher_context *scc, int argc,
-		char * const * const argv)
+static int com_rmblob(callback_function *f, struct command_context *cc)
 {
-	if (argc < 2)
+	if (cc->argc < 2)
 		return -E_MOOD_SYNTAX;
-	return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
-		sc_send_result, scc);
+	return send_option_arg_callback_request(NULL, cc->argc - 1, cc->argv + 1, f,
+		sc_send_result, cc);
 }
 
 static void com_addblob_callback(struct osl_table *table, __a_unused int fd,
@@ -423,7 +424,7 @@ static int fd2buf(struct stream_cipher_context *scc, unsigned max_size, struct o
  * \return Negative on errors, the return value of the underlying call to
  * send_callback_request() otherwise.
  */
-static int stdin_command(struct stream_cipher_context *scc, struct osl_object *arg_obj,
+static int stdin_command(struct command_context *cc, struct osl_object *arg_obj,
 		callback_function *f, unsigned max_len,
 		callback_result_handler *result_handler,
 		void *private_result_data)
@@ -431,10 +432,10 @@ static int stdin_command(struct stream_cipher_context *scc, struct osl_object *a
 	struct osl_object query, stdin_obj;
 	int ret;
 
-	ret = sc_send_buffer(scc, AWAITING_DATA_MSG);
+	ret = sc_send_buffer(&cc->scc, AWAITING_DATA_MSG);
 	if (ret < 0)
 		return ret;
-	ret = fd2buf(scc, max_len, &stdin_obj);
+	ret = fd2buf(&cc->scc, max_len, &stdin_obj);
 	if (ret < 0)
 		return ret;
 	query.size = arg_obj->size + stdin_obj.size;
@@ -447,18 +448,17 @@ static int stdin_command(struct stream_cipher_context *scc, struct osl_object *a
 	return ret;
 }
 
-static int com_addblob(callback_function *f, struct stream_cipher_context *scc, int argc,
-		char * const * const argv)
+static int com_addblob(callback_function *f, struct command_context *cc)
 {
 	struct osl_object arg_obj;
 
-	if (argc != 2)
+	if (cc->argc != 2)
 		return -E_BLOB_SYNTAX;
-	if (!*argv[1]) /* empty name is reserved for the dummy row */
+	if (!*cc->argv[1]) /* empty name is reserved for the dummy row */
 		return -E_BLOB_SYNTAX;
-	arg_obj.size = strlen(argv[1]) + 1;
-	arg_obj.data = (char *)argv[1];
-	return stdin_command(scc, &arg_obj, f, 10 * 1024 * 1024, NULL, NULL);
+	arg_obj.size = strlen(cc->argv[1]) + 1;
+	arg_obj.data = (char *)cc->argv[1];
+	return stdin_command(cc, &arg_obj, f, 10 * 1024 * 1024, NULL, NULL);
 }
 
 /* FIXME: Print output to client, not to log file */
@@ -484,13 +484,12 @@ out:
 		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 }
 
-static int com_mvblob(callback_function *f, __a_unused struct stream_cipher_context *scc,
-		int argc, char * const * const argv)
+static int com_mvblob(callback_function *f, struct command_context *cc)
 {
-	if (argc != 3)
+	if (cc->argc != 3)
 		return -E_MOOD_SYNTAX;
-	return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
-		NULL, NULL);
+	return send_option_arg_callback_request(NULL, cc->argc - 1,
+		cc->argv + 1, f, NULL, NULL);
 }
 
 #define DEFINE_BLOB_COMMAND(cmd_name, table_name, cmd_prefix) \
@@ -498,9 +497,9 @@ static int com_mvblob(callback_function *f, __a_unused struct stream_cipher_cont
 	{ \
 		return com_ ## cmd_name ## blob_callback(table_name ## _table, fd, query); \
 	} \
-	int com_ ## cmd_name ## cmd_prefix(struct stream_cipher_context *scc, int argc, char * const * const argv) \
+	int com_ ## cmd_name ## cmd_prefix(struct command_context *cc) \
 	{ \
-		return com_ ## cmd_name ## blob(com_ ## cmd_name ## cmd_prefix ## _callback, scc, argc, argv); \
+		return com_ ## cmd_name ## blob(com_ ## cmd_name ## cmd_prefix ## _callback, cc); \
 	}
 
 static int blob_get_name_by_id(struct osl_table *table, uint32_t id,
@@ -663,9 +662,10 @@ static int blob_open(struct osl_table **table,
 	DEFINE_GET_DEF_BY_NAME(table_name, cmd_prefix); \
 	DEFINE_GET_NAME_AND_DEF_BY_ROW(table_name, cmd_prefix); \
 
-/** \cond doxygen isn't smart enough to recognize these */
+/* doxygen isn't smart enough to recognize these */
+/** \cond blob_function */
 DEFINE_BLOB_FUNCTIONS(lyrics, lyr);
 DEFINE_BLOB_FUNCTIONS(images, img);
 DEFINE_BLOB_FUNCTIONS(moods, mood);
 DEFINE_BLOB_FUNCTIONS(playlists, pl);
-/** \endcond */
+/** \endcond blob_function */