Was cooking for about two weeks and seems to work fine.
73299e com_setatt(): Allow to specify a file name pattern.
fd5f94 Move com_setatt() from attribute.c to aft.c.
a8573c com_setatt(): Use get_attribute_bitnum_by_name().
47dbd9 Mark buffer pointer of pass_buffer_as_shm() as const.
compiled against libgcrypt.
- Dependencies for gengetopt files are computed automatically.
This eliminates a constant source of build bugs.
+ - The setatt command now accepts file name patterns rather than only
+ path names.
--------------------------------------
0.4.13 (2013-07-29) "spectral gravity"
* \return Zero if \a buf is \p NULL or \a size is zero. Negative on errors,
* and positive on success.
*/
-int pass_buffer_as_shm(int fd, uint8_t band, char *buf, size_t size)
+int pass_buffer_as_shm(int fd, uint8_t band, const char *buf, size_t size)
{
int ret, shmid;
void *shm;
*/
typedef int callback_result_handler(struct osl_object *result, uint8_t band, void *private);
int afs_cb_result_handler(struct osl_object *result, uint8_t band, void *private);
-int pass_buffer_as_shm(int fd, uint8_t band, char *buf, size_t size);
+int pass_buffer_as_shm(int fd, uint8_t band, const char *buf, size_t size);
/** Structure passed to the AFS max_size handler. */
struct afs_max_size_handler_data {
return ret;
}
+struct change_atts_data {
+ uint64_t add_mask, del_mask;
+ struct para_buffer pb;
+};
+
+static int change_atts(__a_unused struct osl_table *table,
+ struct osl_row *row, __a_unused const char *name, void *data)
+{
+ int ret;
+ struct osl_object obj;
+ struct afs_info old_afsi, new_afsi;
+ struct afsi_change_event_data aced = {
+ .aft_row = row,
+ .old_afsi = &old_afsi
+ };
+ struct change_atts_data *cad = data;
+
+ ret = get_afsi_object_of_row(row, &obj);
+ if (ret < 0)
+ return ret;
+ ret = load_afsi(&old_afsi, &obj);
+ if (ret < 0)
+ return ret;
+ new_afsi = old_afsi;
+ new_afsi.attributes |= cad->add_mask;
+ new_afsi.attributes &= ~cad->del_mask;
+ save_afsi(&new_afsi, &obj); /* in-place update */
+ afs_event(AFSI_CHANGE, &cad->pb, &aced);
+ return 1;
+}
+
+static void com_setatt_callback(int fd, const struct osl_object *query)
+{
+ char *p;
+ int ret;
+ size_t len;
+ struct change_atts_data cad = {
+ .pb = {
+ .max_size = shm_get_shmmax(),
+ .max_size_handler = afs_max_size_handler,
+ .private_data = &(struct afs_max_size_handler_data) {
+ .fd = fd,
+ .band = SBD_OUTPUT
+ }
+ }
+ };
+ struct pattern_match_data pmd = {
+ .table = audio_file_table,
+ .loop_col_num = AFTCOL_HASH,
+ .match_col_num = AFTCOL_PATH,
+ .pm_flags = PM_SKIP_EMPTY_NAME,
+ .data = &cad,
+ .action = change_atts
+ };
+
+ for (p = query->data; p < (char *)query->data + query->size; p += len + 1) {
+ char c;
+ unsigned char bitnum;
+
+ len = strlen(p);
+ ret = -E_ATTR_SYNTAX;
+ if (len == 0)
+ goto out;
+ c = p[len - 1];
+ if (c != '+' && c != '-')
+ break;
+ p[len - 1] = '\0';
+ ret = get_attribute_bitnum_by_name(p, &bitnum);
+ if (ret < 0)
+ goto out;
+ if (c == '+')
+ cad.add_mask |= (1UL << bitnum);
+ else
+ cad.del_mask |= (1UL << bitnum);
+ }
+ ret = -E_ATTR_SYNTAX;
+ if (!cad.add_mask && !cad.del_mask)
+ goto out;
+ pmd.patterns.data = p;
+ assert(p < (char *)query->data + query->size);
+ pmd.patterns.size = (char *)query->data + query->size - p;
+ ret = for_each_matching_row(&pmd);
+ if (ret < 0)
+ goto out;
+ if (pmd.num_matches == 0)
+ para_printf(&cad.pb, "no matches\n");
+out:
+ if (ret < 0)
+ para_printf(&cad.pb, "%s\n", para_strerror(-ret));
+ if (cad.pb.offset)
+ pass_buffer_as_shm(fd, SBD_OUTPUT, cad.pb.buf, cad.pb.offset);
+ free(cad.pb.buf);
+}
+
+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, afs_cb_result_handler, cc);
+}
+
static void afs_stat_callback(int fd, const struct osl_object *query)
{
int *parser_friendly = query->data;
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;