Make com_lsblob() and com_lsatt() more similar to each other.

[paraslash.git] / attribute.c

diff --git a/attribute.c b/attribute.c
index c8c6b07f8c26ef9b93be76d257b4ec19c27d4c3a..b8d4a5938beb792e5e5c7ebca62548407a91d12a 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -101,7 +101,7 @@ int get_attribute_bitnum_by_name(const char *att_name, unsigned char *bitnum)
 
 enum lsatt_flags {
        /** Whether "-a" was given for the lsatt command. */
-       LSATT_FLAG_ALPHA = 1,
+       LSATT_FLAG_SORT_BY_ID = 1,
        /** Whether "-l" was given for the lsatt command. */
        LSATT_FLAG_LONG = 2,
        LSATT_FLAG_REVERSE = 4
@@ -129,7 +129,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));
-               return 1;
+               return ret;
        }
        para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
                name);
@@ -140,7 +140,6 @@ static int com_lsatt_callback(const struct osl_object *query,
                struct osl_object *result)
 {
        struct lsatt_action_data laad = {.flags = *(unsigned *) query->data};
-       int ret;
        struct pattern_match_data pmd = {
                .table = attribute_table,
                .loop_col_num = ATTCOL_BITNUM,
@@ -151,8 +150,9 @@ static int com_lsatt_callback(const struct osl_object *query,
                .data = &laad,
                .action = print_attribute
        };
+       int ret;
 
-       if (laad.flags & LSATT_FLAG_ALPHA)
+       if (laad.flags & LSATT_FLAG_SORT_BY_ID)
                pmd.loop_col_num = ATTCOL_NAME;
        if (laad.flags & LSATT_FLAG_REVERSE)
                pmd.pm_flags |= PM_REVERSE_LOOP;
@@ -160,7 +160,7 @@ static int com_lsatt_callback(const struct osl_object *query,
        if (ret < 0)
                para_printf(&laad.pb, "%s\n", PARA_STRERROR(-ret));
        if (!laad.pb.buf)
-               para_printf(&laad.pb, "no match\n");
+               return 0;
        result->data = laad.pb.buf;
        result->size = laad.pb.size;
        return 1;
@@ -181,8 +181,8 @@ int com_lsatt(int fd, int argc, char * const * const argv)
                        i++;
                        break;
                }
-               if (!strcmp(arg, "-a")) {
-                       flags |= LSATT_FLAG_ALPHA;
+               if (!strcmp(arg, "-i")) {
+                       flags |= LSATT_FLAG_SORT_BY_ID;
                        continue;
                }
                if (!strcmp(arg, "-l")) {