make send_callback_request() and friends take a result handler.

[paraslash.git] / attribute.c

diff --git a/attribute.c b/attribute.c
index cc810467d825acf860346afeaac035aaf496f665..acbb8f4d2873ae405a6f091709fdf544709516ee 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -134,7 +134,7 @@ static int print_attribute(struct osl_table *table, struct osl_row *row,
        }
        ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj);
        if (ret < 0) {
-               para_printf(&laad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+               para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret));
                return ret;
        }
        para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
@@ -164,19 +164,18 @@ static int com_lsatt_callback(const struct osl_object *query,
                pmd.pm_flags |= PM_REVERSE_LOOP;
        ret = for_each_matching_row(&pmd);
        if (ret < 0)
-               para_printf(&laad.pb, "%s\n", PARA_STRERROR(-ret));
+               para_printf(&laad.pb, "%s\n", para_strerror(-ret));
        if (!laad.pb.buf)
                return 0;
        result->data = laad.pb.buf;
-       result->size = laad.pb.size;
+       result->size = laad.pb.offset;
        return 1;
 }
 
 int com_lsatt(int fd, int argc, char * const * const argv)
 {
        unsigned flags = 0;
-       struct osl_object options = {.data = &flags, .size = sizeof(flags)},
-               result;
+       struct osl_object options = {.data = &flags, .size = sizeof(flags)};
        int ret, i;
 
        for (i = 1; i < argc; i++) {
@@ -200,13 +199,13 @@ int com_lsatt(int fd, int argc, char * const * const argv)
                        continue;
                }
        }
-       ret = send_option_arg_callback_request(&options, argc -i, argv + i,
-               com_lsatt_callback, &result);
-       if (ret > 0) {
-               ret = send_buffer(fd, (char *)result.data);
-               free(result.data);
-       } else
-               send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+       ret = send_option_arg_callback_request(&options, argc - i, argv + i,
+               com_lsatt_callback, send_result, &fd);
+       if (!ret) {
+               if (argc > 1)
+                       ret = send_va_buffer(fd, "no matches\n");
+       } else if (ret < 0)
+               send_va_buffer(fd, "%s\n", para_strerror(-ret));
        return ret;
 }
 
@@ -276,7 +275,7 @@ int com_setatt(__a_unused int fd, int argc, char * const * const argv)
        if (argc < 3)
                return -E_ATTR_SYNTAX;
        return send_standard_callback_request(argc - 1, argv + 1, com_setatt_callback,
-               NULL);
+               NULL, NULL);
 }
 
 struct addatt_event_data {
@@ -304,18 +303,15 @@ static int com_addatt_callback(const struct osl_object *query,
                        para_printf(&pb, "invalid attribute name: %s\n", p);
                        continue;
                }
-               objs[ATTCOL_BITNUM].size = 1;
-               objs[ATTCOL_NAME].data = p;
-               objs[ATTCOL_NAME].size = len + 1;
-               ret = osl_get_row(attribute_table, ATTCOL_NAME,
-                       &objs[ATTCOL_NAME], &row); /* expected to fail FIXME: Use get_attribute_bitnum_by_name() */
+               ret = get_attribute_bitnum_by_name(p, &bitnum);
                if (ret >= 0) {
-                       para_printf(&pb, "attribute %s already exists\n", p);
+                       para_printf(&pb, "attribute \"%s\" already exists\n", p);
                        continue;
                }
                if (ret != -E_RB_KEY_NOT_FOUND) /* error */
                        goto out;
-               /* find smallest non-used attribute FIXME: Use find_greatest_att_bitnum() */
+               objs[ATTCOL_BITNUM].size = 1;
+               /* find smallest unused attribute */
                for (bitnum = 0; bitnum < 64; bitnum++) {
                        objs[ATTCOL_BITNUM].data = &bitnum;
                        ret = osl_get_row(attribute_table, ATTCOL_BITNUM,
@@ -327,9 +323,11 @@ static int com_addatt_callback(const struct osl_object *query,
                        /* this bit is already in use, try next bit */
                }
                if (bitnum == 64) {
-                       para_printf(&pb, "attribute table full\n");
+                       ret = -E_ATT_TABLE_FULL;
                        goto out;
                }
+               objs[ATTCOL_NAME].data = p;
+               objs[ATTCOL_NAME].size = len + 1;
                ret = osl_add_row(attribute_table, objs);
                if (ret < 0)
                        goto out;
@@ -340,29 +338,22 @@ static int com_addatt_callback(const struct osl_object *query,
        }
 out:
        if (ret < 0)
-               para_printf(&pb, "%s: %s\n", p, PARA_STRERROR(-ret));
+               para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));
        result->data = pb.buf;
-       result->size = pb.size;
+       result->size = pb.offset;
        return result->data? 0 : 1;
 }
 
 int com_addatt(int fd, int argc, char * const * const argv)
 {
-       struct osl_object result;
        int ret;
 
        if (argc < 2)
                return -E_ATTR_SYNTAX;
        ret = send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback,
-               &result);
-       if (!ret)
-               return 1;
+               send_result, &fd);
        if (ret < 0)
