Implement pattern matching for com_lsatt().

diff --git a/afs.cmd b/afs.cmd
index f27fa4a8de60af4c91708a738d0f4558eeb36460..fb691ab60bf5bfcc3af512b938e78a58458cef89 100644 (file)
--- a/afs.cmd
+++ b/afs.cmd
@@ -82,7 +82,7 @@ H:            -sa:  sort by audio format.
 N: lsatt
 P: AFS_READ
 D: List attributes
-U: lsatt [-a] [-l]
+U: lsatt [-a] [-l] [-r]
 H:
 H: Print the list of all defined attributes.
 H:
@@ -93,6 +93,8 @@ H:    identifier.
 H:
 H: -l  Print a long listing containing both identifier and attribute name. The
 H:     default is to print only the name.
+H:
+H: -l  Reverse sort order.
 ---
 N: setatt
 P: AFS_READ | AFS_WRITE
@@ -109,7 +111,7 @@ H: attribute of all files ending with 'foo.mp3'.
 N: addatt
 P: AFS_READ | AFS_WRITE
 D: Add new attribute(s).
-U: addatt attribute1 [attribute2 ...]
+U: addatt attribute1...
 H: This adds new attributes to the attribute table. At most 64 attributes
 H: may be defined.
 ---

diff --git a/attribute.c b/attribute.c
index 560e758272dfa3c4b59c78cabc6a1a8a77dade68..c8c6b07f8c26ef9b93be76d257b4ec19c27d4c3a 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -99,63 +99,79 @@ int get_attribute_bitnum_by_name(const char *att_name, unsigned char *bitnum)
        return 1;
 }
 
-/** Whether "-a" was given for the lsatt command. */
-#define LSATT_FLAG_ALPHA 1
-/** Whether "-l" was given for the lsatt command. */
-#define LSATT_FLAG_LONG 2
+enum lsatt_flags {
+       /** Whether "-a" was given for the lsatt command. */
+       LSATT_FLAG_ALPHA = 1,
+       /** Whether "-l" was given for the lsatt command. */
+       LSATT_FLAG_LONG = 2,
+       LSATT_FLAG_REVERSE = 4
+};
 
-/** Data passed via osl_rbtree_loop(). */
-struct private_lsatt_data {
+/** Data passed to the action function of lsatt */
+struct lsatt_action_data {
+       /** The result buffer. */
+       struct para_buffer pb;
        /** The given flags for the lsatt command. */
        unsigned flags;
-       /** The result buffer. */
-       struct para_buffer b;
 };
 
-static int print_attribute(struct osl_row *row, void *private_data)
+static int print_attribute(struct osl_table *table, struct osl_row *row,
+               const char *name, void *data)
 {
-       struct private_lsatt_data *pld = private_data;
+       struct lsatt_action_data *laad = data;
+       struct osl_object bitnum_obj;
        int ret;
-       struct osl_object name_obj, bitnum_obj;
 
-       ret = osl_get_object(attribute_table, row, ATTCOL_NAME, &name_obj);
-       if (ret < 0)
-               return ret;
-       if (!(pld->flags & LSATT_FLAG_LONG)) {
-               para_printf(&pld->b, "%s\n", (char *)name_obj.data);
+       if (!(laad->flags & LSATT_FLAG_LONG)) {
+               para_printf(&laad->pb, "%s\n", name);
                return 1;
        }
-       ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM, &bitnum_obj);
-       if (ret < 0)
-               return ret;
-       para_printf(&pld->b, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
-               (char *)name_obj.data);
+       ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj);
+       if (ret < 0) {
+               para_printf(&laad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+               return 1;
+       }
+       para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
+               name);
        return 1;
 }
 
 static int com_lsatt_callback(const struct osl_object *query,
                struct osl_object *result)
 {
-       struct private_lsatt_data pld = {.flags = *(uint32_t *) query->data};
+       struct lsatt_action_data laad = {.flags = *(unsigned *) query->data};
        int ret;
+       struct pattern_match_data pmd = {
+               .table = attribute_table,
+               .loop_col_num = ATTCOL_BITNUM,
+               .match_col_num = ATTCOL_NAME,
+               .patterns = {.data = (char *)query->data + sizeof(laad.flags),
+                       .size = query->size - sizeof(laad.flags)},
+               .pm_flags = PM_NO_PATTERN_MATCHES_EVERYTHING,
+               .data = &laad,
+               .action = print_attribute
+       };
 
-       if (pld.flags & LSATT_FLAG_ALPHA)
-               ret = osl_rbtree_loop(attribute_table, ATTCOL_NAME,
-                       &pld, print_attribute);
-       else
-               ret = osl_rbtree_loop(attribute_table, ATTCOL_BITNUM,
-                       &pld, print_attribute);
-       result->data = pld.b.buf;
-       result->size = pld.b.size;
-       return ret;
+       if (laad.flags & LSATT_FLAG_ALPHA)
+               pmd.loop_col_num = ATTCOL_NAME;
+       if (laad.flags & LSATT_FLAG_REVERSE)
+               pmd.pm_flags |= PM_REVERSE_LOOP;
+       ret = for_each_matching_row(&pmd);
+       if (ret < 0)
+               para_printf(&laad.pb, "%s\n", PARA_STRERROR(-ret));
+       if (!laad.pb.buf)
+               para_printf(&laad.pb, "no match\n");
+       result->data = laad.pb.buf;
+       result->size = laad.pb.size;
+       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;
        int ret, i;
-       uint32_t flags = 0;
-       struct osl_object query, result;
 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
@@ -173,16 +189,18 @@ int com_lsatt(int fd, int argc, char * const * const argv)
                        flags |= LSATT_FLAG_LONG;
                        continue;
                }
+               if (!strcmp(arg, "-r")) {
+                       flags |= LSATT_FLAG_REVERSE;
+                       continue;
+               }
        }
-       if (argc > i)
-               return -E_ATTR_SYNTAX;
-       query.data = &flags;
-       query.size = sizeof(flags);
-       ret = send_callback_request(com_lsatt_callback, &query, &result);
+       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));
        return ret;
 }