X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=blob.c;h=21144d851a48d8a3d6c2fb16eb792adea5c87a1e;hb=b326b33f0afef8f68623d30fff936d615ce43bc7;hp=2d3aea1e7234b47a22636fcbf630fc115d5bcc42;hpb=4ad9b98ca90d603eecb5c9c403e0f7bbdc3be6a6;p=paraslash.git diff --git a/blob.c b/blob.c index 2d3aea1e..21144d85 100644 --- a/blob.c +++ b/blob.c @@ -131,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 } @@ -223,6 +223,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, @@ -238,8 +242,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, @@ -251,7 +253,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 +261,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 +282,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: