X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=20fa3a96a4ccf1139d6d369ae8ff5764103e7822;hp=51e36c8e7de190028e9b963c7fbd054d1aabd234;hb=20ad4f0f93da79e2ec0a9699dff58b9922556438;hpb=6d5a56308a3a833b08ae0e3692b794fb6122ea60 diff --git a/aft.c b/aft.c index 51e36c8e..20fa3a96 100644 --- a/aft.c +++ b/aft.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Andre Noll + * Copyright (C) 2007-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -12,12 +12,15 @@ #include "string.h" #include #include +#include + #include "afh.h" #include "afs.h" #include "net.h" #include "vss.h" #include "fd.h" #include "ipc.h" +#include "portable_io.h" static struct osl_table *audio_file_table; @@ -71,6 +74,8 @@ enum ls_flags { LS_FLAG_ADMISSIBLE_ONLY = 2, /** -r */ LS_FLAG_REVERSE = 4, + /** -d */ + LS_FLAG_UNIXDATE = 8, }; /** @@ -96,6 +101,8 @@ struct ls_widths { unsigned short duration_width; /** size of the num played field. */ unsigned short num_played_width; + /** size of the amp field. */ + unsigned short amp_width; }; /** Data passed from the ls command handler to its callback function. */ @@ -140,8 +147,10 @@ enum afsi_offsets { AFSI_LYRICS_ID_OFFSET = 24, /** Storage position of the .audio_format_id field. */ AFSI_AUDIO_FORMAT_ID_OFFSET = 28, - /** 3 bytes reserved space for future usage. */ - AFSI_AUDIO_FORMAT_UNUSED_OFFSET = 29, + /** Storage position of the amplification field. */ + AFSI_AMP_OFFSET = 29, + /** 2 bytes reserved space for future usage. */ + AFSI_AUDIO_FORMAT_UNUSED_OFFSET = 30, /** On-disk storage space needed. */ AFSI_SIZE = 32 }; @@ -165,7 +174,8 @@ void save_afsi(struct afs_info *afsi, struct osl_object *obj) write_u32(buf + AFSI_LYRICS_ID_OFFSET, afsi->lyrics_id); write_u8(buf + AFSI_AUDIO_FORMAT_ID_OFFSET, afsi->audio_format_id); - memset(buf + AFSI_AUDIO_FORMAT_UNUSED_OFFSET, 0, 3); + write_u8(buf + AFSI_AMP_OFFSET, afsi->amp); + memset(buf + AFSI_AUDIO_FORMAT_UNUSED_OFFSET, 0, 2); } /** @@ -190,6 +200,7 @@ int load_afsi(struct afs_info *afsi, struct osl_object *obj) afsi->lyrics_id = read_u32(buf + AFSI_LYRICS_ID_OFFSET); afsi->audio_format_id = read_u8(buf + AFSI_AUDIO_FORMAT_ID_OFFSET); + afsi->amp = read_u8(buf + AFSI_AMP_OFFSET); return 1; } @@ -375,7 +386,7 @@ static void load_afhi(const char *buf, struct afh_info *afhi) afhi->chunk_tv.tv_sec = read_u32(buf + CHUNK_TV_TV_SEC_OFFSET); afhi->chunk_tv.tv_usec = read_u32(buf + CHUNK_TV_TV_USEC_OFFSET); ms2tv(read_u16(buf + AFHI_EOF_OFFSET), &afhi->eof_tv); - strcpy(afhi->info_string, buf + AFHI_INFO_STRING_OFFSET); + afhi->info_string = para_strdup(buf + AFHI_INFO_STRING_OFFSET); } static unsigned sizeof_chunk_table(struct afh_info *afhi) @@ -580,8 +591,6 @@ int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi) static int save_afd(struct audio_file_data *afd) { size_t size = sizeof(*afd) + sizeof_chunk_table(&afd->afhi); - - PARA_DEBUG_LOG("size: %zu\n", size); int shmid, ret = shm_new(size); void *shm_afd; char *buf; @@ -620,92 +629,6 @@ int load_afd(int shmid, struct audio_file_data *afd) return 1; } -/** - * Mmap the given audio file and update statistics. - * - * \param aft_row Determines the audio file to be opened and updated. - * \param score The score of the audio file. - * \param afd Result pointer. - * - * On success, the numplayed field of the audio file selector info is increased - * and the lastplayed time is set to the current time. Finally, the score of - * the audio file is updated. - * - * \return Positive shmid on success, negative on errors. - */ -int open_and_update_audio_file(struct osl_row *aft_row, long score, - struct audio_file_data *afd) -{ - HASH_TYPE *aft_hash, file_hash[HASH_SIZE]; - struct osl_object afsi_obj; - struct afs_info old_afsi, new_afsi; - int ret = get_hash_of_row(aft_row, &aft_hash); - struct afsi_change_event_data aced; - struct osl_object map, chunk_table_obj; - char *path; - - if (ret < 0) - return ret; - ret = get_audio_file_path_of_row(aft_row, &path); - if (ret < 0) - return ret; - ret = get_afsi_object_of_row(aft_row, &afsi_obj); - if (ret < 0) - return ret; - ret = load_afsi(&old_afsi, &afsi_obj); - if (ret < 0) - return ret; - ret = get_afhi_of_row(aft_row, &afd->afhi); - if (ret < 0) - return ret; - ret = osl_open_disk_object(audio_file_table, aft_row, - AFTCOL_CHUNKS, &chunk_table_obj); - if (ret < 0) - return ret; - afd->afhi.chunk_table = NULL; - ret = mmap_full_file(path, O_RDONLY, &map.data, - &map.size, &afd->fd); - if (ret < 0) - goto err; - hash_function(map.data, map.size, file_hash); - ret = hash_compare(file_hash, aft_hash); - para_munmap(map.data, map.size); - if (ret) { - ret = -E_HASH_MISMATCH; - goto err; - } - new_afsi = old_afsi; - new_afsi.num_played++; - new_afsi.last_played = time(NULL); - save_afsi(&new_afsi, &afsi_obj); /* in-place update */ - - load_chunk_table(&afd->afhi, chunk_table_obj.data); - { - struct ls_data d = { - .afhi = afd->afhi, - .afsi = old_afsi, - .path = path, - .score = score, - .hash = file_hash - }; - struct para_buffer pb = {.buf = NULL}; - ret = make_status_items(&d, &pb); - if (ret < 0) - goto err; - strncpy(afd->verbose_ls_output, pb.buf, VERBOSE_LS_OUTPUT_SIZE); - afd->verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE - 1] = '\0'; - free(pb.buf); - } - aced.aft_row = aft_row; - aced.old_afsi = &old_afsi; - afs_event(AFSI_CHANGE, NULL, &aced); - ret = save_afd(afd); -err: - free(afd->afhi.chunk_table); - osl_close_disk_object(&chunk_table_obj); - return ret; -} - static int get_local_time(uint64_t *seconds, char *buf, size_t size, time_t current_time, enum ls_listing_mode lm) { @@ -732,7 +655,7 @@ static int get_local_time(uint64_t *seconds, char *buf, size_t size, #define GET_NUM_DIGITS(x, num) { \ typeof((x)) _tmp = PARA_ABS(x); \ *num = 1; \ - if ((x)) \ + if ((_tmp)) \ while ((_tmp) > 9) { \ (_tmp) /= 10; \ (*num)++; \ @@ -835,19 +758,24 @@ static int print_chunk_table(struct ls_data *d, struct para_buffer *b) AFTCOL_CHUNKS, &chunk_table_obj); if (ret < 0) return ret; - para_printf(b, "%s\n" + ret = para_printf(b, "%s\n" "chunk_time: %lu:%lu\nchunk_offsets: ", d->path, (long unsigned) d->afhi.chunk_tv.tv_sec, (long unsigned) d->afhi.chunk_tv.tv_usec ); + if (ret < 0) + goto out; buf = chunk_table_obj.data; - for (i = 0; i <= d->afhi.chunks_total; i++) - para_printf(b, "%u ", - (unsigned) read_u32(buf + 4 * i)); + for (i = 0; i <= d->afhi.chunks_total; i++) { + ret = para_printf(b, "%u ", (unsigned) read_u32(buf + 4 * i)); + if (ret < 0) + goto out; + } + ret = para_printf(b, "\n"); +out: osl_close_disk_object(&chunk_table_obj); - para_printf(b, "\n"); - return 1; + return ret; } static int print_list_item(struct ls_data *d, struct ls_options *opts, @@ -866,16 +794,23 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, char *att_lines, *lyrics_lines, *image_lines, *filename_lines; if (opts->mode == LS_MODE_SHORT) { - para_printf(b, "%s\n", d->path); - return 1; + ret = para_printf(b, "%s\n", d->path); + goto out; + } + if (opts->mode == LS_MODE_CHUNKS) { + ret = print_chunk_table(d, b); + goto out; } - if (opts->mode == LS_MODE_CHUNKS) - return print_chunk_table(d, b); get_attribute_bitmap(&afsi->attributes, att_buf); - ret = get_local_time(&afsi->last_played, last_played_time, - sizeof(last_played_time), current_time, opts->mode); - if (ret < 0) - return ret; + if (opts->flags & LS_FLAG_UNIXDATE) + sprintf(last_played_time, "%llu", + (long long unsigned)afsi->last_played); + else { + ret = get_local_time(&afsi->last_played, last_played_time, + sizeof(last_played_time), current_time, opts->mode); + if (ret < 0) + goto out; + } get_duration_buf(afhi->seconds_total, duration_buf, opts); if (have_score) { if (opts->mode == LS_MODE_LONG) @@ -885,9 +820,10 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, } if (opts->mode == LS_MODE_LONG) { - para_printf(b, + ret = para_printf(b, "%s" /* score */ "%s " /* attributes */ + "%*u " /* amp */ "%*d " /* image_id */ "%*d " /* lyrics_id */ "%*d " /* bitrate */ @@ -900,6 +836,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, "%s\n", /* path */ score_buf, att_buf, + w->amp_width, afsi->amp, w->image_id_width, afsi->image_id, w->lyrics_id_width, afsi->lyrics_id, w->bitrate_width, afhi->bitrate, @@ -911,7 +848,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, last_played_time, d->path ); - return 1; + goto out; } hash_to_asc(d->hash, asc_hash); att_lines = make_attribute_lines(att_buf, afsi); @@ -920,14 +857,16 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, filename_lines = make_filename_lines(d->path, opts->flags); if (opts->mode == LS_MODE_MBOX) { const char *bn = para_basename(d->path); - para_printf(b, + ret = para_printf(b, "From foo@localhost %s\n" "Received: from\nTo: bar\nFrom: a\n" "Subject: %s\n\n", last_played_time, bn? bn : "?"); + if (ret < 0) + goto out; } - para_printf(b, + ret = para_printf(b, "%s" /* filename stuff */ "%s%s%s%s" /* score */ "%s\n" /* attributes */ @@ -942,6 +881,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, "%s: %lu\n" /* seconds total */ "%s: %s\n" /* last played time */ "%s: %d\n" /* num_played */ + "%s: %u\n" /* ampplification */ "%s" /* tag info */ "%s: %lu\n" /* chunk time */ "%s: %lu\n", /* num chunks */ @@ -962,15 +902,18 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, status_item_list[SI_SECONDS_TOTAL], afhi->seconds_total, status_item_list[SI_LAST_PLAYED], last_played_time, status_item_list[SI_NUM_PLAYED], afsi->num_played, + status_item_list[SI_AMPLIFICATION], afsi->amp, afhi->info_string, status_item_list[SI_CHUNK_TIME], tv2ms(&afhi->chunk_tv), status_item_list[SI_NUM_CHUNKS], afhi->chunks_total ); + if (ret < 0) + goto out; if (opts->mode == LS_MODE_MBOX) { struct osl_object lyrics_def; lyr_get_def_by_id(afsi->lyrics_id, &lyrics_def); if (lyrics_def.data) { - para_printf(b, "Lyrics:\n~~~~~~~\n%s", + ret = para_printf(b, "Lyrics:\n~~~~~~~\n%s", (char *)lyrics_def.data); osl_close_disk_object(&lyrics_def); } @@ -979,9 +922,18 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, free(lyrics_lines); free(image_lines); free(filename_lines); - return 1; +out: + free(afhi->info_string); + return ret; } +/** + * Write a list of audio-file related status items with empty values. + * + * \param buf Result pointer. + * + * This is used by vss when currently no audio file is open. + */ void make_empty_status_items(char *buf) { sprintf(buf, @@ -1004,6 +956,10 @@ void make_empty_status_items(char *buf) "%s: \n" /* seconds total */ "%s: \n" /* num played */ "%s: \n" /* last played */ + "%s: \n" /* audio file info */ + "%s: \n" /* taginfo1 */ + "%s: \n" /* taginfo2 */ + "%s: \n" /* amplification */ , status_item_list[SI_PATH], status_item_list[SI_DIRECTORY], @@ -1023,22 +979,178 @@ void make_empty_status_items(char *buf) status_item_list[SI_DURATION], status_item_list[SI_SECONDS_TOTAL], status_item_list[SI_NUM_PLAYED], - status_item_list[SI_LAST_PLAYED] + status_item_list[SI_LAST_PLAYED], + status_item_list[SI_AUDIO_FILE_INFO], + status_item_list[SI_TAGINFO1], + status_item_list[SI_TAGINFO2], + status_item_list[SI_AMPLIFICATION] ); } -int make_status_items(struct ls_data *d, struct para_buffer *pb) +static void fixup_taginfo(char *begin, char *end) +{ + char *p = begin; + + for (;;) { + p = strchr(p, '\n'); + if (!p) + break; + if (p >= end - 1) + break; + *p = ' '; + p++; + } +} + +/* crap, remove this ASAP. */ +static int fixup_info_string(char *info_string) +{ + char *t1, *t2, *end; + + if (strncmp(info_string, "audio_file_info:", 16)) + return -ERRNO_TO_PARA_ERROR(EINVAL); + t1 = strstr(info_string, "\ntaginfo1:"); + if (!t1) + return -ERRNO_TO_PARA_ERROR(EINVAL); + t2 = strstr(info_string, "\ntaginfo2: "); + if (!t2) + return -ERRNO_TO_PARA_ERROR(EINVAL); + + end = t2 + strlen(t2) + 1; + fixup_taginfo(info_string + 16, t1); + fixup_taginfo(t1 + 10, t2); + fixup_taginfo(t2 + 10, end); + + if (t1 - info_string < 80 && t2 - t1 < 80 && end - t2 < 80) + return 0; + if (t1 - info_string >= 80) { + memmove(info_string + 80, t1, end - t1); + t1 = info_string + 80; + t2 -= t1 - info_string - 80; + end -= t1 - info_string - 80; + } + if (t2 - t1 >= 80) { + memmove(t1 + 80, t2, end - t2); + end -= t2 - t1 - 80; + t2 = t1 + 80; + } + if (end - t2 >= 80) { + t2[78] = '\n'; + t2[79] = '\0'; + } + return 1; +} + +static int make_status_items(struct audio_file_data *afd, + struct afs_info *afsi, char *path, long score, + HASH_TYPE *hash) { + struct ls_data d = { + .afhi = afd->afhi, + .afsi = *afsi, + .path = path, + .score = score, + .hash = hash + }; struct ls_options opts = { .flags = LS_FLAG_FULL_PATH | LS_FLAG_ADMISSIBLE_ONLY, .mode = LS_MODE_VERBOSE, }; + struct para_buffer pb = {.max_size = VERBOSE_LS_OUTPUT_SIZE - 1}; time_t current_time; + int ret; + ret = fixup_info_string(afd->afhi.info_string); + if (ret < 0) { + PARA_WARNING_LOG("ignoring invalid tag info\n"); + afd->afhi.info_string[0] = '\0'; + } else if (ret) + PARA_NOTICE_LOG("truncated overlong tag info\n"); time(¤t_time); - return print_list_item(d, &opts, pb, current_time); + ret = print_list_item(&d, &opts, &pb, current_time); /* frees info string */ + afd->afhi.info_string = NULL; + if (ret < 0) + goto out; + strncpy(afd->verbose_ls_output, pb.buf, VERBOSE_LS_OUTPUT_SIZE); + afd->verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE - 1] = '\0'; +out: + free(pb.buf); + return ret; } +/** + * Mmap the given audio file and update statistics. + * + * \param aft_row Determines the audio file to be opened and updated. + * \param score The score of the audio file. + * \param afd Result pointer. + * + * On success, the numplayed field of the audio file selector info is increased + * and the lastplayed time is set to the current time. Finally, the score of + * the audio file is updated. + * + * \return Positive shmid on success, negative on errors. + */ +int open_and_update_audio_file(struct osl_row *aft_row, long score, + struct audio_file_data *afd) +{ + HASH_TYPE *aft_hash, file_hash[HASH_SIZE]; + struct osl_object afsi_obj; + struct afs_info old_afsi, new_afsi; + int ret = get_hash_of_row(aft_row, &aft_hash); + struct afsi_change_event_data aced; + struct osl_object map, chunk_table_obj; + char *path; + + if (ret < 0) + return ret; + ret = get_audio_file_path_of_row(aft_row, &path); + if (ret < 0) + return ret; + ret = get_afsi_object_of_row(aft_row, &afsi_obj); + if (ret < 0) + return ret; + ret = load_afsi(&old_afsi, &afsi_obj); + if (ret < 0) + return ret; + ret = get_afhi_of_row(aft_row, &afd->afhi); + if (ret < 0) + return ret; + afd->afhi.chunk_table = NULL; + ret = osl_open_disk_object(audio_file_table, aft_row, + AFTCOL_CHUNKS, &chunk_table_obj); + if (ret < 0) + goto err; + ret = mmap_full_file(path, O_RDONLY, &map.data, + &map.size, &afd->fd); + if (ret < 0) + goto err; + hash_function(map.data, map.size, file_hash); + ret = hash_compare(file_hash, aft_hash); + para_munmap(map.data, map.size); + if (ret) { + ret = -E_HASH_MISMATCH; + goto err; + } + new_afsi = old_afsi; + new_afsi.num_played++; + new_afsi.last_played = time(NULL); + save_afsi(&new_afsi, &afsi_obj); /* in-place update */ + + load_chunk_table(&afd->afhi, chunk_table_obj.data); + ret = make_status_items(afd, &old_afsi, path, score, file_hash); + if (ret < 0) + goto err; + aced.aft_row = aft_row; + aced.old_afsi = &old_afsi; + afs_event(AFSI_CHANGE, NULL, &aced); + ret = save_afd(afd); +err: + free(afd->afhi.chunk_table); + free(afd->afhi.info_string); + osl_close_disk_object(&chunk_table_obj); + return ret; +} static int ls_audio_format_compare(const void *a, const void *b) { @@ -1213,7 +1325,7 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts) d->path = path; ret = get_hash_of_row(aft_row, &d->hash); if (ret < 0) - return ret; + goto err; w = &options->widths; GET_NUM_DIGITS(d->afsi.image_id, &num_digits); w->image_id_width = PARA_MAX(w->image_id_width, num_digits); @@ -1226,8 +1338,10 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts) GET_NUM_DIGITS(d->afsi.num_played, &num_digits); w->num_played_width = PARA_MAX(w->num_played_width, num_digits); /* get the number of chars to print this amount of time */ - tmp = get_duration_width(d->afhi.seconds_total); - w->duration_width = PARA_MAX(w->duration_width, tmp); + num_digits = get_duration_width(d->afhi.seconds_total); + w->duration_width = PARA_MAX(w->duration_width, num_digits); + GET_NUM_DIGITS(d->afsi.amp, &num_digits); + w->amp_width = PARA_MAX(w->amp_width, num_digits); if (options->flags & LS_FLAG_ADMISSIBLE_ONLY) { GET_NUM_DIGITS(score, &num_digits); num_digits++; /* add one for the sign (space or "-") */ @@ -1235,14 +1349,17 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts) d->score = score; } return 1; +err: + free(d->afhi.info_string); + return ret; } -static int com_ls_callback(const struct osl_object *query, - struct osl_object *ls_output) +static void com_ls_callback(int fd, const struct osl_object *query) { struct ls_options *opts = query->data; char *p, *pattern_start = (char *)query->data + sizeof(*opts); - struct para_buffer b = {.buf = NULL, .size = 0}; + struct para_buffer b = {.max_size = SHMMAX, + .max_size_handler = pass_buffer_as_shm, .private_data = &fd}; int i = 0, ret; time_t current_time; @@ -1262,7 +1379,6 @@ static int com_ls_callback(const struct osl_object *query, prepare_ls_row); if (ret < 0) goto out; - ret = opts->num_patterns? -E_NO_MATCH : 0; if (!opts->num_matching_paths) goto out; ret = sort_matching_paths(opts); @@ -1273,22 +1389,21 @@ static int com_ls_callback(const struct osl_object *query, for (i = opts->num_matching_paths - 1; i >= 0; i--) { ret = print_list_item(opts->data_ptr[i], opts, &b, current_time); if (ret < 0) - break; + goto out; } else for (i = 0; i < opts->num_matching_paths; i++) { ret = print_list_item(opts->data_ptr[i], opts, &b, current_time); if (ret < 0) - break; + goto out; } - ret = 1; out: - ls_output->data = b.buf; - ls_output->size = b.size; + if (b.offset) + pass_buffer_as_shm(b.buf, b.offset, &fd); + free(b.buf); free(opts->data); free(opts->data_ptr); free(opts->patterns); - return ret; } /* @@ -1301,8 +1416,7 @@ int com_ls(int fd, int argc, char * const * const argv) enum ls_sorting_method sort = LS_SORT_BY_PATH; enum ls_listing_mode mode = LS_MODE_SHORT; struct ls_options opts = {.patterns = NULL}; - struct osl_object query = {.data = &opts, .size = sizeof(opts)}, - ls_output; + struct osl_object query = {.data = &opts, .size = sizeof(opts)}; for (i = 1; i < argc; i++) { const char *arg = argv[i]; @@ -1351,6 +1465,10 @@ int com_ls(int fd, int argc, char * const * const argv) flags |= LS_FLAG_REVERSE; continue; } + if (!strcmp(arg, "-d")) { + flags |= LS_FLAG_UNIXDATE; + continue; + } if (!strncmp(arg, "-s", 2)) { if (!*(arg + 2) || *(arg + 3)) return -E_AFT_SYNTAX; @@ -1400,11 +1518,7 @@ int com_ls(int fd, int argc, char * const * const argv) opts.mode = mode; opts.num_patterns = argc - i; ret = send_option_arg_callback_request(&query, opts.num_patterns, - argv + i, com_ls_callback, &ls_output); - if (ret > 0) { - ret = send_buffer(fd, (char *)ls_output.data); - free(ls_output.data); - } + argv + i, com_ls_callback, send_result, &fd); return ret; } @@ -1551,8 +1665,7 @@ enum com_add_flags { ADD_FLAG_ALL = 8, }; -static int com_add_callback(const struct osl_object *query, - struct osl_object *result) +static void com_add_callback(int fd, const struct osl_object *query) { char *buf = query->data, *path; struct osl_row *pb, *aft_row; @@ -1564,7 +1677,9 @@ static int com_add_callback(const struct osl_object *query, char afsi_buf[AFSI_SIZE]; uint32_t flags = read_u32(buf + CAB_FLAGS_OFFSET); struct afs_info default_afsi = {.last_played = 0}; - struct para_buffer msg = {.buf = NULL}; + struct para_buffer msg = {.max_size = SHMMAX, + .max_size_handler = pass_buffer_as_shm, .private_data = &fd}; + uint16_t afhi_offset, chunks_offset; hash = (HASH_TYPE *)buf + CAB_HASH_OFFSET; hash_to_asc(hash, asc);; @@ -1579,18 +1694,22 @@ static int com_add_callback(const struct osl_object *query, hs = find_hash_sister(hash); ret = aft_get_row_of_path(path, &pb); if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND) - return ret; + goto out; if (hs && pb && hs == pb && !(flags & ADD_FLAG_FORCE)) { if (flags & ADD_FLAG_VERBOSE) - para_printf(&msg, "ignoring duplicate\n"); - ret = 1; + ret = para_printf(&msg, "ignoring duplicate\n"); + else + ret = 1; goto out; } if (hs && hs != pb) { struct osl_object obj; if (pb) { /* hs trumps pb, remove pb */ - if (flags & ADD_FLAG_VERBOSE) - para_printf(&msg, "removing path brother\n"); + if (flags & ADD_FLAG_VERBOSE) { + ret = para_printf(&msg, "removing path brother\n"); + if (ret < 0) + goto out; + } ret = osl_del_row(audio_file_table, pb); if (ret < 0) goto out; @@ -1602,7 +1721,9 @@ static int com_add_callback(const struct osl_object *query, AFTCOL_PATH, &obj); if (ret < 0) goto out; - para_printf(&msg, "renamed from %s\n", (char *)obj.data); + ret = para_printf(&msg, "renamed from %s\n", (char *)obj.data); + if (ret < 0) + goto out; } ret = osl_update_object(audio_file_table, hs, AFTCOL_PATH, &objs[AFTCOL_PATH]); @@ -1613,8 +1734,8 @@ static int com_add_callback(const struct osl_object *query, goto out; } /* no hs or force mode, child must have sent afhi */ - uint16_t afhi_offset = read_u16(buf + CAB_AFHI_OFFSET_POS); - uint16_t chunks_offset = read_u16(buf + CAB_CHUNKS_OFFSET_POS); + afhi_offset = read_u16(buf + CAB_AFHI_OFFSET_POS); + chunks_offset = read_u16(buf + CAB_CHUNKS_OFFSET_POS); objs[AFTCOL_AFHI].data = buf + afhi_offset; objs[AFTCOL_AFHI].size = chunks_offset - afhi_offset; @@ -1630,9 +1751,12 @@ static int com_add_callback(const struct osl_object *query, if (ret < 0) goto out; hash_to_asc(old_hash, old_asc); - if (flags & ADD_FLAG_VERBOSE) - para_printf(&msg, "file change: %s -> %s\n", + if (flags & ADD_FLAG_VERBOSE) { + ret = para_printf(&msg, "file change: %s -> %s\n", old_asc, asc); + if (ret < 0) + goto out; + } ret = osl_update_object(audio_file_table, pb, AFTCOL_HASH, &objs[AFTCOL_HASH]); if (ret < 0) @@ -1641,8 +1765,11 @@ static int com_add_callback(const struct osl_object *query, if (hs || pb) { /* (hs != NULL and pb != NULL) implies hs == pb */ struct osl_row *row = pb? pb : hs; /* update afhi and chunk_table */ - if (flags & ADD_FLAG_VERBOSE) - para_printf(&msg, "updating afhi and chunk table\n"); + if (flags & ADD_FLAG_VERBOSE) { + ret = para_printf(&msg, "updating afhi and chunk table\n"); + if (ret < 0) + goto out; + } ret = osl_update_object(audio_file_table, row, AFTCOL_AFHI, &objs[AFTCOL_AFHI]); if (ret < 0) @@ -1655,8 +1782,11 @@ static int com_add_callback(const struct osl_object *query, goto out; } /* new entry, use default afsi */ - if (flags & ADD_FLAG_VERBOSE) - para_printf(&msg, "new file\n"); + if (flags & ADD_FLAG_VERBOSE) { + ret = para_printf(&msg, "new file\n"); + if (ret < 0) + goto out; + } default_afsi.last_played = time(NULL) - 365 * 24 * 60 * 60; default_afsi.audio_format_id = read_u8(buf + CAB_AUDIO_FORMAT_OFFSET); @@ -1668,11 +1798,9 @@ static int com_add_callback(const struct osl_object *query, out: if (ret < 0) para_printf(&msg, "%s\n", para_strerror(-ret)); - if (!msg.buf) - return 0; - result->data = msg.buf; - result->size = msg.size; - return 1; + if (msg.offset) + pass_buffer_as_shm(msg.buf, msg.offset, &fd); + free(msg.buf); } /** Used by com_add(). */ @@ -1683,43 +1811,42 @@ struct private_add_data { uint32_t flags; }; -static int path_brother_callback(const struct osl_object *query, - struct osl_object *result) +static void path_brother_callback(int fd, const struct osl_object *query) { char *path = query->data; struct osl_row *path_brother; int ret = aft_get_row_of_path(path, &path_brother); if (ret < 0) - return ret; - result->data = para_malloc(sizeof(path_brother)); - result->size = sizeof(path_brother); - *(struct osl_row **)(result->data) = path_brother; - return 1; + return; + pass_buffer_as_shm((char *)&path_brother, sizeof(path_brother), &fd); } -static int hash_sister_callback(const struct osl_object *query, - struct osl_object *result) +static void hash_sister_callback(int fd, const struct osl_object *query) { HASH_TYPE *hash = query->data; struct osl_row *hash_sister; hash_sister = find_hash_sister(hash); if (!hash_sister) - return -E_RB_KEY_NOT_FOUND; - result->data = para_malloc(sizeof(hash_sister)); - result->size = sizeof(hash_sister); - *(struct osl_row **)(result->data) = hash_sister; + return; + pass_buffer_as_shm((char *)&hash_sister, sizeof(hash_sister), &fd); +} + +static int get_row_pointer_from_result(struct osl_object *result, void *private) +{ + struct osl_row **row = private; + *row = result->data; return 1; } -static int add_one_audio_file(const char *path, const void *private_data) +static int add_one_audio_file(const char *path, void *private_data) { - int ret, send_ret = 1; + int ret, send_ret = 1, fd; uint8_t format_num = -1; - const struct private_add_data *pad = private_data; + struct private_add_data *pad = private_data; struct afh_info afhi, *afhi_ptr = NULL; struct osl_row *pb = NULL, *hs = NULL; /* path brother/hash sister */ - struct osl_object map, obj = {.data = NULL}, query, result = {.data = NULL}; + struct osl_object map, obj = {.data = NULL}, query; HASH_TYPE hash[HASH_SIZE]; ret = guess_audio_format(path); @@ -1727,13 +1854,10 @@ static int add_one_audio_file(const char *path, const void *private_data) goto out_free; query.data = (char *)path; query.size = strlen(path) + 1; - ret = send_callback_request(path_brother_callback, &query, &result); + ret = send_callback_request(path_brother_callback, &query, + get_row_pointer_from_result, &pb); if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND) goto out_free; - if (ret >= 0) { - pb = *(struct osl_row **)result.data; - free(result.data); - } ret = 1; if (pb && (pad->flags & ADD_FLAG_LAZY)) { /* lazy is really cheap */ if (pad->flags & ADD_FLAG_VERBOSE) @@ -1741,7 +1865,7 @@ static int add_one_audio_file(const char *path, const void *private_data) goto out_free; } /* We still want to add this file. Compute its hash. */ - ret = mmap_full_file(path, O_RDONLY, &map.data, &map.size, NULL); + ret = mmap_full_file(path, O_RDONLY, &map.data, &map.size, &fd); if (ret < 0) goto out_free; hash_function(map.data, map.size, hash); @@ -1749,13 +1873,10 @@ static int add_one_audio_file(const char *path, const void *private_data) /* Check whether the database contains a file with the same hash. */ query.data = hash; query.size = HASH_SIZE; - ret = send_callback_request(hash_sister_callback, &query, &result); - if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND) + ret = send_callback_request(hash_sister_callback, &query, + get_row_pointer_from_result, &hs); + if (ret < 0) goto out_unmap; - if (ret >= 0) { - hs = *(struct osl_row **)result.data; - free(result.data); - } /* Return success if we already know this file. */ ret = 1; if (pb && hs && hs == pb && !(pad->flags & ADD_FLAG_FORCE)) { @@ -1769,13 +1890,14 @@ static int add_one_audio_file(const char *path, const void *private_data) * there is a hash sister and FORCE was not given. */ if (!hs || (pad->flags & ADD_FLAG_FORCE)) { - ret = compute_afhi(path, map.data, map.size, &afhi); + ret = compute_afhi(path, map.data, map.size, fd, &afhi); if (ret < 0) goto out_unmap; format_num = ret; afhi_ptr = &afhi; } munmap(map.data, map.size); + close(fd); if (pad->flags & ADD_FLAG_VERBOSE) { send_ret = send_va_buffer(pad->fd, "adding %s\n", path); if (send_ret < 0) @@ -1783,22 +1905,21 @@ static int add_one_audio_file(const char *path, const void *private_data) } save_add_callback_buffer(hash, path, afhi_ptr, pad->flags, format_num, &obj); /* Ask afs to consider this entry for adding. */ - ret = send_callback_request(com_add_callback, &obj, &result); - if (ret > 0) { - send_ret = send_va_buffer(pad->fd, "%s", (char *)result.data); - free(result.data); - } + ret = send_callback_request(com_add_callback, &obj, send_result, &pad->fd); goto out_free; out_unmap: + close(fd); munmap(map.data, map.size); out_free: if (ret < 0 && send_ret >= 0) send_ret = send_va_buffer(pad->fd, "failed to add %s (%s)\n", path, para_strerror(-ret)); free(obj.data); - if (afhi_ptr) + if (afhi_ptr) { free(afhi_ptr->chunk_table); + free(afhi_ptr->info_string); + } /* Stop adding files only on send errors. */ return send_ret; } @@ -1889,11 +2010,13 @@ struct com_touch_options { int32_t num_played; /** New last played count. */ int64_t last_played; - /** new lyrics id. */ + /** New lyrics id. */ int32_t lyrics_id; - /** new image id. */ + /** New image id. */ int32_t image_id; - /** command line flags (see \ref touch_flags). */ + /** New amplification value. */ + int32_t amp; + /** Command line flags (see \ref touch_flags). */ unsigned flags; }; @@ -1914,30 +2037,32 @@ static int touch_audio_file(__a_unused struct osl_table *table, struct osl_object obj; struct afs_info old_afsi, new_afsi; int ret, no_options = tad->cto->num_played < 0 && tad->cto->last_played < 0 && - tad->cto->lyrics_id < 0 && tad->cto->image_id < 0; + tad->cto->lyrics_id < 0 && tad->cto->image_id < 0 && tad->cto->amp < 0; struct afsi_change_event_data aced; ret = get_afsi_object_of_row(row, &obj); - if (ret < 0) { - para_printf(&tad->pb, "%s: %s\n", name, para_strerror(-ret)); - return 1; - } + if (ret < 0) + return para_printf(&tad->pb, "%s: %s\n", name, para_strerror(-ret)); ret = load_afsi(&old_afsi, &obj); - if (ret < 0) { - para_printf(&tad->pb, "%s: %s\n", name, para_strerror(-ret)); - return 1; - } + if (ret < 0) + return para_printf(&tad->pb, "%s: %s\n", name, para_strerror(-ret)); new_afsi = old_afsi; if (no_options) { new_afsi.num_played++; new_afsi.last_played = time(NULL); - if (tad->cto->flags & TOUCH_FLAG_VERBOSE) - para_printf(&tad->pb, "%s: num_played = %u, " + if (tad->cto->flags & TOUCH_FLAG_VERBOSE) { + ret = para_printf(&tad->pb, "%s: num_played = %u, " "last_played = now()\n", name, new_afsi.num_played); + if (ret < 0) + return ret; + } } else { - if (tad->cto->flags & TOUCH_FLAG_VERBOSE) - para_printf(&tad->pb, "touching %s\n", name); + if (tad->cto->flags & TOUCH_FLAG_VERBOSE) { + ret = para_printf(&tad->pb, "touching %s\n", name); + if (ret < 0) + return ret; + } if (tad->cto->lyrics_id >= 0) new_afsi.lyrics_id = tad->cto->lyrics_id; if (tad->cto->image_id >= 0) @@ -1946,6 +2071,8 @@ static int touch_audio_file(__a_unused struct osl_table *table, new_afsi.num_played = tad->cto->num_played; if (tad->cto->last_played >= 0) new_afsi.last_played = tad->cto->last_played; + if (tad->cto->amp >= 0) + new_afsi.amp = tad->cto->amp; } tad->num_matches++; save_afsi(&new_afsi, &obj); /* in-place update */ @@ -1955,11 +2082,16 @@ static int touch_audio_file(__a_unused struct osl_table *table, return 1; } -static int com_touch_callback(const struct osl_object *query, - struct osl_object *result) +static void com_touch_callback(int fd, const struct osl_object *query) { - struct touch_action_data tad = {.cto = query->data}; - int ret; + struct touch_action_data tad = {.cto = query->data, + .pb = { + .max_size = SHMMAX, + .private_data = &fd, + .max_size_handler = pass_buffer_as_shm + } + }; + int ret, ret2 = 0; struct pattern_match_data pmd = { .table = audio_file_table, .loop_col_num = AFTCOL_HASH, @@ -1973,16 +2105,13 @@ static int com_touch_callback(const struct osl_object *query, pmd.fnmatch_flags |= FNM_PATHNAME; ret = for_each_matching_row(&pmd); if (ret < 0) - para_printf(&tad.pb, "%s\n", para_strerror(-ret)); + ret2 = para_printf(&tad.pb, "%s\n", para_strerror(-ret)); else if (!tad.num_matches) - para_printf(&tad.pb, "no matches\n"); - if (tad.pb.buf) { - result->data = tad.pb.buf; - result->size = tad.pb.size; - return 1; - } - return ret < 0? ret : 0; + ret2 = para_printf(&tad.pb, "no matches\n"); + if (ret2 >= 0 && tad.pb.offset) + pass_buffer_as_shm(tad.pb.buf, tad.pb.offset, &fd); + free(tad.pb.buf); } int com_touch(int fd, int argc, char * const * const argv) @@ -1991,10 +2120,10 @@ int com_touch(int fd, int argc, char * const * const argv) .num_played = -1, .last_played = -1, .lyrics_id = -1, - .image_id = -1 + .image_id = -1, + .amp = -1, }; - struct osl_object query = {.data = &cto, .size = sizeof(cto)}, - result; + struct osl_object query = {.data = &cto, .size = sizeof(cto)}; int i, ret; @@ -2030,6 +2159,16 @@ int com_touch(int fd, int argc, char * const * const argv) return ret; continue; } + if (!strncmp(arg, "-a", 2)) { + int32_t val; + ret = para_atoi32(arg + 2, &val); + if (ret < 0) + return ret; + if (val < 0 || val > 255) + return -ERRNO_TO_PARA_ERROR(EINVAL); + cto.amp = val; + continue; + } if (!strcmp(arg, "-p")) { cto.flags |= TOUCH_FLAG_FNM_PATHNAME; continue; @@ -2043,15 +2182,9 @@ int com_touch(int fd, int argc, char * const * const argv) if (i >= argc) return -E_AFT_SYNTAX; ret = send_option_arg_callback_request(&query, argc - i, - argv + i, com_touch_callback, &result); - if (!ret) - return 0; - if (ret < 0) { + argv + i, com_touch_callback, send_result, &fd); + 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; } @@ -2081,21 +2214,29 @@ static int remove_audio_file(__a_unused struct osl_table *table, struct com_rm_action_data *crd = data; int ret; - if (crd->flags & RM_FLAG_VERBOSE) - para_printf(&crd->pb, "removing %s\n", name); + if (crd->flags & RM_FLAG_VERBOSE) { + ret = para_printf(&crd->pb, "removing %s\n", name); + if (ret < 0) + return ret; + } afs_event(AUDIO_FILE_REMOVE, &crd->pb, row); ret = osl_del_row(audio_file_table, row); if (ret < 0) para_printf(&crd->pb, "%s: %s\n", name, para_strerror(-ret)); else crd->num_removed++; - return 1; + return ret; } -static int com_rm_callback(const struct osl_object *query, - __a_unused struct osl_object *result) +static void com_rm_callback(int fd, const struct osl_object *query) { - struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data}; + struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data, + .pb = { + .max_size = SHMMAX, + .private_data = &fd, + .max_size_handler = pass_buffer_as_shm + } + }; int ret; struct pattern_match_data pmd = { .table = audio_file_table, @@ -2109,28 +2250,26 @@ static int com_rm_callback(const struct osl_object *query, if (crd.flags & RM_FLAG_FNM_PATHNAME) pmd.fnmatch_flags |= FNM_PATHNAME; ret = for_each_matching_row(&pmd); - if (ret < 0) + if (ret < 0) { para_printf(&crd.pb, "%s\n", para_strerror(-ret)); + return; + } if (!crd.num_removed && !(crd.flags & RM_FLAG_FORCE)) - para_printf(&crd.pb, "no matches -- nothing removed\n"); + ret = para_printf(&crd.pb, "no matches -- nothing removed\n"); else { if (crd.flags & RM_FLAG_VERBOSE) - para_printf(&crd.pb, "removed %u files\n", crd.num_removed); + ret = para_printf(&crd.pb, "removed %u files\n", crd.num_removed); } - if (crd.pb.buf) { - result->data = crd.pb.buf; - result->size = crd.pb.size; - return 1; - } - return ret < 0? ret : 0; + if (ret >= 0 && crd.pb.offset) + pass_buffer_as_shm(crd.pb.buf, crd.pb.offset, &fd); + free(crd.pb.buf); } /* TODO options: -r (recursive) */ int com_rm(int fd, int argc, char * const * const argv) { uint32_t flags = 0; - struct osl_object query = {.data = &flags, .size = sizeof(flags)}, - result; + struct osl_object query = {.data = &flags, .size = sizeof(flags)}; int i, ret; for (i = 1; i < argc; i++) { @@ -2158,15 +2297,9 @@ int com_rm(int fd, int argc, char * const * const argv) if (i >= argc) return -E_AFT_SYNTAX; ret = send_option_arg_callback_request(&query, argc - i, argv + i, - com_rm_callback, &result); - if (!ret) - return 0; - if (ret < 0) { + com_rm_callback, send_result, &fd); + 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; } @@ -2228,24 +2361,29 @@ static int copy_selector_info(__a_unused struct osl_table *table, target_afsi.attributes = cad->source_afsi.attributes; save_afsi(&target_afsi, &target_afsi_obj); /* in-place update */ cad->num_copied++; - if (cad->flags & CPSI_FLAG_VERBOSE) - para_printf(&cad->pb, "copied afsi to %s\n", name); + if (cad->flags & CPSI_FLAG_VERBOSE) { + ret = para_printf(&cad->pb, "copied afsi to %s\n", name); + if (ret < 0) + return ret; + } aced.aft_row = row; aced.old_afsi = &old_afsi; afs_event(AFSI_CHANGE, &cad->pb, &aced); return 1; } -static int com_cpsi_callback(const struct osl_object *query, - struct osl_object *result) +static void com_cpsi_callback(int fd, const struct osl_object *query) { - struct cpsi_action_data cad = {.flags = *(unsigned *)query->data}; + struct cpsi_action_data cad = { + .flags = *(unsigned *)query->data, + .pb = { + .max_size = SHMMAX, + .private_data = &fd, + .max_size_handler = pass_buffer_as_shm + } + }; int ret; char *source_path = (char *)query->data + sizeof(cad.flags); - - ret = get_afsi_of_path(source_path, &cad.source_afsi); - if (ret < 0) - goto out; struct pattern_match_data pmd = { .table = audio_file_table, .loop_col_num = AFTCOL_HASH, @@ -2256,32 +2394,31 @@ static int com_cpsi_callback(const struct osl_object *query, .data = &cad, .action = copy_selector_info }; + + ret = get_afsi_of_path(source_path, &cad.source_afsi); + if (ret < 0) + goto out; ret = for_each_matching_row(&pmd); out: if (ret < 0) para_printf(&cad.pb, "%s\n", para_strerror(-ret)); - if (cad.flags & CPSI_FLAG_VERBOSE) { + else if (cad.flags & CPSI_FLAG_VERBOSE) { if (cad.num_copied) para_printf(&cad.pb, "copied requested afsi from %s " - "to %u files\n", - source_path, cad.num_copied); + "to %u files\n", source_path, cad.num_copied); else para_printf(&cad.pb, "nothing copied\n"); } - if (cad.pb.buf) { - result->data = cad.pb.buf; - result->size = cad.pb.size; - return 1; - } - return ret < 0? ret : 0; + if (cad.pb.offset) + pass_buffer_as_shm(cad.pb.buf, cad.pb.offset, &fd); + free(cad.pb.buf); } int com_cpsi(int fd, int argc, char * const * const argv) { unsigned flags = 0; int i, ret; - struct osl_object options = {.data = &flags, .size = sizeof(flags)}, - result; + struct osl_object options = {.data = &flags, .size = sizeof(flags)}; for (i = 1; i < argc; i++) { const char *arg = argv[i]; @@ -2322,15 +2459,9 @@ int com_cpsi(int fd, int argc, char * const * const argv) if (!(flags & ~CPSI_FLAG_VERBOSE)) /* no copy flags given */ flags = ~(unsigned)CPSI_FLAG_VERBOSE | flags; ret = send_option_arg_callback_request(&options, argc - i, argv + i, - com_cpsi_callback, &result); - if (!ret) - return 0; - if (ret < 0) { + com_cpsi_callback, send_result, &fd); + 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; } @@ -2344,52 +2475,61 @@ static int check_audio_file(struct osl_row *row, void *data) struct afs_info afsi; char *blob_name; - if (ret < 0) { - para_printf(pb, "%s\n", para_strerror(-ret)); - return 1; - } - if (stat(path, &statbuf) < 0) - para_printf(pb, "%s: stat error (%s)\n", path, strerror(errno)); - else { - if (!S_ISREG(statbuf.st_mode)) - para_printf(pb, "%s: not a regular file\n", path); + if (ret < 0) + return para_printf(pb, "%s\n", para_strerror(-ret)); + if (stat(path, &statbuf) < 0) { + ret = para_printf(pb, "%s: stat error (%s)\n", path, strerror(errno)); + if (ret < 0) + return ret; + } else { + if (!S_ISREG(statbuf.st_mode)) { + ret = para_printf(pb, "%s: not a regular file\n", path); + if (ret < 0) + return ret; + } } ret = get_afsi_of_row(row, &afsi); - if (ret < 0) { - para_printf(pb, "%s: %s\n", path, para_strerror(-ret)); - return 1; - } - ret = lyr_get_name_by_id(afsi.lyrics_id, &blob_name); if (ret < 0) - para_printf(pb, "%s lyrics id %u: %s\n", path, afsi.lyrics_id, + return para_printf(pb, "%s: %s\n", path, para_strerror(-ret)); + ret = lyr_get_name_by_id(afsi.lyrics_id, &blob_name); + if (ret < 0) { + ret = para_printf(pb, "%s lyrics id %u: %s\n", path, afsi.lyrics_id, para_strerror(-ret)); + if (ret < 0) + return ret; + } ret = img_get_name_by_id(afsi.image_id, &blob_name); if (ret < 0) - para_printf(pb, "%s image id %u: %s\n", path, afsi.image_id, + ret = para_printf(pb, "%s image id %u: %s\n", path, afsi.image_id, para_strerror(-ret)); - return 1; + return ret; } /** * Check the audio file table for inconsistencies. * + * \param fd The afs socket. * \param query Unused. - * \param result Contains message string upon return. * * This function always succeeds. * * \sa com_check(). */ -int aft_check_callback(__a_unused const struct osl_object *query, struct osl_object *result) +void aft_check_callback(int fd, __a_unused const struct osl_object *query) { - struct para_buffer pb = {.buf = NULL}; + struct para_buffer pb = { + .max_size = SHMMAX, + .private_data = &fd, + .max_size_handler = pass_buffer_as_shm + }; + int ret = para_printf(&pb, "checking audio file table...\n"); - para_printf(&pb, "checking audio file table...\n"); + if (ret < 0) + return; audio_file_loop(&pb, check_audio_file); - result->data = pb.buf; - result->size = pb.size; - return 1; - + if (pb.offset) + pass_buffer_as_shm(pb.buf, pb.offset, &fd); + free(pb.buf); } /** @@ -2460,12 +2600,16 @@ static int clear_attribute(struct osl_row *row, void *data) static int aft_event_handler(enum afs_events event, struct para_buffer *pb, void *data) { + int ret; + switch(event) { case ATTRIBUTE_REMOVE: { const struct rmatt_event_data *red = data; - para_printf(pb, "clearing attribute %s (bit %u) from all " + ret = para_printf(pb, "clearing attribute %s (bit %u) from all " "entries in the audio file table\n", red->name, red->bitnum); + if (ret < 0) + return ret; return audio_file_loop(data, clear_attribute); } default: