Fix SIGUSR1 handling on Solaris.

[paraslash.git] / blob.c

diff --git a/blob.c b/blob.c
index 3c8777449179a8a117f84c2ccca4fc16088bdec7..8675ee73330fb1f87a1f4ef0a2780b445a2a7b5b 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -54,7 +54,9 @@ enum blob_ls_flags {
 
 /** Structure passed to the \p print_blob function. */
 struct lsblob_action_data {
 
 /** Structure passed to the \p print_blob function. */
 struct lsblob_action_data {

+       /* The flags given at the command line. */

        uint32_t flags;
        uint32_t flags;

+       /** Message buffer. */

        struct para_buffer pb;
 };
 
        struct para_buffer pb;
 };
 


@@ -98,9 +100,9 @@ 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))
        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;
                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));
        ret = for_each_matching_row(&pmd);
        if (ret < 0)
                para_printf(&lbad.pb, "%s\n", PARA_STRERROR(-ret));


@@ -205,8 +207,11 @@ static int com_catblob(callback_function *f, int fd, int argc,
        return ret;
 }
 
        return ret;
 }
 

+/** Used for removing rows from a blob table. */

 struct rmblob_data {
 struct rmblob_data {

+       /** Message buffer. */

        struct para_buffer pb;
        struct para_buffer pb;

+       /** Number of removed blobs. */

        unsigned num_removed;
 };
 
        unsigned num_removed;
 };
 


@@ -225,7 +230,7 @@ static int remove_blob(struct osl_table *table, struct osl_row *row,
 
 static int com_rmblob_callback(struct osl_table *table,
                const struct osl_object *query,
 
 static int com_rmblob_callback(struct osl_table *table,
                const struct osl_object *query,

-               __a_unused struct osl_object *result)
+               struct osl_object *result)

 {
        int ret;
        struct rmblob_data rmbd = {.num_removed = 0};
 {
        int ret;
        struct rmblob_data rmbd = {.num_removed = 0};


@@ -244,14 +249,16 @@ static int com_rmblob_callback(struct osl_table *table,
                para_printf(&rmbd.pb, "%s\n", PARA_STRERROR(-ret));
        if (!rmbd.num_removed)
                para_printf(&rmbd.pb, "no matches, nothing removed\n");
                para_printf(&rmbd.pb, "%s\n", PARA_STRERROR(-ret));
        if (!rmbd.num_removed)
                para_printf(&rmbd.pb, "no matches, nothing removed\n");

-       else
+       else {

                para_printf(&rmbd.pb, "removed %d blobs\n", rmbd.num_removed);
                para_printf(&rmbd.pb, "removed %d blobs\n", rmbd.num_removed);

+               afs_event(BLOB_RENAME, NULL, table);
+       }

        result->data = rmbd.pb.buf;
        result->size = rmbd.pb.size;
        return 1;
 }
 
        result->data = rmbd.pb.buf;
        result->size = rmbd.pb.size;
        return 1;
 }
 

-static int com_rmblob(callback_function *f, __a_unused int fd, int argc,
+static int com_rmblob(callback_function *f, int fd, int argc,

                char * const * const argv)
 {
        int ret;
                char * const * const argv)
 {
        int ret;


@@ -328,7 +335,11 @@ static int com_addblob_callback(struct osl_table *table,
        objs[BLOBCOL_NAME].size = name_len;
        objs[BLOBCOL_DEF].data = name + name_len;
        objs[BLOBCOL_DEF].size = query->size - name_len;
        objs[BLOBCOL_NAME].size = name_len;
        objs[BLOBCOL_DEF].data = name + name_len;
        objs[BLOBCOL_DEF].size = query->size - name_len;

-       return osl_add_row(table, objs);
+       ret = osl_add_row(table, objs);
+       if (ret < 0)
+               return ret;
+       afs_event(BLOB_ADD, NULL, table);
+       return 1;

 }
 
 static int com_addblob(callback_function *f, int fd, int argc,
 }
 
 static int com_addblob(callback_function *f, int fd, int argc,


@@ -360,10 +371,14 @@ static int com_mvblob_callback(struct osl_table *table,
                return ret;
        obj.data = dest;
        obj.size = strlen(dest) + 1;
                return ret;
        obj.data = dest;
        obj.size = strlen(dest) + 1;

-       return osl_update_object(table, row, BLOBCOL_NAME, &obj);
+       ret = osl_update_object(table, row, BLOBCOL_NAME, &obj);
+       if (ret < 0)
+               return ret;
+       afs_event(BLOB_RENAME, NULL, table);
+       return 1;

 }
 
 }
 

-static int com_mvblob(callback_function *f,  __a_unused int fd,
+static int com_mvblob(callback_function *f, __a_unused int fd,

                int argc, char * const * const argv)
 {
        if (argc != 3)
                int argc, char * const * const argv)
 {
        if (argc != 3)


@@ -410,6 +425,30 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id,
                return blob_get_name_by_id(table_name ## _table, id, name); \
        }
 
                return blob_get_name_by_id(table_name ## _table, id, name); \
        }
 

+
+static int blob_get_def_by_name(struct osl_table *table, char *name,
+               struct osl_object *def)
+{
+       struct osl_row *row;
+       struct osl_object obj = {.data = name, .size = strlen(name) + 1};
+       int ret;
+
+       def->data = NULL;
+       if (!*name)
+               return 1;
+       ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row);
+       if (ret < 0)
+               return ret;
+       return osl_open_disk_object(table, row, BLOBCOL_DEF, def);
+}
+
+/** Define the \p get_def_by_id function for this blob type. */
+#define DEFINE_GET_DEF_BY_NAME(table_name, cmd_prefix) \
+       int cmd_prefix ## _get_def_by_name(char *name, struct osl_object *def) \
+       { \
+               return blob_get_def_by_name(table_name ## _table, name, def); \
+       }
+

 static int blob_get_def_by_id(struct osl_table *table, uint32_t id,
                struct osl_object *def)
 {
 static int blob_get_def_by_id(struct osl_table *table, uint32_t id,
                struct osl_object *def)
 {


@@ -499,6 +538,8 @@ static int blob_open(struct osl_table **table,
                t->open = table_name ## _open; \
                t->close = table_name ## _close; \
                t->create = table_name ## _create;\
                t->open = table_name ## _open; \
                t->close = table_name ## _close; \
                t->create = table_name ## _create;\

+               t->event_handler = table_name ##_event_handler; \
+               table_name ## _table = NULL; \

        }
 
 
        }
 
 


@@ -515,6 +556,7 @@ static int blob_open(struct osl_table **table,
        DEFINE_BLOB_COMMAND(mv, table_name, cmd_prefix) \
        DEFINE_GET_NAME_BY_ID(table_name, cmd_prefix); \
        DEFINE_GET_DEF_BY_ID(table_name, cmd_prefix); \
        DEFINE_BLOB_COMMAND(mv, table_name, cmd_prefix) \
        DEFINE_GET_NAME_BY_ID(table_name, cmd_prefix); \
        DEFINE_GET_DEF_BY_ID(table_name, cmd_prefix); \

+       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 */
        DEFINE_GET_NAME_AND_DEF_BY_ROW(table_name, cmd_prefix); \
 
 /** \cond doxygen isn't smart enough to recognize these */