/*
- * 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.
*/
/** \file attribute.c Attribute handling functions. */
#include "para.h"
#include "error.h"
+#include "string.h"
#include "afh.h"
#include "afs.h"
-#include "string.h"
#include "net.h"
static struct osl_table *attribute_table;
return;
}
} while (c--);
- PARA_INFO_LOG("%s\n", "no attributes");
+ PARA_INFO_LOG("no attributes\n");
greatest_att_bitnum = -E_NO_ATTRIBUTES;
}
return 1;
}
+/**
+ * Flags used by the lsatt command.
+ *
+ * \param \sa com_lsatt().
+ */
enum lsatt_flags {
/** Whether "-a" was given for the lsatt command. */
LSATT_FLAG_SORT_BY_ID = 1,
/** Whether "-l" was given for the lsatt command. */
LSATT_FLAG_LONG = 2,
+ /** Reverse sort order. */
LSATT_FLAG_REVERSE = 4
};
}
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));
+ if (!ret) {
+ if (argc > 1)
+ ret = send_va_buffer(fd, "no matches\n");
+ return ret;
+ }
+ if (ret < 0) {
+ send_va_buffer(fd, "%s\n", para_strerror(-ret));
+ return ret;
+ }
+ ret = send_buffer(fd, (char *)result.data);
+ free(result.data);
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);
}
-/* TODO: make it faster by only extracting the attribute member from afsi */
-static int logical_and_attribute(struct osl_row *aft_row, void *attribute_ptr)
-{
- struct afs_info afsi;
- uint64_t *att = attribute_ptr;
- struct osl_object obj;
- int ret = get_afsi_object_of_row(aft_row, &obj);
- if (ret < 0)
- return ret;
- ret = load_afsi(&afsi, &obj);
- if (ret < 0)
- return ret;
- afsi.attributes &= *att;
- save_afsi(&afsi, &obj);
- return 1;
-}
+struct addatt_event_data {
+ const char *name;
+ unsigned char bitnum;
+};
+
static int com_addatt_callback(const struct osl_object *query,
- __a_unused struct osl_object *result)
+ struct osl_object *result)
{
char *p = query->data;
- unsigned atts_added = 0;
- int ret;
+ int ret = 1;
+ struct para_buffer pb = {.size = 0};
+ size_t len;
- while (p < (char *)query->data + query->size) {
+ for (p = query->data; p < (char *)query->data + query->size; p += len + 1) {
struct osl_object objs[NUM_ATT_COLUMNS];
struct osl_row *row;
unsigned char bitnum;
+ len = strlen(p);
+ struct addatt_event_data aed;
- objs[ATTCOL_BITNUM].size = 1;
- objs[ATTCOL_NAME].data = p;
- objs[ATTCOL_NAME].size = strlen(p) + 1;
- ret = osl_get_row(attribute_table, ATTCOL_NAME,
- &objs[ATTCOL_NAME], &row); /* expected to fail */
- if (ret >= 0)
- return -E_ATTR_EXISTS;
+ if (!len || p[len - 1] == '-' || p[len - 1] == '+') {
+ para_printf(&pb, "invalid attribute name: %s\n", p);
+ continue;
+ }
+ ret = get_attribute_bitnum_by_name(p, &bitnum);
+ if (ret >= 0) {
+ para_printf(&pb, "attribute \"%s\" already exists\n", p);
+ continue;
+ }
if (ret != -E_RB_KEY_NOT_FOUND) /* error */
- return ret;
- /* find smallest non-used attribute */
+ goto out;
+ 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,
if (ret == -E_RB_KEY_NOT_FOUND)
break; /* this bitnum is unused, use it */
if (ret < 0) /* error */
- return ret;
+ goto out;
/* this bit is already in use, try next bit */
}
- if (bitnum == 64)
- return -E_ATTR_TABLE_FULL;
+ if (bitnum == 64) {
+ 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)
- return ret;
+ goto out;
+ aed.name = p;
+ aed.bitnum = bitnum;
+ afs_event(ATTRIBUTE_ADD, &pb, &aed);
greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, bitnum);
- atts_added++;
- p += strlen(p) + 1;
}
- if (!atts_added)
- return 1;
- find_greatest_att_bitnum();
- return reload_current_mood(); /* FIXME: returns an error */
+out:
+ if (ret < 0)
+ para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));
+ result->data = pb.buf;
+ result->size = pb.size;
+ return result->data? 0 : 1;
}
-int com_addatt(__a_unused int fd, int argc, char * const * const argv)
+int com_addatt(int fd, int argc, char * const * const argv)
{
+ struct osl_object result;
+ int ret;
+
if (argc < 2)
return -E_ATTR_SYNTAX;
- return send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback,
- NULL);
+ ret = send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback,
+ &result);
+ if (!ret)
+ return 1;
+ if (ret < 0)
+ return ret;
+ if (!result.data || !result.size)
+ return 1;
+ ret = send_va_buffer(fd, "%s", (char *) result.data);
+ free(result.data);
+ return ret;
+}
+
+static int com_mvatt_callback(const struct osl_object *query,
+ struct osl_object *result)
+{
+ char *old = query->data;
+ size_t size = strlen(old) + 1;
+ char *new = old + size;
+ struct osl_object obj = {.data = old, .size = size};
+ struct osl_row *row;
+ struct para_buffer pb = {.size = 0};
+ int ret;
+
+ ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row);
+ if (ret < 0)
+ goto out;
+ obj.data = new;
+ obj.size = strlen(new) + 1;
+ ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj);
+out:
+ if (ret < 0)
+ para_printf(&pb, "%s\n", para_strerror(-ret));
+ else
+ afs_event(ATTRIBUTE_RENAME, &pb, NULL);
+ if (!pb.buf)
+ return 0;
+ result->data = pb.buf;
+ result->size = pb.size;
+ return 1;
}
+
+int com_mvatt(int fd, int argc, char * const * const argv)
+{
+ struct osl_object result;
+ int ret;
+
+ if (argc != 3)
+ return -E_ATTR_SYNTAX;
+ ret = send_standard_callback_request(argc - 1, argv + 1, com_mvatt_callback,
+ &result);
+ if (!ret)
+ return 1;
+ if (ret < 0)
+ return ret;
+ if (!result.data || !result.size)
+ return 1;
+ ret = send_va_buffer(fd, "%s", (char *) result.data);
+ free(result.data);
+ 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;
};
const char *name, void *data)
{
struct remove_attribute_action_data *raad = data;
- unsigned char bitnum;
int ret;
+ struct rmatt_event_data red = {.name = name};
- ret = get_attribute_bitnum_by_name(name, &bitnum);
+ 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 %s\n", name);
+ para_printf(&raad->pb, "removed attribute %s\n", name);
raad->num_removed++;
- raad->mask_of_removed_atts |= (1 << bitnum);
+ raad->mask_of_removed_atts |= (1 << red.bitnum);
+ afs_event(ATTRIBUTE_REMOVE, &raad->pb, &red);
return 1;
}
};
ret = for_each_matching_row(&pmd);
if (ret < 0)
- para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
- if (raad.num_removed) {
- uint64_t and_mask = ~raad.mask_of_removed_atts;
- ret = audio_file_loop(&and_mask, logical_and_attribute);
- if (ret < 0)
- para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
- find_greatest_att_bitnum();
- ret = reload_current_mood();
- if (ret < 0)
- para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
- }
- if (!raad.pb.buf)
+ 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;
result->size = raad.pb.size;
return -E_ATTR_SYNTAX;
ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
&result);
- if (ret > 0) {
- send_buffer(fd, (char *)result.data);
- free(result.data);
- } else
- send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+ if (!ret)
+ return 0;
+ if (ret < 0) {
+ send_va_buffer(fd, "%s\n", para_strerror(-ret));
+ return ret;
+ }
+ ret = send_buffer(fd, (char *)result.data);
+ free(result.data);
return ret;
}
/**
- * Return a binary representation of the geiven attribute value.
+ * Return a binary representation of the given attribute value.
*
* \param atts Pointer to the attribute value.
* \param buf Result.
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_shutdown(enum osl_close_flags flags)
+void attribute_close(void)
{
- osl_close_table(attribute_table, flags);
+ osl_close_table(attribute_table, OSL_MARK_CLEAN);
attribute_table = NULL;
}
*
* \sa osl_open_table().
*/
-int attribute_init(struct table_info *ti, const char *db)
+static int attribute_open(const char *dir)
{
int ret;
- attribute_table_desc.dir = db;
- ti->desc = &attribute_table_desc;
- ret = osl_open_table(ti->desc, &attribute_table);
+ attribute_table_desc.dir = dir;
+ ret = osl_open_table(&attribute_table_desc, &attribute_table);
greatest_att_bitnum = -1; /* no atts available */
if (ret >= 0) {
find_greatest_att_bitnum();
return ret;
}
attribute_table = NULL;
- if (ret == -E_NOENT)
+ if (ret >= 0 || is_errno(-ret, ENOENT))
return 1;
return ret;
}
+
+static int attribute_create(const char *dir)
+{
+ attribute_table_desc.dir = dir;
+ return osl_create_table(&attribute_table_desc);
+}
+
+
+void attribute_init(struct afs_table *t)
+{
+ t->name = attribute_table_desc.name;
+ t->open = attribute_open;
+ t->close = attribute_close;
+ t->create = attribute_create;
+}
projects / paraslash.git / blobdiff