X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=ee4e405eba46b6c96c46048e77311051402c4808;hp=25aa2a6dc323ed99efba3a78d247c25b27205da1;hb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0;hpb=0440ca41086eafb233b5cb516419de830a0bec13

diff --git a/blob.c b/blob.c
index 25aa2a6d..ee4e405e 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.
  */
@@ -80,12 +80,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 {
@@ -130,7 +131,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
 		}
@@ -155,6 +156,8 @@ 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);
@@ -202,9 +205,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;
 }
@@ -222,6 +225,10 @@ 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,
@@ -237,8 +244,6 @@ static int com_catblob(callback_function *f, struct stream_cipher_context *scc,
 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,
@@ -250,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;
 }
 
@@ -259,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
 		}
@@ -281,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:
@@ -662,9 +665,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 */