-               return ret;
-       if (!result.data || !result.size)
-               return 1;
-       ret =  send_va_buffer(fd, "%s", (char *) result.data);
-       free(result.data);
+               send_va_buffer(fd, "%s\n", para_strerror(-ret));
        return ret;
 }
 
@@ -385,33 +376,26 @@ static int com_mvatt_callback(const struct osl_object *query,
        ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj);
 out:
        if (ret < 0)
-               para_printf(&pb, "%s\n", PARA_STRERROR(-ret));
+               para_printf(&pb, "%s\n", para_strerror(-ret));
        else
                afs_event(ATTRIBUTE_RENAME, &pb, NULL);
        if (!pb.buf)
                return 0;
        result->data = pb.buf;
-       result->size = pb.size;
+       result->size = pb.offset;
        return 1;
 }
 
 int com_mvatt(int fd, int argc, char * const * const argv)
 {
-       struct osl_object result;
        int ret;
 
        if (argc != 3)
                return -E_ATTR_SYNTAX;
        ret = send_standard_callback_request(argc - 1, argv + 1, com_mvatt_callback,
-               &result);
-       if (!ret)
-               return 1;
+               send_result, &fd);
        if (ret < 0)
-               return ret;
-       if (!result.data || !result.size)
-               return 1;
-       ret =  send_va_buffer(fd, "%s", (char *) result.data);
-       free(result.data);
+               send_va_buffer(fd, "%s\n", para_strerror(-ret));
        return ret;
 }
 
@@ -434,12 +418,12 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row,
 
        ret = get_attribute_bitnum_by_name(name, &red.bitnum);
        if (ret < 0) {
-               para_printf(&raad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+               para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
                return 1;
        }
        ret = osl_del_row(table, row);
        if (ret < 0) {
-               para_printf(&raad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+               para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
                return 1;
        }
        para_printf(&raad->pb, "removed attribute %s\n", name);
@@ -464,28 +448,24 @@ static int com_rmatt_callback(const struct osl_object *query,
        };
        ret = for_each_matching_row(&pmd);
        if (ret < 0)
-               para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
+               para_printf(&raad.pb, "%s\n", para_strerror(-ret));
        if (!raad.num_removed)
                para_printf(&raad.pb, "no match -- nothing removed\n");
        result->data = raad.pb.buf;
-       result->size = raad.pb.size;
+       result->size = raad.pb.offset;
        return 1;
 }
 
 int com_rmatt(int fd, int argc, char * const * const argv)
 {
        int ret;
-       struct osl_object result;
 
        if (argc < 2)
                return -E_ATTR_SYNTAX;
        ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
-               &result);
-       if (ret > 0) {
-               send_buffer(fd, (char *)result.data);
-               free(result.data);
-       } else
-               send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+               send_result, &fd);
+       if (ret < 0)
+               send_va_buffer(fd, "%s\n", para_strerror(-ret));
        return ret;
 }