/*
- * 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.
*/
return;
}
} while (c--);
- PARA_INFO_LOG("%s\n", "no attributes");
+ PARA_INFO_LOG("no attributes\n");
greatest_att_bitnum = -E_NO_ATTRIBUTES;
}
}
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,
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;
continue;
}
}
- ret = send_option_arg_callback_request(&options, argc -i, argv + i,
+ 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));
+ } else if (ret < 0)
+ send_va_buffer(fd, "%s\n", para_strerror(-ret));
+ else if (argc > 1)
+ send_va_buffer(fd, "no matches\n");
return ret;
}
(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 osl_row *aft_row;
+ struct afsi_change_event_data aced = {.old_afsi = &old_afsi};
len = strlen(p);
- ret = aft_get_row_of_path(p, &aft_row);
+ ret = aft_get_row_of_path(p, &aced.aft_row);
if (ret < 0)
return ret;
- ret = get_afsi_object_of_row(aft_row, &obj);
+ ret = get_afsi_object_of_row(aced.aft_row, &obj);
if (ret < 0)
return ret;
ret = load_afsi(&old_afsi, &obj);
new_afsi.attributes |= add_mask;
new_afsi.attributes &= ~del_mask;
save_afsi(&new_afsi, &obj); /* in-place update */
-// ret = mood_update_audio_file(aft_row, &old_afsi);
-// if (ret < 0)
-// return ret;
+ afs_event(AFSI_CHANGE, NULL, &aced);
}
return 1;
}
int com_setatt(__a_unused int fd, int argc, char * const * const argv)
{
- if (argc < 2)
+ if (argc < 3)
return -E_ATTR_SYNTAX;
return send_standard_callback_request(argc - 1, argv + 1, com_setatt_callback,
NULL);
}
+struct addatt_event_data {
+ const char *name;
+ unsigned char bitnum;
+};
+
+
static int com_addatt_callback(const struct osl_object *query,
struct osl_object *result)
{
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,
/* 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;
}
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;
return result->data? 0 : 1;
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 ret;
}
-
+/** Data passed to the action handler of com_rmatt(). */
struct remove_attribute_action_data {
+ /** Message buffer. */
struct para_buffer pb;
+ /** Numver of attributes removed. */
int num_removed;
+ /** Bitwise "or" of the removed attributes. */
uint64_t mask_of_removed_atts;
};
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);
};
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;
send_buffer(fd, (char *)result.data);
free(result.data);
} else
- send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+ send_va_buffer(fd, "%s\n", para_strerror(-ret));
return ret;
}
const uint64_t one = 1;
*text = NULL;
- if (greatest_att_bitnum < 0) /* no attributes available */
+ if (greatest_att_bitnum < 0) { /* no attributes available */
+ *text = para_strdup("(no attributes available)");
return 1;
+ }
for (i = 0; i <= greatest_att_bitnum; i++) {
unsigned char bn = i;
struct osl_object obj = {.data = &bn, .size = 1};
/**
* Close the attribute table.
*
- * \param flags Ususal flags that are passed to osl_close_table().
- *
* \sa osl_close_table().
*/
void attribute_close(void)
projects / paraslash.git / blobdiff