X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=attribute.c;h=65f08aef4c062c79b6b204b628fe0bbf0c98e8bb;hb=985ba0546ab18eadf73d0a2686029a3ac876c846;hp=638e22ea70fe5e5bb5ebac55f0e296db387adc5c;hpb=128c594f32be41d928df432298a013a168891ab7;p=paraslash.git

diff --git a/attribute.c b/attribute.c
index 638e22ea..65f08aef 100644
--- a/attribute.c
+++ b/attribute.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -162,7 +162,7 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
 	};
 	struct pattern_match_data pmd = {
 		.table = attribute_table,
-		.loop_col_num = ATTCOL_BITNUM,
+		.loop_col_num = ATTCOL_NAME,
 		.match_col_num = ATTCOL_NAME,
 		.patterns = {.data = (char *)query->data + sizeof(laad.flags),
 			.size = query->size - sizeof(laad.flags)},
@@ -171,7 +171,7 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
 		.action = print_attribute
 	};
 	if (laad.flags & LSATT_FLAG_SORT_BY_ID)
-		pmd.loop_col_num = ATTCOL_NAME;
+		pmd.loop_col_num = ATTCOL_BITNUM;
 	if (laad.flags & LSATT_FLAG_REVERSE)
 		pmd.pm_flags |= PM_REVERSE_LOOP;
 	for_each_matching_row(&pmd);
@@ -222,7 +222,7 @@ int com_lsatt(struct command_context *cc)
 static void com_setatt_callback(__a_unused int fd, const struct osl_object *query)
 {
 	char *p;
-	uint64_t add_mask = 0, del_mask = 0;
+	uint64_t add_mask = 0, del_mask = 0, one = 1;
 	int ret;
 	size_t len;
 	struct osl_object obj;
@@ -249,9 +249,9 @@ static void com_setatt_callback(__a_unused int fd, const struct osl_object *quer
 		if (ret < 0)
 			goto out;
 		if (c == '+')
-			add_mask |= (1UL << *(unsigned char *)obj.data);
+			add_mask |= (one << *(unsigned char *)obj.data);
 		else
-			del_mask |= (1UL << *(unsigned char *)obj.data);
+			del_mask |= (one << *(unsigned char *)obj.data);
 	}
 	ret = -E_ATTR_SYNTAX;
 	if (!add_mask && !del_mask)