/*
- * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
struct osl_object bitnum_obj;
int ret;
- if (!(laad->flags & LSATT_FLAG_LONG))
- return para_printf(&laad->pb, "%s\n", name);
+ if (!(laad->flags & LSATT_FLAG_LONG)) {
+ para_printf(&laad->pb, "%s\n", name);
+ return 1;
+ }
ret = osl(osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj));
if (ret < 0) {
para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret));
return ret;
}
- return para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
+ para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
name);
+ return 1;
}
static void com_lsatt_callback(int fd, const struct osl_object *query)
if (ret < 0)
send_strerror(cc, -ret);
else if (ret == 0 && cc->argc > 1)
- ret = cc->use_sideband?
- send_sb_va(&cc->scc, SBD_ERROR_LOG, "no matches\n")
- :
- sc_send_va_buffer(&cc->scc, "no matches\n");
+ ret = send_sb_va(&cc->scc, SBD_ERROR_LOG, "no matches\n");
return ret;
}
-static void com_setatt_callback(__a_unused int fd, const struct osl_object *query)
-{
- char *p;
- uint64_t add_mask = 0, del_mask = 0;
- int ret;
- size_t len;
- struct osl_object obj;
- struct osl_row *row;
-
- for (p = query->data; p < (char *)query->data + query->size; p += len + 1) {
- char c;
-
- len = strlen(p);
- ret = -E_ATTR_SYNTAX;
- if (!*p)
- goto out;
- c = p[len - 1];
- if (c != '+' && c != '-')
- break;
- p[len - 1] = '\0';
- obj.data = p;
- obj.size = len + 1;
- ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row));
- if (ret < 0)
- goto out;
- ret = osl(osl_get_object(attribute_table, row, ATTCOL_BITNUM,
- &obj));
- if (ret < 0)
- goto out;
- if (c == '+')
- add_mask |= (1UL << *(unsigned char *)obj.data);
- else
- del_mask |= (1UL << *(unsigned char *)obj.data);
- }
- ret = -E_ATTR_SYNTAX;
- if (!add_mask && !del_mask)
- goto out;
- PARA_DEBUG_LOG("masks: %llx:%llx\n",(long long unsigned)add_mask,
- (long long unsigned)del_mask);
- for (; p < (char *)query->data + query->size; p += len + 1) { /* TODO: fnmatch */
- struct afs_info old_afsi, new_afsi;
- struct afsi_change_event_data aced = {.old_afsi = &old_afsi};
-
- len = strlen(p);
- ret = aft_get_row_of_path(p, &aced.aft_row);
- if (ret < 0)
- goto out;
- ret = get_afsi_object_of_row(aced.aft_row, &obj);
- if (ret < 0)
- goto out;
- ret = load_afsi(&old_afsi, &obj);
- if (ret < 0)
- goto out;
- new_afsi = old_afsi;
- new_afsi.attributes |= add_mask;
- new_afsi.attributes &= ~del_mask;
- save_afsi(&new_afsi, &obj); /* in-place update */
- afs_event(AFSI_CHANGE, NULL, &aced);
- }
-out:
- if (ret < 0)
- PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
-}
-
-int com_setatt(struct command_context *cc)
-{
- if (cc->argc < 3)
- return -E_ATTR_SYNTAX;
- return send_standard_callback_request(cc->argc - 1, cc->argv + 1,
- com_setatt_callback, NULL, NULL);
-}
-
struct addatt_event_data {
const char *name;
unsigned char bitnum;
static void com_addatt_callback(int fd, const struct osl_object *query)
{
char *p;
- int ret = 1, ret2 = 0;
+ int ret = 1;
struct para_buffer pb = {
.max_size = shm_get_shmmax(),
.private_data = &(struct afs_max_size_handler_data) {
len = strlen(p);
if (!len || p[len - 1] == '-' || p[len - 1] == '+') {
- ret2 = para_printf(&pb, "invalid attribute name: %s\n", p);
- if (ret2 < 0)
- goto out;
+ para_printf(&pb, "invalid attribute name: %s\n", p);
continue;
}
ret = get_attribute_bitnum_by_name(p, &bitnum);
if (ret >= 0) {
- ret2 = para_printf(&pb, "attribute \"%s\" already exists\n", p);
- if (ret2 < 0)
- goto out;
+ para_printf(&pb, "attribute \"%s\" already exists\n", p);
continue;
}
if (ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) /* error */
greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, (int)bitnum);
}
out:
- if (ret < 0 && ret2 >= 0)
+ if (ret < 0)
para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));
if (pb.offset)
pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
struct remove_attribute_action_data {
/** Message buffer. */
struct para_buffer pb;
- /** Numver of attributes removed. */
+ /** Number of attributes removed. */
int num_removed;
/** Bitwise "or" of the removed attributes. */
uint64_t mask_of_removed_atts;
};
+/* returns succcess even on errors to keep the loop going */
static int remove_attribute(struct osl_table *table, struct osl_row *row,
const char *name, void *data)
{
struct rmatt_event_data red = {.name = name};
ret = get_attribute_bitnum_by_name(name, &red.bitnum);
- if (ret < 0)
- return para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
+ if (ret < 0) {
+ para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
+ return 0;
+ }
ret = osl(osl_del_row(table, row));
- if (ret < 0)
- return para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
- ret = para_printf(&raad->pb, "removed attribute %s\n", name);
+ if (ret < 0) {
+ para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
+ return 0;
+ }
+ para_printf(&raad->pb, "removed attribute %s\n", name);
raad->num_removed++;
raad->mask_of_removed_atts |= (1 << red.bitnum);
afs_event(ATTRIBUTE_REMOVE, &raad->pb, &red);
- return ret;
+ return 1;
}
static void com_rmatt_callback(int fd, const struct osl_object *query)
.max_size_handler = afs_max_size_handler,
}
};
- int ret, ret2 = 0;
+ int ret;
struct pattern_match_data pmd = {
.table = attribute_table,
.patterns = *query,
};
ret = for_each_matching_row(&pmd);
if (ret < 0)
- ret2 = para_printf(&raad.pb, "%s\n", para_strerror(-ret));
+ para_printf(&raad.pb, "%s\n", para_strerror(-ret));
else if (!raad.num_removed)
- ret2 = para_printf(&raad.pb, "no match -- nothing removed\n");
- if (ret2 >= 0 && raad.pb.offset)
+ para_printf(&raad.pb, "no match -- nothing removed\n");
+ if (raad.pb.offset)
pass_buffer_as_shm(fd, SBD_OUTPUT, raad.pb.buf, raad.pb.offset);
free(raad.pb.buf);
}
* used for unset attributes.
*
* In practice, not all 64 attributes are defined. In this case, the function
- * only prints \a N + 1 charaters where \a N is the greatest id of a defined
+ * only prints \a N + 1 characters where \a N is the greatest id of a defined
* attribute.
*/
void get_attribute_bitmap(const uint64_t *atts, char *buf)
projects / paraslash.git / blobdiff