From: Andre Noll Date: Sun, 25 Oct 2015 15:06:43 +0000 (+0100) Subject: Merge branch 'refs/heads/t/command_handler_cleanups' X-Git-Tag: v0.5.6~94 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=0f4910b50116416fefb09ca67a615679067ef359;hp=-c Merge branch 'refs/heads/t/command_handler_cleanups' Cooking for about two months. * refs/heads/t/command_handler_cleanups: (39 commits) com_addatt(): Return negative on errors com_rm(): In force mode, don't complain if no paths matched. aft: Unify handling of hash and path duplicates. afs: Provide pbout para_buffer for each callback. afs: Make afs callbacks more flexible. afs: Rename callback_function to afs_callback. com_check(): Add attribute checking. Let afs_event() return int. playlist_check_callback(): Return negative on errors mood_check_callback(): Return negative on errors com_mvblob(): Return negative on errors com_addblob(): Return negative on errors com_rmblob(): Return negative on errors, cleanup com_catblob(): Return negative on errors com_lsblob(): Return negative on errors rmatt: Cleanup callback. com_rmatt(): Return negative on errors com_mvatt(): Return negative on errors com_lsatt(): Return negative on errors com_init(): Return negative on errors ... --- 0f4910b50116416fefb09ca67a615679067ef359 diff --combined NEWS index f1940d3d,834b61fc..7faa0ddd --- a/NEWS +++ b/NEWS @@@ -1,19 -1,9 +1,24 @@@ NEWS ==== ------------------------------------------ -current master branch "magnetic momentum" ------------------------------------------ +------------------------------------------ +current master branch "cascading gradient" +------------------------------------------ + + - para_afh learned to modify meta tags of mp3 wma ogg spx + opus flac aac files. ++ - afs commands propagate error codes to the client. ++ - The check command now also checks the attribute table for ++ inconsistencies. ++ - New -v flag for the version command (print verbose version string) ++ + +-------------------------------------- +0.5.5 (2015-09-20) "magnetic momentum" +-------------------------------------- + +Many new features and a lot of other improvements. + - On Linux systems, local sockets are now created in the abstract name space by default. This allows to get rid of the socket specials in /var/paraslash. @@@ -26,13 -16,9 +31,13 @@@ the background if no log file is given. Instead, all log messages go to /dev/null in this case. - Web page cleanup. + - New syntax for the -l and -s options of the ls command. + These options should now be specified as -l=v rather than + -lv, for example. The old syntax still works, but support + will be dropped in v0.6.0. - -Download: ./releases/paraslash-git.tar.bz2 (tarball) +Download: ./releases/paraslash-0.5.5.tar.bz2 (tarball) +./releases/paraslash-0.5.5.tar.bz2.asc (signature) ------------------------------------------ 0.5.4 (2015-01-23) "exponential alignment" diff --combined afs.cmd index 07db3ccb,56a7d952..584ba809 --- a/afs.cmd +++ b/afs.cmd @@@ -36,20 -36,19 +36,20 @@@ H: only the tables given by table_name. N: ls P: AFS_READ D: List audio files. -U: ls [-l[s|l|v|m]] [-p] [-a] [-r] [-d] [-s{p|s|l|n|f|c|i|y|b|d|a}] [pattern...] +U: ls [-l=mode] [-p] [-a] [-r] [-d] [-s=order] [pattern...] H: Print a list of all audio files matching pattern. H: H: Options: H: -H: -l Change listing mode. Defaults to short listing if not given. +H: -l=mode Change listing mode. Defaults to short listing if not given. H: -H: -ls: short listing mode -H: -ll: long listing mode (equivalent to -l) -H: -lv: verbose listing mode -H: -lp: parser-friendly mode -H: -lm: mbox listing mode -H: -lc: chunk-table listing mode +H: Available modes: +H: s: short listing mode +H: l: long listing mode (equivalent to -l) +H: v: verbose listing mode +H: p: parser-friendly mode +H: m: mbox listing mode +H: c: chunk-table listing mode H: H: -p List full paths. If this option is not specified, only the basename H: of each file is printed. @@@ -61,20 -60,19 +61,20 @@@ H: -r Reverse sort order H: H: -d Print dates as seconds after the epoch. H: -H: -s Change sort order. Defaults to alphabetical path sort if not given. -H: -H: -sp: by path -H: -sl: by last played time -H: -ss: by score (implies -a) -H: -sn: by num played count -H: -sf: by frequency -H: -sc: by number of channels -H: -si: by image id -H: -sy: by lyrics id -H: -sb: by bit rate -H: -sd: by duration -H: -sa: by audio format +H: -s=order Change sort order. Defaults to alphabetical path sort if not given. +H: +H: Possible values for order: +H: p: by path +H: l: by last played time +H: s: by score (implies -a) +H: n: by num played count +H: f: by frequency +H: c: by number of channels +H: i: by image id +H: y: by lyrics id +H: b: by bit rate +H: d: by duration +H: a: by audio format --- N: lsatt P: AFS_READ @@@ -120,9 -118,9 +120,9 @@@ H: Rename attribute old to new N: check P: AFS_READ D: Run integrity checks against osl tables. - U: check [-a] [-m] [-p] - H: Check the audio file table, the mood definitions and all - H: defined playlists and report any inconsistencies found. + U: check [-a] [-A] [-m] [-p] + H: Check the audio file table, the attribute table, the mood definitions + H: and all defined playlists. Report any inconsistencies. H: H: Options: H: @@@ -131,12 -129,17 +131,17 @@@ H: table which are not present in the H: whether the lyrics id and all entries in the audio file table are H: valid. H: + H: -A Check the attribute table against the afs attribute bitmask of + H: each audio file in the audio file table. Reports audio files + H: whose attribute bitmask is invalid, i.e., has a bit set which + H: does not correspond to any attribute of the attribute table. + H: H: -m Run syntax checks on all defined moods in the mood table. H: H: -p Check all playlists for lines that correspond to files not contained H: in the audio file table. H: - H: If called without arguments, all three checks are run. + H: If called without arguments, all checks are run. --- N: rmatt P: AFS_READ | AFS_WRITE @@@ -287,7 -290,6 +292,7 @@@ N: mv@member O: int com_mv@member@(struct command_context *cc); P: AFS_READ | AFS_WRITE D: Rename a blob of type @member@. -U: mv@member@ old_@member@_name new_@member@_name -H: Rename the blob identified by old_@member@_name to new_@member@_name. -H: This command fails if new_@member@_name already exists. +U: mv@member@ source_@member@_name dest_@member@_name +H: Rename the blob identified by the source blob name to the destination blob +H: name. The command fails if the source does not exist, or if the destination +H: already exists. diff --combined aft.c index f2c1edab,a5da1a92..8a8e5282 --- a/aft.c +++ b/aft.c @@@ -241,12 -241,19 +241,12 @@@ enum audio_file_table_columns NUM_AFT_COLUMNS }; -/** - * Compare two osl objects pointing to hash values. - * - * \param obj1 Pointer to the first hash object. - * \param obj2 Pointer to the second hash object. - * - * \return The values required for an osl compare function. - * - * \sa osl_compare_func, uint32_compare(). - */ -static int aft_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2) +/* compare function for the hash column */ +static int aft_hash_compare(const struct osl_object *obj1, + const struct osl_object *obj2) { - return hash_compare((unsigned char *)obj1->data, (unsigned char *)obj2->data); + return hash_compare((unsigned char *)obj1->data, + (unsigned char *)obj2->data); } static struct osl_column_description aft_cols[] = { @@@ -741,62 -748,50 +741,50 @@@ static int write_attribute_items(struc char *att_text; int ret; - ret = WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_BITMAP, "%s\n", att_bitmap); - if (ret < 0) - return ret; + WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_BITMAP, "%s\n", att_bitmap); ret = get_attribute_text(&afsi->attributes, " ", &att_text); if (ret < 0) return ret; - ret = WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_TXT, "%s\n", att_text); + WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_TXT, "%s\n", att_text); free(att_text); return ret; } - static int write_lyrics_items(struct para_buffer *b, struct afs_info *afsi) + static void write_lyrics_items(struct para_buffer *b, struct afs_info *afsi) { char *lyrics_name; - int ret; - ret = WRITE_STATUS_ITEM(b, SI_LYRICS_ID, "%u\n", afsi->lyrics_id); - if (ret < 0) - return ret; + WRITE_STATUS_ITEM(b, SI_LYRICS_ID, "%u\n", afsi->lyrics_id); lyr_get_name_by_id(afsi->lyrics_id, &lyrics_name); - return WRITE_STATUS_ITEM(b, SI_LYRICS_NAME, "%s\n", lyrics_name? + WRITE_STATUS_ITEM(b, SI_LYRICS_NAME, "%s\n", lyrics_name? lyrics_name : "(none)"); } - static int write_image_items(struct para_buffer *b, struct afs_info *afsi) + static void write_image_items(struct para_buffer *b, struct afs_info *afsi) { char *image_name; - int ret; - ret = WRITE_STATUS_ITEM(b, SI_IMAGE_ID, "%u\n", afsi->image_id); - if (ret < 0) - return ret; + WRITE_STATUS_ITEM(b, SI_IMAGE_ID, "%u\n", afsi->image_id); img_get_name_by_id(afsi->image_id, &image_name); - return WRITE_STATUS_ITEM(b, SI_IMAGE_NAME, "%s\n", image_name? + WRITE_STATUS_ITEM(b, SI_IMAGE_NAME, "%s\n", image_name? image_name : "(none)"); } - static int write_filename_items(struct para_buffer *b, const char *path, + static void write_filename_items(struct para_buffer *b, const char *path, unsigned flags) { char *val; - int ret; - if (!(flags & LS_FLAG_FULL_PATH)) - return WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", path); - ret = WRITE_STATUS_ITEM(b, SI_PATH, "%s\n", path); - if (ret < 0) - return ret; + if (!(flags & LS_FLAG_FULL_PATH)) { + WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", path); + return; + } + WRITE_STATUS_ITEM(b, SI_PATH, "%s\n", path); val = para_basename(path); - ret = WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", val? val : ""); - if (ret < 0) - return ret; + WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", val? val : ""); val = para_dirname(path); - ret = WRITE_STATUS_ITEM(b, SI_DIRECTORY, "%s\n", val? val : ""); + WRITE_STATUS_ITEM(b, SI_DIRECTORY, "%s\n", val? val : ""); free(val); - return ret; } static int print_chunk_table(struct ls_data *d, struct para_buffer *b) @@@ -813,32 -808,27 +801,27 @@@ AFTCOL_CHUNKS, &chunk_table_obj)); if (ret < 0) return ret; - ret = para_printf(b, "%s\n" + 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++) { - ret = para_printf(b, "%u ", (unsigned) read_u32(buf + 4 * i)); - if (ret < 0) - goto out; - } - ret = para_printf(b, "\n"); - out: + for (i = 0; i <= d->afhi.chunks_total; i++) + para_printf(b, "%u ", (unsigned) read_u32(buf + 4 * i)); + para_printf(b, "\n"); + ret = 1; osl_close_disk_object(&chunk_table_obj); return ret; } - static int write_score(struct para_buffer *b, struct ls_data *d, + static void write_score(struct para_buffer *b, struct ls_data *d, struct ls_options *opts) { if (!(opts->flags & LS_FLAG_ADMISSIBLE_ONLY)) /* no score*/ - return 0; - return WRITE_STATUS_ITEM(b, SI_SCORE, "%li\n", d->score); + return; + WRITE_STATUS_ITEM(b, SI_SCORE, "%li\n", d->score); } static int print_list_item(struct ls_data *d, struct ls_options *opts, @@@ -853,7 -843,8 +836,8 @@@ char asc_hash[2 * HASH_SIZE + 1]; if (opts->mode == LS_MODE_SHORT) { - ret = para_printf(b, "%s\n", d->path); + para_printf(b, "%s\n", d->path); + ret = 1; goto out; } if (opts->mode == LS_MODE_CHUNKS) { @@@ -874,12 -865,10 +858,10 @@@ if (opts->mode == LS_MODE_LONG) { struct ls_widths *w = &opts->widths; if (opts->flags & LS_FLAG_ADMISSIBLE_ONLY) { - ret = para_printf(b, "%*li ", - opts->widths.score_width, d->score); - if (ret < 0) - goto out; + para_printf(b, "%*li ", opts->widths.score_width, + d->score); } - ret = para_printf(b, + para_printf(b, "%s " /* attributes */ "%*u " /* amp */ "%*d " /* image_id */ @@@ -906,98 -895,50 +888,50 @@@ last_played_time, d->path ); + ret = 1; goto out; } if (opts->mode == LS_MODE_MBOX) { const char *bn = para_basename(d->path); - ret = para_printf(b, + 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; } - ret = write_filename_items(b, d->path, opts->flags); - if (ret < 0) - goto out; - ret = write_score(b, d, opts); - if (ret < 0) - goto out; + write_filename_items(b, d->path, opts->flags); + write_score(b, d, opts); ret = write_attribute_items(b, att_buf, afsi); if (ret < 0) goto out; - ret = write_image_items(b, afsi); - if (ret < 0) - goto out; - ret = write_lyrics_items(b, afsi); - if (ret < 0) - goto out; + write_image_items(b, afsi); + write_lyrics_items(b, afsi); hash_to_asc(d->hash, asc_hash); - ret = WRITE_STATUS_ITEM(b, SI_HASH, "%s\n", asc_hash); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_BITRATE, "%dkbit/s\n", afhi->bitrate); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_FORMAT, "%s\n", + WRITE_STATUS_ITEM(b, SI_HASH, "%s\n", asc_hash); + WRITE_STATUS_ITEM(b, SI_BITRATE, "%dkbit/s\n", afhi->bitrate); + WRITE_STATUS_ITEM(b, SI_FORMAT, "%s\n", audio_format_name(afsi->audio_format_id)); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_FREQUENCY, "%dHz\n", afhi->frequency); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_CHANNELS, "%d\n", afhi->channels); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_DURATION, "%s\n", duration_buf); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_SECONDS_TOTAL, "%lu\n", - afhi->seconds_total); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_LAST_PLAYED, "%s\n", last_played_time); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_NUM_PLAYED, "%d\n", afsi->num_played); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_AMPLIFICATION, "%u\n", afsi->amp); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_CHUNK_TIME, "%lu\n", - tv2ms(&afhi->chunk_tv)); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_NUM_CHUNKS, "%lu\n", - afhi->chunks_total); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_TECHINFO, "%s\n", afhi->techinfo); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_ARTIST, "%s\n", afhi->tags.artist); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_TITLE, "%s\n", afhi->tags.title); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_YEAR, "%s\n", afhi->tags.year); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_ALBUM, "%s\n", afhi->tags.album); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_COMMENT, "%s\n", afhi->tags.comment); - if (ret < 0) - goto out; + WRITE_STATUS_ITEM(b, SI_FREQUENCY, "%dHz\n", afhi->frequency); + WRITE_STATUS_ITEM(b, SI_CHANNELS, "%d\n", afhi->channels); + WRITE_STATUS_ITEM(b, SI_DURATION, "%s\n", duration_buf); + WRITE_STATUS_ITEM(b, SI_SECONDS_TOTAL, "%lu\n", afhi->seconds_total); + WRITE_STATUS_ITEM(b, SI_LAST_PLAYED, "%s\n", last_played_time); + WRITE_STATUS_ITEM(b, SI_NUM_PLAYED, "%d\n", afsi->num_played); + WRITE_STATUS_ITEM(b, SI_AMPLIFICATION, "%u\n", afsi->amp); + WRITE_STATUS_ITEM(b, SI_CHUNK_TIME, "%lu\n", tv2ms(&afhi->chunk_tv)); + WRITE_STATUS_ITEM(b, SI_NUM_CHUNKS, "%lu\n", afhi->chunks_total); + WRITE_STATUS_ITEM(b, SI_TECHINFO, "%s\n", afhi->techinfo); + WRITE_STATUS_ITEM(b, SI_ARTIST, "%s\n", afhi->tags.artist); + WRITE_STATUS_ITEM(b, SI_TITLE, "%s\n", afhi->tags.title); + WRITE_STATUS_ITEM(b, SI_YEAR, "%s\n", afhi->tags.year); + WRITE_STATUS_ITEM(b, SI_ALBUM, "%s\n", afhi->tags.album); + WRITE_STATUS_ITEM(b, SI_COMMENT, "%s\n", afhi->tags.comment); 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) { - ret = para_printf(b, "Lyrics:\n~~~~~~~\n%s", + para_printf(b, "Lyrics:\n~~~~~~~\n%s", (char *)lyrics_def.data); osl_close_disk_object(&lyrics_def); } @@@ -1026,9 -967,8 +960,8 @@@ static void make_inode_status_items(str ret = strftime(mtime_str, 29, "%b %d %Y", &mtime_tm); assert(ret > 0); /* number of bytes placed in mtime_str */ out: - /* We don't care too much about errors here */ - (void)WRITE_STATUS_ITEM(pb, SI_MTIME, "%s\n", mtime_str); - (void)WRITE_STATUS_ITEM(pb, SI_FILE_SIZE, "%ld\n", statbuf.st_size / 1024); + WRITE_STATUS_ITEM(pb, SI_MTIME, "%s\n", mtime_str); + WRITE_STATUS_ITEM(pb, SI_FILE_SIZE, "%ld\n", statbuf.st_size / 1024); } static int make_status_items(void) @@@ -1132,7 -1072,9 +1065,9 @@@ again * No need to update the status items as the AFSI_CHANGE event will * recreate them. */ - afs_event(AFSI_CHANGE, NULL, &aced); + ret = afs_event(AFSI_CHANGE, NULL, &aced); + if (ret < 0) + goto out; ret = save_afd(afd); out: free(afd->afhi.chunk_table); @@@ -1351,22 -1293,14 +1286,14 @@@ err return ret; } - static void com_ls_callback(int fd, const struct osl_object *query) + static int com_ls_callback(struct afs_callback_arg *aca) { - struct ls_options *opts = query->data; - char *p, *pattern_start = (char *)query->data + sizeof(*opts); - struct para_buffer b = { - .max_size = shm_get_shmmax(), - .flags = (opts->mode == LS_MODE_PARSER)? PBF_SIZE_PREFIX : 0, - .max_size_handler = afs_max_size_handler, - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - } - }; + struct ls_options *opts = aca->query.data; + char *p, *pattern_start = (char *)aca->query.data + sizeof(*opts); int i = 0, ret; time_t current_time; + aca->pbout.flags = (opts->mode == LS_MODE_PARSER)? PBF_SIZE_PREFIX : 0; if (opts->num_patterns) { opts->patterns = para_malloc(opts->num_patterns * sizeof(char *)); for (i = 0, p = pattern_start; i < opts->num_patterns; i++) { @@@ -1383,8 -1317,7 +1310,7 @@@ if (ret < 0) goto out; if (opts->num_matching_paths == 0) { - if (opts->num_patterns > 0) - para_printf(&b, "no matches\n"); + ret = opts->num_patterns > 0? -E_NO_MATCH : 0; goto out; } ret = sort_matching_paths(opts); @@@ -1393,23 -1326,23 +1319,23 @@@ time(¤t_time); if (opts->flags & LS_FLAG_REVERSE) for (i = opts->num_matching_paths - 1; i >= 0; i--) { - ret = print_list_item(opts->data_ptr[i], opts, &b, current_time); + ret = print_list_item(opts->data_ptr[i], opts, + &aca->pbout, current_time); if (ret < 0) goto out; } else for (i = 0; i < opts->num_matching_paths; i++) { - ret = print_list_item(opts->data_ptr[i], opts, &b, current_time); + ret = print_list_item(opts->data_ptr[i], opts, + &aca->pbout, current_time); if (ret < 0) goto out; } out: - if (b.offset) - pass_buffer_as_shm(fd, SBD_OUTPUT, b.buf, b.offset); - free(b.buf); free(opts->data); free(opts->data_ptr); free(opts->patterns); + return ret; } /* @@@ -1417,7 -1350,7 +1343,7 @@@ */ int com_ls(struct command_context *cc) { - int i, ret; + int i; unsigned flags = 0; enum ls_sorting_method sort = LS_SORT_BY_PATH; enum ls_listing_mode mode = LS_MODE_SHORT; @@@ -1432,26 -1365,18 +1358,26 @@@ i++; break; } + /* + * Compatibility: Prior to 0.5.5 it was necessary to specify + * the listing mode without the '=' character as in -lv, for + * example. Now the variant with '=' is preferred and + * documented but we still accept the old way to specify the + * listing mode. + * + * Support for the legacy syntax can be dropped at 0.6.0 + * or later. + */ if (!strncmp(arg, "-l", 2)) { - if (!*(arg + 2)) { - mode = LS_MODE_LONG; - continue; - } - if (*(arg + 3)) - return -E_AFT_SYNTAX; - switch(*(arg + 2)) { + arg += 2; + if (*arg == '=') + arg++; + switch (*arg) { case 's': mode = LS_MODE_SHORT; continue; case 'l': + case '\0': mode = LS_MODE_LONG; continue; case 'v': @@@ -1486,12 -1411,10 +1412,12 @@@ flags |= LS_FLAG_UNIXDATE; continue; } + /* The compatibility remark above applies also to -s. */ if (!strncmp(arg, "-s", 2)) { - if (!*(arg + 2) || *(arg + 3)) - return -E_AFT_SYNTAX; - switch(*(arg + 2)) { + arg += 2; + if (*arg == '=') + arg++; + switch (*arg) { case 'p': sort = LS_SORT_BY_PATH; continue; @@@ -1536,9 -1459,8 +1462,8 @@@ opts.sorting = sort; opts.mode = mode; opts.num_patterns = cc->argc - i; - ret = send_option_arg_callback_request(&query, opts.num_patterns, + return send_option_arg_callback_request(&query, opts.num_patterns, cc->argv + i, com_ls_callback, afs_cb_result_handler, cc); - return ret; } /** @@@ -1555,27 -1477,36 +1480,36 @@@ int audio_file_loop(void *private_data func)); } - static struct osl_row *find_hash_sister(unsigned char *hash) + static int find_hash_sister(unsigned char *hash, struct osl_row **result) { - const struct osl_object obj = {.data = hash, .size = HASH_SIZE}; - struct osl_row *row; + int ret = aft_get_row_of_hash(hash, result); + + if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) + return 0; + return ret; + } + + static int find_path_brother(const char *path, struct osl_row **result) + { + int ret = aft_get_row_of_path(path, result); - osl_get_row(audio_file_table, AFTCOL_HASH, &obj, &row); - return row; + if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) + return 0; + return ret; } /** The format of the data stored by save_audio_file_data(). */ enum com_add_buffer_offsets { - /** afhi (if present) starts here. */ + /* afhi (if present) starts at this offset. */ CAB_AFHI_OFFSET_POS = 0, /** Start of the chunk table (if present). */ - CAB_CHUNKS_OFFSET_POS = 2, - /** Audio format id. */ - CAB_AUDIO_FORMAT_OFFSET = 4, + CAB_CHUNKS_OFFSET_POS = 4, /** Flags given to the add command. */ - CAB_FLAGS_OFFSET = 5, + CAB_FLAGS_OFFSET = 8, + /** Audio format id. */ + CAB_AUDIO_FORMAT_ID_OFFSET = 12, /** The hash of the audio file being added. */ - CAB_HASH_OFFSET = 9, + CAB_HASH_OFFSET = 13, /** Start of the path of the audio file. */ CAB_PATH_OFFSET = (CAB_HASH_OFFSET + HASH_SIZE), }; @@@ -1596,23 -1527,27 +1530,23 @@@ static void save_add_callback_buffer(un size_t size = CAB_PATH_OFFSET + path_len + afhi_size + sizeof_chunk_table(afhi); char *buf = para_malloc(size); - uint16_t pos; - - write_u8(buf + CAB_AUDIO_FORMAT_OFFSET, audio_format_num); - write_u32(buf + CAB_FLAGS_OFFSET, flags); - - memcpy(buf + CAB_HASH_OFFSET, hash, HASH_SIZE); - strcpy(buf + CAB_PATH_OFFSET, path); + uint32_t pos; pos = CAB_PATH_OFFSET + path_len; - PARA_DEBUG_LOG("size: %zu, afhi starts at %d\n", size, pos); - PARA_DEBUG_LOG("last afhi byte: %p, pos %zu\n", buf + pos + afhi_size - 1, - pos + afhi_size - 1); - write_u16(buf + CAB_AFHI_OFFSET_POS, pos); + write_u32(buf + CAB_AFHI_OFFSET_POS, pos); save_afhi(afhi, buf + pos); - pos += afhi_size; - PARA_DEBUG_LOG("size: %zu, chunks start at %d\n", size, pos); - write_u16(buf + CAB_CHUNKS_OFFSET_POS, pos); + + write_u32(buf + CAB_CHUNKS_OFFSET_POS, pos); if (afhi) save_chunk_table(afhi, buf + pos); - PARA_DEBUG_LOG("last byte in buf: %p\n", buf + size - 1); + + write_u32(buf + CAB_FLAGS_OFFSET, flags); + write_u8(buf + CAB_AUDIO_FORMAT_ID_OFFSET, audio_format_num); + + memcpy(buf + CAB_HASH_OFFSET, hash, HASH_SIZE); + strcpy(buf + CAB_PATH_OFFSET, path); + obj->data = buf; obj->size = size; } @@@ -1680,9 -1615,9 +1614,9 @@@ enum com_add_flags ADD_FLAG_ALL = 8, }; - static void com_add_callback(int fd, const struct osl_object *query) + static int com_add_callback(struct afs_callback_arg *aca) { - char *buf = query->data, *path; + char *buf = aca->query.data, *path; struct osl_row *pb, *aft_row; struct osl_row *hs; struct osl_object objs[NUM_AFT_COLUMNS]; @@@ -1692,14 -1627,6 +1626,6 @@@ 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 = { - .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 - } - }; uint16_t afhi_offset, chunks_offset; hash = (unsigned char *)buf + CAB_HASH_OFFSET; @@@ -1712,26 -1639,26 +1638,26 @@@ objs[AFTCOL_PATH].size = strlen(path) + 1; PARA_INFO_LOG("request to add %s\n", path); - hs = find_hash_sister(hash); - ret = aft_get_row_of_path(path, &pb); - if (ret < 0 && ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) + ret = find_hash_sister(hash, &hs); + if (ret < 0) + goto out; + ret = find_path_brother(path, &pb); + if (ret < 0) goto out; if (hs && pb && hs == pb && !(flags & ADD_FLAG_FORCE)) { if (flags & ADD_FLAG_VERBOSE) - ret = para_printf(&msg, "ignoring duplicate\n"); - else - ret = 1; + para_printf(&aca->pbout, "ignoring duplicate\n"); + ret = 1; goto out; } if (hs && hs != pb) { struct osl_object obj; if (pb) { /* hs trumps pb, remove pb */ - if (flags & ADD_FLAG_VERBOSE) { - ret = para_printf(&msg, "removing %s\n", path); - if (ret < 0) - goto out; - } - afs_event(AUDIO_FILE_REMOVE, &msg, pb); + if (flags & ADD_FLAG_VERBOSE) + para_printf(&aca->pbout, "removing %s\n", path); + ret = afs_event(AUDIO_FILE_REMOVE, &aca->pbout, pb); + if (ret < 0) + goto out; ret = osl(osl_del_row(audio_file_table, pb)); if (ret < 0) goto out; @@@ -1743,21 -1670,22 +1669,22 @@@ AFTCOL_PATH, &obj)); if (ret < 0) goto out; - ret = para_printf(&msg, "renamed from %s\n", (char *)obj.data); - if (ret < 0) - goto out; + para_printf(&aca->pbout, "renamed from %s\n", + (char *)obj.data); } ret = osl(osl_update_object(audio_file_table, hs, AFTCOL_PATH, &objs[AFTCOL_PATH])); if (ret < 0) goto out; - afs_event(AUDIO_FILE_RENAME, &msg, hs); + ret = afs_event(AUDIO_FILE_RENAME, &aca->pbout, hs); + if (ret < 0) + goto out; if (!(flags & ADD_FLAG_FORCE)) goto out; } /* no hs or force mode, child must have sent afhi */ - afhi_offset = read_u16(buf + CAB_AFHI_OFFSET_POS); - chunks_offset = read_u16(buf + CAB_CHUNKS_OFFSET_POS); + afhi_offset = read_u32(buf + CAB_AFHI_OFFSET_POS); + chunks_offset = read_u32(buf + CAB_CHUNKS_OFFSET_POS); objs[AFTCOL_AFHI].data = buf + afhi_offset; objs[AFTCOL_AFHI].size = chunks_offset - afhi_offset; @@@ -1765,7 -1693,7 +1692,7 @@@ if (!objs[AFTCOL_AFHI].size) /* "impossible" */ goto out; objs[AFTCOL_CHUNKS].data = buf + chunks_offset; - objs[AFTCOL_CHUNKS].size = query->size - chunks_offset; + objs[AFTCOL_CHUNKS].size = aca->query.size - chunks_offset; if (pb && !hs) { /* update pb's hash */ char old_asc[2 * HASH_SIZE + 1]; unsigned char *old_hash; @@@ -1773,12 -1701,9 +1700,9 @@@ if (ret < 0) goto out; hash_to_asc(old_hash, old_asc); - if (flags & ADD_FLAG_VERBOSE) { - ret = para_printf(&msg, "file change: %s -> %s\n", + if (flags & ADD_FLAG_VERBOSE) + para_printf(&aca->pbout, "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) @@@ -1787,11 -1712,9 +1711,9 @@@ 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) { - ret = para_printf(&msg, "updating afhi and chunk table\n"); - if (ret < 0) - goto out; - } + if (flags & ADD_FLAG_VERBOSE) + para_printf(&aca->pbout, + "updating afhi and chunk table\n"); ret = osl(osl_update_object(audio_file_table, row, AFTCOL_AFHI, &objs[AFTCOL_AFHI])); if (ret < 0) @@@ -1800,29 -1723,26 +1722,26 @@@ &objs[AFTCOL_CHUNKS])); if (ret < 0) goto out; - afs_event(AFHI_CHANGE, &msg, row); - goto out; - } - /* new entry, use default afsi */ - if (flags & ADD_FLAG_VERBOSE) { - ret = para_printf(&msg, "new file\n"); + ret = afs_event(AFHI_CHANGE, &aca->pbout, row); if (ret < 0) goto out; + goto out; } + /* new entry, use default afsi */ + if (flags & ADD_FLAG_VERBOSE) + para_printf(&aca->pbout, "new file\n"); default_afsi.last_played = time(NULL) - 365 * 24 * 60 * 60; - default_afsi.audio_format_id = read_u8(buf + CAB_AUDIO_FORMAT_OFFSET); + default_afsi.audio_format_id = read_u8(buf + CAB_AUDIO_FORMAT_ID_OFFSET); objs[AFTCOL_AFSI].data = &afsi_buf; objs[AFTCOL_AFSI].size = AFSI_SIZE; save_afsi(&default_afsi, &objs[AFTCOL_AFSI]); ret = osl(osl_add_and_get_row(audio_file_table, objs, &aft_row)); - afs_event(AUDIO_FILE_ADD, &msg, aft_row); + ret = afs_event(AUDIO_FILE_ADD, &aca->pbout, aft_row); out: if (ret < 0) - para_printf(&msg, "%s\n", para_strerror(-ret)); - if (msg.offset) - pass_buffer_as_shm(fd, SBD_OUTPUT, msg.buf, msg.offset); - free(msg.buf); + para_printf(&aca->pbout, "could not add %s\n", path); + return ret; } /** Used by com_add(). */ @@@ -1833,26 -1753,26 +1752,26 @@@ struct private_add_data uint32_t flags; }; - static void path_brother_callback(int fd, const struct osl_object *query) + static int path_brother_callback(struct afs_callback_arg *aca) { - char *path = query->data; + char *path = aca->query.data; struct osl_row *path_brother; - int ret = aft_get_row_of_path(path, &path_brother); - if (ret < 0) - return; - pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&path_brother, + int ret = find_path_brother(path, &path_brother); + if (ret <= 0) + return ret; + return pass_buffer_as_shm(aca->fd, SBD_OUTPUT, (char *)&path_brother, sizeof(path_brother)); } - static void hash_sister_callback(int fd, const struct osl_object *query) + static int hash_sister_callback(struct afs_callback_arg *aca) { - unsigned char *hash = query->data; + unsigned char *hash = aca->query.data; struct osl_row *hash_sister; + int ret = find_hash_sister(hash, &hash_sister); - hash_sister = find_hash_sister(hash); - if (!hash_sister) - return; - pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&hash_sister, + if (ret <= 0) + return ret; + return pass_buffer_as_shm(aca->fd, SBD_OUTPUT, (char *)&hash_sister, sizeof(hash_sister)); } @@@ -1860,7 -1780,9 +1779,9 @@@ static int get_row_pointer_from_result( __a_unused uint8_t band, void *private) { struct osl_row **row = private; - *row = *(struct osl_row **)(result->data); + + if (band == SBD_OUTPUT) + *row = *(struct osl_row **)(result->data); return 1; } @@@ -2037,97 -1959,78 +1958,78 @@@ struct com_touch_options unsigned flags; }; - /** Data passed to the action handler of com_touch(). */ - struct touch_action_data { - /** Command line options (see \ref com_touch_options). */ - struct com_touch_options *cto; - /** Message buffer. */ - struct para_buffer pb; - }; - static int touch_audio_file(__a_unused struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct touch_action_data *tad = data; + struct afs_callback_arg *aca = data; + struct com_touch_options *cto = aca->query.data; 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->amp < 0; + int ret, no_options = cto->num_played < 0 && cto->last_played < 0 && + cto->lyrics_id < 0 && cto->image_id < 0 && cto->amp < 0; struct afsi_change_event_data aced; ret = get_afsi_object_of_row(row, &obj); - if (ret < 0) - return para_printf(&tad->pb, "%s: %s\n", name, para_strerror(-ret)); + if (ret < 0) { + para_printf(&aca->pbout, "cannot touch %s\n", name); + return ret; + } ret = load_afsi(&old_afsi, &obj); - if (ret < 0) - return para_printf(&tad->pb, "%s: %s\n", name, para_strerror(-ret)); + if (ret < 0) { + para_printf(&aca->pbout, "cannot touch %s\n", name); + return 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) { - ret = para_printf(&tad->pb, "%s: num_played = %u, " + if (cto->flags & TOUCH_FLAG_VERBOSE) + para_printf(&aca->pbout, "%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) { - 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) - new_afsi.image_id = tad->cto->image_id; - if (tad->cto->num_played >= 0) - 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; + if (cto->flags & TOUCH_FLAG_VERBOSE) + para_printf(&aca->pbout, "touching %s\n", name); + if (cto->lyrics_id >= 0) + new_afsi.lyrics_id = cto->lyrics_id; + if (cto->image_id >= 0) + new_afsi.image_id = cto->image_id; + if (cto->num_played >= 0) + new_afsi.num_played = cto->num_played; + if (cto->last_played >= 0) + new_afsi.last_played = cto->last_played; + if (cto->amp >= 0) + new_afsi.amp = cto->amp; } save_afsi(&new_afsi, &obj); /* in-place update */ aced.aft_row = row; aced.old_afsi = &old_afsi; - afs_event(AFSI_CHANGE, &tad->pb, &aced); - return 1; + return afs_event(AFSI_CHANGE, &aca->pbout, &aced); } - static void com_touch_callback(int fd, const struct osl_object *query) + static int com_touch_callback(struct afs_callback_arg *aca) { - struct touch_action_data tad = {.cto = query->data, - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler - } - }; - int ret, ret2 = 0; + int ret; + struct com_touch_options *cto = aca->query.data; struct pattern_match_data pmd = { .table = audio_file_table, .loop_col_num = AFTCOL_HASH, .match_col_num = AFTCOL_PATH, - .patterns = {.data = (char *)query->data + sizeof(*tad.cto), - .size = query->size - sizeof(*tad.cto)}, - .data = &tad, + .patterns = { + .data = (char *)aca->query.data + + sizeof(struct com_touch_options), + .size = aca->query.size + - sizeof(struct com_touch_options) + }, + .data = aca, .action = touch_audio_file }; - if (tad.cto->flags & TOUCH_FLAG_FNM_PATHNAME) + if (cto->flags & TOUCH_FLAG_FNM_PATHNAME) pmd.fnmatch_flags |= FNM_PATHNAME; ret = for_each_matching_row(&pmd); - if (ret < 0) - ret2 = para_printf(&tad.pb, "%s\n", para_strerror(-ret)); - else if (pmd.num_matches == 0) - ret2 = para_printf(&tad.pb, "no matches\n"); - if (ret2 >= 0 && tad.pb.offset) - pass_buffer_as_shm(fd, SBD_OUTPUT, tad.pb.buf, tad.pb.offset); - free(tad.pb.buf); + if (ret >= 0 && pmd.num_matches == 0) + ret = -E_NO_MATCH; + return ret; } int com_touch(struct command_context *cc) @@@ -2197,11 -2100,8 +2099,8 @@@ } if (i >= cc->argc) return -E_AFT_SYNTAX; - ret = send_option_arg_callback_request(&query, cc->argc - i, + return send_option_arg_callback_request(&query, cc->argc - i, cc->argv + i, com_touch_callback, afs_cb_result_handler, cc); - if (ret < 0) - send_strerror(cc, -ret); - return ret; } /** Flags for com_rm(). */ @@@ -2214,70 -2114,50 +2113,50 @@@ enum rm_flags RM_FLAG_FNM_PATHNAME = 4 }; - /** Data passed to the action handler of com_rm(). */ - struct com_rm_action_data { - /** Command line flags ((see \ref rm_flags). */ - uint32_t flags; - /** Message buffer. */ - struct para_buffer pb; - }; - static int remove_audio_file(__a_unused struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct com_rm_action_data *crd = data; + struct afs_callback_arg *aca = data; + uint32_t flags =*(uint32_t *)aca->query.data; int ret; - 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); + if (flags & RM_FLAG_VERBOSE) + para_printf(&aca->pbout, "removing %s\n", name); + ret = afs_event(AUDIO_FILE_REMOVE, &aca->pbout, row); + if (ret < 0) + return ret; ret = osl(osl_del_row(audio_file_table, row)); if (ret < 0) - para_printf(&crd->pb, "%s: %s\n", name, para_strerror(-ret)); + para_printf(&aca->pbout, "cannot remove %s\n", name); return ret; } - static void com_rm_callback(int fd, const struct osl_object *query) + static int com_rm_callback(struct afs_callback_arg *aca) { - struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data, - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler - } - }; int ret; + uint32_t flags = *(uint32_t *)aca->query.data; struct pattern_match_data pmd = { .table = audio_file_table, .loop_col_num = AFTCOL_HASH, .match_col_num = AFTCOL_PATH, - .patterns = {.data = (char *)query->data + sizeof(uint32_t), - .size = query->size - sizeof(uint32_t)}, - .data = &crd, + .patterns = {.data = (char *)aca->query.data + sizeof(uint32_t), + .size = aca->query.size - sizeof(uint32_t)}, + .data = aca, .action = remove_audio_file }; - if (crd.flags & RM_FLAG_FNM_PATHNAME) + if (flags & RM_FLAG_FNM_PATHNAME) pmd.fnmatch_flags |= FNM_PATHNAME; ret = for_each_matching_row(&pmd); - if (ret < 0) { - para_printf(&crd.pb, "%s\n", para_strerror(-ret)); - return; - } - if ((pmd.num_matches == 0) && !(crd.flags & RM_FLAG_FORCE)) - ret = para_printf(&crd.pb, "no matches -- nothing removed\n"); - else if (crd.flags & RM_FLAG_VERBOSE) { - ret = para_printf(&crd.pb, "removed %u files\n", + if (ret < 0) + goto out; + if (pmd.num_matches == 0) { + if (!(flags & RM_FLAG_FORCE)) + ret = -E_NO_MATCH; + } else if (flags & RM_FLAG_VERBOSE) + para_printf(&aca->pbout, "removed %u file(s)\n", pmd.num_matches); - } - if (ret >= 0 && crd.pb.offset) - pass_buffer_as_shm(fd, SBD_OUTPUT, crd.pb.buf, crd.pb.offset); - free(crd.pb.buf); + out: + return ret; } /* TODO options: -r (recursive) */ @@@ -2285,7 -2165,7 +2164,7 @@@ int com_rm(struct command_context *cc { uint32_t flags = 0; struct osl_object query = {.data = &flags, .size = sizeof(flags)}; - int i, ret; + int i; for (i = 1; i < cc->argc; i++) { const char *arg = cc->argv[i]; @@@ -2311,11 -2191,8 +2190,8 @@@ } if (i >= cc->argc) return -E_AFT_SYNTAX; - ret = send_option_arg_callback_request(&query, cc->argc - i, + return send_option_arg_callback_request(&query, cc->argc - i, cc->argv + i, com_rm_callback, afs_cb_result_handler, cc); - if (ret < 0) - send_strerror(cc, -ret); - return ret; } /** @@@ -2342,10 -2219,10 +2218,10 @@@ enum cpsi_flags struct cpsi_action_data { /** command line flags (see \ref cpsi_flags). */ unsigned flags; - /** Message buffer. */ - struct para_buffer pb; /** Values are copied from here. */ struct afs_info source_afsi; + /** What was passed to com_cpsi_callback(). */ + struct afs_callback_arg *aca; }; static int copy_selector_info(__a_unused struct osl_table *table, @@@ -2373,38 -2250,27 +2249,27 @@@ if (cad->flags & CPSI_FLAG_COPY_ATTRIBUTES) target_afsi.attributes = cad->source_afsi.attributes; save_afsi(&target_afsi, &target_afsi_obj); /* in-place update */ - if (cad->flags & CPSI_FLAG_VERBOSE) { - ret = para_printf(&cad->pb, "copied afsi to %s\n", name); - if (ret < 0) - return ret; - } + if (cad->flags & CPSI_FLAG_VERBOSE) + para_printf(&cad->aca->pbout, "copied afsi to %s\n", name); aced.aft_row = row; aced.old_afsi = &old_afsi; - afs_event(AFSI_CHANGE, &cad->pb, &aced); - return 1; + return afs_event(AFSI_CHANGE, &cad->aca->pbout, &aced); } - static void com_cpsi_callback(int fd, const struct osl_object *query) + static int com_cpsi_callback(struct afs_callback_arg *aca) { struct cpsi_action_data cad = { - .flags = *(unsigned *)query->data, - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler - } + .flags = *(unsigned *)aca->query.data, + .aca = aca }; int ret; - char *source_path = (char *)query->data + sizeof(cad.flags); + char *source_path = (char *)aca->query.data + sizeof(cad.flags); struct pattern_match_data pmd = { .table = audio_file_table, .loop_col_num = AFTCOL_HASH, .match_col_num = AFTCOL_PATH, .patterns = {.data = source_path + strlen(source_path) + 1, - .size = query->size - sizeof(cad.flags) + .size = aca->query.size - sizeof(cad.flags) - strlen(source_path) - 1}, .data = &cad, .action = copy_selector_info @@@ -2414,24 -2280,22 +2279,22 @@@ if (ret < 0) goto out; ret = for_each_matching_row(&pmd); - out: if (ret < 0) - para_printf(&cad.pb, "%s\n", para_strerror(-ret)); - else if (pmd.num_matches > 0) { + goto out; + if (pmd.num_matches > 0) { if (cad.flags & CPSI_FLAG_VERBOSE) - para_printf(&cad.pb, "copied requested afsi from %s " - "to %u files\n", source_path, pmd.num_matches); + para_printf(&aca->pbout, "updated afsi of %u file(s)\n", + pmd.num_matches); } else - para_printf(&cad.pb, "no matches - nothing copied\n"); - if (cad.pb.offset) - pass_buffer_as_shm(fd, SBD_OUTPUT, cad.pb.buf, cad.pb.offset); - free(cad.pb.buf); + ret = -E_NO_MATCH; + out: + return ret; } int com_cpsi(struct command_context *cc) { unsigned flags = 0; - int i, ret; + int i; struct osl_object options = {.data = &flags, .size = sizeof(flags)}; for (i = 1; i < cc->argc; i++) { @@@ -2472,16 -2336,13 +2335,13 @@@ return -E_AFT_SYNTAX; if (!(flags & ~CPSI_FLAG_VERBOSE)) /* no copy flags given */ flags = ~(unsigned)CPSI_FLAG_VERBOSE | flags; - ret = send_option_arg_callback_request(&options, cc->argc - i, + return send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i, com_cpsi_callback, afs_cb_result_handler, cc); - if (ret < 0) - send_strerror(cc, -ret); - return ret; } struct change_atts_data { uint64_t add_mask, del_mask; - struct para_buffer pb; + struct afs_callback_arg *aca; }; static int change_atts(__a_unused struct osl_table *table, @@@ -2506,25 -2367,15 +2366,15 @@@ 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; + return afs_event(AFSI_CHANGE, &cad->aca->pbout, &aced); } - static void com_setatt_callback(int fd, const struct osl_object *query) + static int com_setatt_callback(struct afs_callback_arg *aca) { 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 change_atts_data cad = {.aca = aca}; struct pattern_match_data pmd = { .table = audio_file_table, .loop_col_num = AFTCOL_HASH, @@@ -2534,7 -2385,11 +2384,11 @@@ .action = change_atts }; - for (p = query->data; p < (char *)query->data + query->size; p += len + 1) { + for ( + p = aca->query.data; + p < (char *)aca->query.data + aca->query.size; + p += len + 1 + ) { char c; unsigned char bitnum; @@@ -2548,7 -2403,7 +2402,7 @@@ p[len - 1] = '\0'; ret = get_attribute_bitnum_by_name(p, &bitnum); if (ret < 0) { - para_printf(&cad.pb, "attribute not found: %s\n", p); + para_printf(&aca->pbout, "attribute not found: %s\n", p); goto out; } if (c == '+') @@@ -2560,20 -2415,15 +2414,16 @@@ if (!cad.add_mask && !cad.del_mask) goto out; pmd.patterns.data = p; - if (p >= (char *)query->data + query->size) - assert(p < (char *)aca->query.data + aca->query.size); ++ if (p >= (char *)aca->query.data + aca->query.size) + goto out; - pmd.patterns.size = (char *)query->data + query->size - p; + pmd.patterns.size = (char *)aca->query.data + aca->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"); + ret = -E_NO_MATCH; 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); + return ret; } int com_setatt(struct command_context *cc) @@@ -2584,15 -2434,15 +2434,15 @@@ com_setatt_callback, afs_cb_result_handler, cc); } - static void afs_stat_callback(int fd, const struct osl_object *query) + static int afs_stat_callback(struct afs_callback_arg *aca) { - int *parser_friendly = query->data; + int *parser_friendly = aca->query.data; char *buf = *parser_friendly? parser_friendly_status_items : status_items; if (!buf) - return; - pass_buffer_as_shm(fd, SBD_OUTPUT, buf, strlen(buf)); + return 0; + return pass_buffer_as_shm(aca->fd, SBD_OUTPUT, buf, strlen(buf)); } /** @@@ -2618,7 -2468,7 +2468,7 @@@ int send_afs_status(struct command_cont afs_cb_result_handler, cc); } - /* TODO: optionally fix problems by removing offending rows */ + /* returns success on non-fatal errors to keep the loop going */ static int check_audio_file(struct osl_row *row, void *data) { char *path; @@@ -2628,64 -2478,99 +2478,99 @@@ struct afs_info afsi; char *blob_name; - 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; - } + if (ret < 0) { + para_printf(pb, "%s\n", para_strerror(-ret)); + return ret; } + 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); ret = get_afsi_of_row(row, &afsi); - if (ret < 0) - 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; + 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, + para_strerror(-ret)); ret = img_get_name_by_id(afsi.image_id, &blob_name); if (ret < 0) - ret = para_printf(pb, "%s image id %u: %s\n", path, afsi.image_id, + para_printf(pb, "%s image id %u: %s\n", path, afsi.image_id, para_strerror(-ret)); - return ret; + return 0; } /** * Check the audio file table for inconsistencies. * - * \param fd The afs socket. - * \param query Unused. + * \param aca Only ->pbout is used for diagnostics. * - * This function always succeeds. + * \return Standard. Inconsistencies are reported but not regarded as an error. * * \sa com_check(). */ - void aft_check_callback(int fd, __a_unused const struct osl_object *query) + int aft_check_callback(struct afs_callback_arg *aca) { - struct para_buffer pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler - }; - int ret = para_printf(&pb, "checking audio file table...\n"); + para_printf(&aca->pbout, "checking audio file table...\n"); + return audio_file_loop(&aca->pbout, check_audio_file); + } - if (ret < 0) - return; - audio_file_loop(&pb, check_audio_file); - if (pb.offset) - pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset); - free(pb.buf); + struct aft_check_atts_data { + uint64_t att_mask; + struct para_buffer *pb; + }; + + static int check_atts_of_audio_file(struct osl_row *row, void *data) + { + struct aft_check_atts_data *acad = data; + int ret; + struct afs_info afsi; + char *path; + uint64_t bad_bits; + + ret = get_afsi_of_row(row, &afsi); + if (ret < 0) { + para_printf(acad->pb, "cannot get afsi\n"); + return ret; + } + bad_bits = afsi.attributes & ~acad->att_mask; + if (bad_bits == 0) /* OK */ + return 0; + ret = get_audio_file_path_of_row(row, &path); + if (ret < 0) { + para_printf(acad->pb, "cannot get path\n"); + return ret; + } + para_printf(acad->pb, "invalid attribute bits (%" PRIu64 "): %s\n", + bad_bits, path); + /* return success to keep looping */ + return 1; + } + + /** + * Iterate over all audio files and check the attribute bit mask. + * + * \param att_mask The mask of all valid attributes. + * \param pb Used for reporting inconsistencies. + * + * This reads the attribute bit mask of each audio file from the afs info + * structure stored in the audio file table and verifies that all set bits are + * also turned on in \a att_mask, i.e., correspond to an attribute of the + * attribute table. Audio files for which this is not the case are reported via + * \a pb. + * + * \return Standard. Inconsistencies are not regarded as errors. + * + * \sa \ref attribute_check_callback(). + */ + int aft_check_attributes(uint64_t att_mask, struct para_buffer *pb) + { + struct aft_check_atts_data acad = {.att_mask = att_mask, .pb = pb}; + + para_printf(pb, "checking attributes, mask: %" PRIx64 "\n", att_mask); + return audio_file_loop(&acad, check_atts_of_audio_file); } /** @@@ -2761,11 -2646,9 +2646,9 @@@ static int aft_event_handler(enum afs_e switch (event) { case ATTRIBUTE_REMOVE: { const struct rmatt_event_data *red = data; - ret = para_printf(pb, "clearing attribute %s (bit %u) from all " + 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); } case AFSI_CHANGE: { struct afsi_change_event_data *aced = data; diff --combined attribute.c index d74ec928,e3bd40b5..f3f8ea7a --- a/attribute.c +++ b/attribute.c @@@ -121,70 -121,60 +121,60 @@@ enum lsatt_flags }; /** Data passed to the action function of lsatt */ - struct lsatt_action_data { - /** The result buffer. */ - struct para_buffer pb; - /** The given flags for the lsatt command. */ - unsigned flags; - }; - static int print_attribute(struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct lsatt_action_data *laad = data; + struct afs_callback_arg *aca = data; + unsigned flags = *(unsigned *)aca->query.data; struct osl_object bitnum_obj; int ret; - if (!(laad->flags & LSATT_FLAG_LONG)) - return para_printf(&laad->pb, "%s\n", name); + if (!(flags & LSATT_FLAG_LONG)) { + para_printf(&aca->pbout, "%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)); + para_printf(&aca->pbout, "%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(&aca->pbout, "%u\t%s\n", *(unsigned char*)bitnum_obj.data, name); + return 1; } - static void com_lsatt_callback(int fd, const struct osl_object *query) + static int com_lsatt_callback(struct afs_callback_arg *aca) { - struct lsatt_action_data laad = { - .flags = *(unsigned *) query->data, - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler - } - - }; + unsigned flags = *(unsigned *)aca->query.data; + int ret; struct pattern_match_data pmd = { .table = attribute_table, - .loop_col_num = ATTCOL_BITNUM, + .loop_col_num = ATTCOL_NAME, .match_col_num = ATTCOL_NAME, - .patterns = {.data = (char *)query->data + sizeof(laad.flags), - .size = query->size - sizeof(laad.flags)}, + .patterns = {.data = (char *)aca->query.data + sizeof(flags), + .size = aca->query.size - sizeof(flags)}, .pm_flags = PM_NO_PATTERN_MATCHES_EVERYTHING, - .data = &laad, + .data = aca, .action = print_attribute }; - if (laad.flags & LSATT_FLAG_SORT_BY_ID) + if (flags & LSATT_FLAG_SORT_BY_ID) - pmd.loop_col_num = ATTCOL_NAME; + pmd.loop_col_num = ATTCOL_BITNUM; - if (laad.flags & LSATT_FLAG_REVERSE) + if (flags & LSATT_FLAG_REVERSE) pmd.pm_flags |= PM_REVERSE_LOOP; - for_each_matching_row(&pmd); - if (laad.pb.offset) - pass_buffer_as_shm(fd, SBD_OUTPUT, laad.pb.buf, laad.pb.offset); - free(laad.pb.buf); + ret = for_each_matching_row(&pmd); + if (ret < 0) + goto out; + if (pmd.num_matches == 0) + ret = -E_NO_MATCH; + out: + return ret; } int com_lsatt(struct command_context *cc) { unsigned flags = 0; struct osl_object options = {.data = &flags, .size = sizeof(flags)}; - int ret, i; + int i; for (i = 1; i < cc->argc; i++) { const char *arg = cc->argv[i]; @@@ -207,13 -197,8 +197,8 @@@ continue; } } - ret = send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i, + return send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i, com_lsatt_callback, afs_cb_result_handler, cc); - if (ret < 0) - send_strerror(cc, -ret); - else if (ret == 0 && cc->argc > 1) - ret = send_sb_va(&cc->scc, SBD_ERROR_LOG, "no matches\n"); - return ret; } struct addatt_event_data { @@@ -222,21 -207,17 +207,17 @@@ }; - static void com_addatt_callback(int fd, const struct osl_object *query) + static int com_addatt_callback(struct afs_callback_arg *aca) { char *p; - int ret = 1, ret2 = 0; - struct para_buffer pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler - }; + int ret = 1; size_t len; - for (p = query->data; p < (char *)query->data + query->size; p += len + 1) { + for ( + p = aca->query.data; + p < (char *)aca->query.data + aca->query.size; + p += len + 1 + ) { struct osl_object objs[NUM_ATT_COLUMNS]; struct osl_row *row; unsigned char bitnum; @@@ -244,16 -225,12 +225,12 @@@ 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(&aca->pbout, "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(&aca->pbout, "attribute \"%s\" already exists\n", p); continue; } if (ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) /* error */ @@@ -281,15 -258,15 +258,15 @@@ goto out; aed.name = p; aed.bitnum = bitnum; - afs_event(ATTRIBUTE_ADD, &pb, &aed); + ret = afs_event(ATTRIBUTE_ADD, &aca->pbout, &aed); + if (ret < 0) + goto out; greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, (int)bitnum); } out: - if (ret < 0 && ret2 >= 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); - free(pb.buf); + if (ret < 0) + para_printf(&aca->pbout, "%s: %s\n", p, para_strerror(-ret)); + return ret; } int com_addatt(struct command_context *cc) @@@ -305,21 -282,13 +282,13 @@@ return ret; } - static void com_mvatt_callback(int fd, const struct osl_object *query) + static int com_mvatt_callback(struct afs_callback_arg *aca) { - char *old = query->data; + char *old = aca->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 = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler, - }; int ret; ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row)); @@@ -330,100 -299,67 +299,67 @@@ ret = osl(osl_update_object(attribute_table, row, ATTCOL_NAME, &obj)); out: if (ret < 0) - para_printf(&pb, "%s\n", para_strerror(-ret)); + para_printf(&aca->pbout, "cannot rename %s to %s\n", old, new); else - afs_event(ATTRIBUTE_RENAME, &pb, NULL); - if (pb.offset) - pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset); - free(pb.buf); + ret = afs_event(ATTRIBUTE_RENAME, &aca->pbout, NULL); + return ret; } int com_mvatt(struct command_context *cc) { - int ret; - if (cc->argc != 3) return -E_ATTR_SYNTAX; - ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, + return send_standard_callback_request(cc->argc - 1, cc->argv + 1, com_mvatt_callback, afs_cb_result_handler, cc); - if (ret < 0) - send_strerror(cc, -ret); - return ret; } - /** Data passed to the action handler of com_rmatt(). */ - struct remove_attribute_action_data { - /** Message buffer. */ - struct para_buffer pb; - /** Number of attributes removed. */ - int num_removed; - /** Bitwise "or" of the removed attributes. */ - uint64_t mask_of_removed_atts; - }; - static int remove_attribute(struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct remove_attribute_action_data *raad = data; + struct afs_callback_arg *aca = data; int ret; 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(&aca->pbout, "cannot remove %s\n", name); + return ret; + } + para_printf(&aca->pbout, "removing attribute %s\n", name); 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); - raad->num_removed++; - raad->mask_of_removed_atts |= (1 << red.bitnum); - afs_event(ATTRIBUTE_REMOVE, &raad->pb, &red); - return ret; + if (ret < 0) { + para_printf(&aca->pbout, "cannot remove %s\n", name); + return ret; + } + return afs_event(ATTRIBUTE_REMOVE, &aca->pbout, &red); } - static void com_rmatt_callback(int fd, const struct osl_object *query) + static int com_rmatt_callback(struct afs_callback_arg *aca) { - struct remove_attribute_action_data raad = { - .num_removed = 0, - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler, - } - }; - int ret, ret2 = 0; + int ret; struct pattern_match_data pmd = { .table = attribute_table, - .patterns = *query, + .patterns = aca->query, .loop_col_num = ATTCOL_BITNUM, .match_col_num = ATTCOL_NAME, - .data = &raad, + .data = aca, .action = remove_attribute }; ret = for_each_matching_row(&pmd); if (ret < 0) - ret2 = 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) - pass_buffer_as_shm(fd, SBD_OUTPUT, raad.pb.buf, raad.pb.offset); - free(raad.pb.buf); + goto out; + if (pmd.num_matches == 0) + ret = -E_NO_MATCH; + out: + return ret; } int com_rmatt(struct command_context *cc) { - int ret; - if (cc->argc < 2) return -E_ATTR_SYNTAX; - ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, + return send_standard_callback_request(cc->argc - 1, cc->argv + 1, com_rmatt_callback, afs_cb_result_handler, cc); - if (ret < 0) - send_strerror(cc, -ret); - return ret; } /** @@@ -499,6 -435,47 +435,47 @@@ err return ret; } + static int att_logical_or(struct osl_row *row, void *data) + { + uint64_t *att_mask = data; + struct osl_object bitnum_obj; + int ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM, &bitnum_obj); + + if (ret < 0) + return ret; + *att_mask |= 1 << *(unsigned char *)bitnum_obj.data; + return 0; + } + + /** + * Compute the attribute bit mask and check each afs info bitmap. + * + * \param aca The query field of \a aca is ignored. + * + * This iterates over all attributes in the attribute table and computes the + * logical or of 1 << b where b is the bit number of the attribute. The + * resulting bit mask is passed to aft_check_attributes() which performs the + * actual check. + * + * \return Standard. + * + * \sa \ref aft_check_attributes(). + */ + int attribute_check_callback(struct afs_callback_arg *aca) + { + int ret; + uint64_t att_mask = 0; /* bits corresponding to a attributes */ + + ret = osl_rbtree_loop(attribute_table, ATTCOL_BITNUM, &att_mask, + att_logical_or); + if (ret < 0) { + PARA_ERROR_LOG("attribute table loop failed: %s\n", + para_strerror(-ret)); + return ret; + } + return aft_check_attributes(att_mask, &aca->pbout); + } + /** * Close the attribute table. * @@@ -531,7 -508,7 +508,7 @@@ static int attribute_open(const char *d return ret; } attribute_table = NULL; - if (ret >= 0 || ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT)) + if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT)) return 1; return ret; } diff --combined audiod_command.c index 22b47cf3,294815e1..278e6ef6 --- a/audiod_command.c +++ b/audiod_command.c @@@ -42,6 -42,12 +42,12 @@@ static audiod_command_handler_t AUDIOD_ struct audiod_command { const char *name; /* Pointer to the function that handles the command. */ + /* + * Command handlers must never never close their file descriptor. A + * positive return value tells audiod that the status items have + * changed. In this case audiod will send an updated version of all + * status items to to each connected stat client. + */ audiod_command_handler_t *handler; /* One-line description. */ const char *description; @@@ -78,7 -84,7 +84,7 @@@ struct stat_client int fd; /** Bitmask of those status items the client is interested in. */ uint64_t item_mask; - /** See \ref stat_client flags. s*/ + /** See \ref stat_client flags. */ unsigned flags; /** Its entry in the list of stat clients. */ struct list_head node; @@@ -183,8 -189,7 +189,7 @@@ void stat_client_write_item(int item_nu continue; b = (sc->flags & SCF_PARSER_FRIENDLY)? &pfpb : &pb; if (!b->buf) - (void)WRITE_STATUS_ITEM(b, item_num, "%s\n", - msg? msg : ""); + WRITE_STATUS_ITEM(b, item_num, "%s\n", msg? msg : ""); ret = write(sc->fd, b->buf, b->offset); if (ret == b->offset) continue; @@@ -256,10 -261,11 +261,11 @@@ static int com_help(int fd, int argc, c { int i, ret; char *buf; - const char *dflt = "No such command. Available commands:\n"; - if (argc < 2) - return dump_commands(fd); + if (argc < 2) { + ret = dump_commands(fd); + goto out; + } FOR_EACH_COMMAND(i) { if (strcmp(audiod_cmds[i].name, argv[1])) continue; @@@ -274,12 -280,13 +280,13 @@@ ); ret = client_write(fd, buf); free(buf); - return ret; + goto out; } - ret = client_write(fd, dflt); + ret = client_write(fd, "No such command. Available commands:\n"); if (ret > 0) ret = dump_commands(fd); - return ret; + out: + return ret < 0? ret : 0; } static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv) @@@ -290,7 -297,7 +297,7 @@@ if (tl) ret = client_write(fd, tl); free(tl); - return ret; + return ret < 0? ret : 0; } static int com_stat(int fd, int argc, char **argv) @@@ -329,18 -336,19 +336,19 @@@ char *item = stat_item_values[i]; if (!((one << i) & mask)) continue; - (void)WRITE_STATUS_ITEM(&b, i, "%s\n", item? item : ""); + WRITE_STATUS_ITEM(&b, i, "%s\n", item? item : ""); } ret = client_write(fd, b.buf); if (ret >= 0) ret = stat_client_add(fd, mask, parser_friendly); free(b.buf); - return ret; + return ret < 0? ret : 0; } static int com_grab(int fd, int argc, char **argv) { - return grab_client_new(fd, argc, argv, &sched); + int ret = grab_client_new(fd, argc, argv, &sched); + return ret < 0? ret : 0; } static int com_term(__a_unused int fd, __a_unused int argc, __a_unused char **argv) @@@ -393,7 -401,7 +401,7 @@@ static int com_version(int fd, int argc msg = make_message("%s\n", version_single_line("audiod")); ret = client_write(fd, msg); free(msg); - return ret; + return ret < 0? ret : 0; } static int check_perms(uid_t uid, uid_t *whitelist) @@@ -440,7 -448,7 +448,7 @@@ int handle_connect(int accept_fd, fd_se if (ret < 0) goto out; uid = ret; - PARA_INFO_LOG("connection from user %i, buf: %s\n", ret, buf); + PARA_INFO_LOG("connection from user %i, buf: %s\n", ret, buf); ret = check_perms(uid, uid_whitelist); if (ret < 0) goto out; diff --combined blob.c index adfdb1a9,1a411823..2e0a4762 --- a/blob.c +++ b/blob.c @@@ -100,75 -100,60 +100,60 @@@ enum blob_ls_flags BLOB_LS_FLAG_SORT_BY_ID = 4, }; - /** Structure passed to the \p print_blob function. */ - struct lsblob_action_data { - /** The flags given at the command line. */ - uint32_t flags; - /** Message buffer. */ - struct para_buffer pb; - }; - static int print_blob(struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct lsblob_action_data *lbad = data; + struct afs_callback_arg *aca = data; + uint32_t flags = *(uint32_t *)aca->query.data; struct osl_object obj; uint32_t id; int ret; - if (!(lbad->flags & BLOB_LS_FLAG_LONG)) - return para_printf(&lbad->pb, "%s\n", name); + if (!(flags & BLOB_LS_FLAG_LONG)) { + para_printf(&aca->pbout, "%s\n", name); + return 0; + } ret = osl(osl_get_object(table, row, BLOBCOL_ID, &obj)); if (ret < 0) { - para_printf(&lbad->pb, "%s: %s\n", name, para_strerror(-ret)); + para_printf(&aca->pbout, "cannot list %s\n", name); return ret; } id = *(uint32_t *)obj.data; - return para_printf(&lbad->pb, "%u\t%s\n", id, name); + para_printf(&aca->pbout, "%u\t%s\n", id, name); + return 1; } - static void com_lsblob_callback(struct osl_table *table, - int fd, const struct osl_object *query) + static int com_lsblob_callback(struct osl_table *table, + struct afs_callback_arg *aca) { - struct lsblob_action_data lbad = { - .flags = *(uint32_t *)query->data, - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler, - } - }; + uint32_t flags = *(uint32_t *)aca->query.data; struct pattern_match_data pmd = { .table = table, - .patterns = {.data = (char *)query->data + sizeof(uint32_t), - .size = query->size - sizeof(uint32_t)}, + .patterns = {.data = (char *)aca->query.data + sizeof(uint32_t), + .size = aca->query.size - sizeof(uint32_t)}, .pm_flags = PM_NO_PATTERN_MATCHES_EVERYTHING | PM_SKIP_EMPTY_NAME, .match_col_num = BLOBCOL_NAME, - .data = &lbad, + .data = aca, .action = print_blob, }; int ret; - if (lbad.flags & BLOB_LS_FLAG_REVERSE) + if (flags & BLOB_LS_FLAG_REVERSE) pmd.pm_flags |= PM_REVERSE_LOOP; - if (!(lbad.flags & BLOB_LS_FLAG_SORT_BY_ID)) + if (!(flags & BLOB_LS_FLAG_SORT_BY_ID)) pmd.loop_col_num = BLOBCOL_NAME; else pmd.loop_col_num = BLOBCOL_ID; ret = for_each_matching_row(&pmd); if (ret < 0) - para_printf(&lbad.pb, "%s\n", para_strerror(-ret)); - else if (pmd.num_matches == 0 && pmd.patterns.size > 0) - para_printf(&lbad.pb, "no matches\n"); - if (lbad.pb.offset) - pass_buffer_as_shm(fd, SBD_OUTPUT, lbad.pb.buf, lbad.pb.offset); - free(lbad.pb.buf); + goto out; + if (pmd.num_matches == 0 && pmd.patterns.size > 0) + ret = -E_NO_MATCH; + out: + return ret; } - static int com_lsblob(callback_function *f, struct command_context *cc) + static int com_lsblob(afs_callback *f, struct command_context *cc) { uint32_t flags = 0; struct osl_object options = {.data = &flags, .size = sizeof(flags)}; @@@ -217,26 -202,28 +202,28 @@@ static int cat_blob(struct osl_table *t return (ret < 0)? ret : ret2; } - static void com_catblob_callback(struct osl_table *table, int fd, - const struct osl_object *query) + static int com_catblob_callback(struct osl_table *table, + struct afs_callback_arg *aca) { + int ret; struct pattern_match_data pmd = { .table = table, - .patterns = *query, + .patterns = aca->query, .loop_col_num = BLOBCOL_NAME, .match_col_num = BLOBCOL_NAME, .pm_flags = PM_SKIP_EMPTY_NAME, - .data = &fd, + .data = &aca->fd, .action = cat_blob }; - for_each_matching_row(&pmd); - if (pmd.num_matches == 0) { - char err_msg[] = "no matches\n"; - pass_buffer_as_shm(fd, SBD_OUTPUT, err_msg, sizeof(err_msg)); - } + ret = for_each_matching_row(&pmd); + if (ret < 0) + return ret; + if (pmd.num_matches == 0) + ret = -E_NO_MATCH; + return ret; } - static int com_catblob(callback_function *f, struct command_context *cc) + static int com_catblob(afs_callback *f, struct command_context *cc) { if (cc->argc < 2) return -E_BLOB_SYNTAX; @@@ -244,66 -231,46 +231,46 @@@ afs_cb_result_handler, cc); } - /** Used for removing rows from a blob table. */ - struct rmblob_data { - /** Message buffer. */ - struct para_buffer pb; - }; - static int remove_blob(struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct rmblob_data *rmbd = data; + struct afs_callback_arg *aca = data; int ret = osl(osl_del_row(table, row)); if (ret < 0) { - para_printf(&rmbd->pb, "%s: %s\n", name, para_strerror(-ret)); + para_printf(&aca->pbout, "cannot remove %s\n", name); return ret; } return 1; } - static void com_rmblob_callback(struct osl_table *table, int fd, - const struct osl_object *query) + static int com_rmblob_callback(struct osl_table *table, + struct afs_callback_arg *aca) { - int ret, ret2 = 0; - struct rmblob_data rmbd = { - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler, - } - }; + int ret; struct pattern_match_data pmd = { .table = table, - .patterns = *query, + .patterns = aca->query, .loop_col_num = BLOBCOL_NAME, .match_col_num = BLOBCOL_NAME, .pm_flags = PM_SKIP_EMPTY_NAME, - .data = &rmbd, + .data = aca, .action = remove_blob }; ret = for_each_matching_row(&pmd); - if (ret < 0) { - ret2 = para_printf(&rmbd.pb, "%s\n", para_strerror(-ret)); - if (ret2 < 0) - goto out; - } + if (ret < 0) + goto out; if (pmd.num_matches == 0) - ret2 = para_printf(&rmbd.pb, "no matches, nothing removed\n"); + ret = -E_NO_MATCH; else { - ret2 = para_printf(&rmbd.pb, "removed %d blobs\n", pmd.num_matches); - afs_event(BLOB_REMOVE, NULL, table); + para_printf(&aca->pbout, "removed %d blob(s)\n", + pmd.num_matches); - ret = afs_event(BLOB_RENAME, NULL, table); ++ ret = afs_event(BLOB_REMOVE, NULL, table); } out: - if (ret2 >= 0 && rmbd.pb.offset) - pass_buffer_as_shm(fd, SBD_OUTPUT, rmbd.pb.buf, rmbd.pb.offset); - free(rmbd.pb.buf); + return ret; } - static int com_rmblob(callback_function *f, struct command_context *cc) + static int com_rmblob(afs_callback *f, struct command_context *cc) { if (cc->argc < 2) return -E_MOOD_SYNTAX; @@@ -311,12 -278,12 +278,12 @@@ afs_cb_result_handler, cc); } - static void com_addblob_callback(struct osl_table *table, int fd, - const struct osl_object *query) + static int com_addblob_callback(struct osl_table *table, + struct afs_callback_arg *aca) { struct osl_object objs[NUM_BLOB_COLUMNS]; - char *name = query->data, *msg; - size_t name_len = strlen(name) + 1, msg_len; + char *name = aca->query.data; + size_t name_len = strlen(name) + 1; uint32_t id; unsigned num_rows; int ret; @@@ -349,7 -316,7 +316,7 @@@ goto out; id = *(uint32_t *)obj.data; obj.data = name + name_len; - obj.size = query->size - name_len; + obj.size = aca->query.size - name_len; ret = osl(osl_update_object(table, row, BLOBCOL_DEF, &obj)); goto out; } @@@ -374,19 -341,17 +341,17 @@@ objs[BLOBCOL_NAME].data = name; objs[BLOBCOL_NAME].size = name_len; objs[BLOBCOL_DEF].data = name + name_len; - objs[BLOBCOL_DEF].size = query->size - name_len; + objs[BLOBCOL_DEF].size = aca->query.size - name_len; ret = osl(osl_add_row(table, objs)); if (ret < 0) goto out; - afs_event(BLOB_ADD, NULL, table); + ret = afs_event(BLOB_ADD, NULL, table); out: if (ret < 0) - msg_len = xasprintf(&msg, "could not add %s: %s\n", name, - para_strerror(-ret)); + para_printf(&aca->pbout, "cannot add %s\n", name); else - msg_len = xasprintf(&msg, "added %s as id %u\n", name, id); - pass_buffer_as_shm(fd, SBD_OUTPUT, msg, msg_len); - free(msg); + para_printf(&aca->pbout, "added %s as id %u\n", name, id); + return ret; } /* Write input from fd to dynamically allocated buffer, but maximal 10M. */ @@@ -426,27 -391,16 +391,16 @@@ again } /* - * Read data from a file descriptor, and send it to the afs process. - * - * \param cc Contains the file descriptor to read data from. - * \param arg_obj Pointer to the arguments to \a f. - * \param f The callback function. - * \param result_handler See \ref send_callback_request. - * \param private_result_data See \ref send_callback_request. - * - * This function is used by the addblob commands that instruct para_server to - * store arbitrary data in a blob table. Input data is read and decrypted from - * the file descriptor given by \a cc. This data is concatenated with the - * buffer given by \a arg_obj, and the combined buffer is made available to the - * afs process via the callback method. See \ref send_callback_request for - * details. + * Read blob from a file descriptor and send it to afs. * - * \return Negative on errors, the return value of the underlying call to - * send_callback_request() otherwise. + * This function is called from the addblob command handlers to instruct the + * afs process to store the input in a blob table. Input is read and decrypted + * from the file descriptor given by cc and appended to arg_obj, which contains + * the name of the blob to create. The combined buffer is made available to the + * afs process via the callback method. */ static int stdin_command(struct command_context *cc, struct osl_object *arg_obj, - callback_function *f, callback_result_handler *result_handler, - void *private_result_data) + afs_callback *f) { struct osl_object query, stdin_obj; int ret; @@@ -464,12 -418,12 +418,12 @@@ memcpy((char *)query.data + arg_obj->size, stdin_obj.data, stdin_obj.size); free(stdin_obj.data); - ret = send_callback_request(f, &query, result_handler, private_result_data); + ret = send_callback_request(f, &query, afs_cb_result_handler, cc); free(query.data); return ret; } - static int com_addblob(callback_function *f, struct command_context *cc) + static int com_addblob(afs_callback *f, struct command_context *cc) { struct osl_object arg_obj; @@@ -479,60 -433,47 +433,47 @@@ return -E_BLOB_SYNTAX; arg_obj.size = strlen(cc->argv[1]) + 1; arg_obj.data = (char *)cc->argv[1]; - return stdin_command(cc, &arg_obj, f, afs_cb_result_handler, cc); + return stdin_command(cc, &arg_obj, f); } - static void com_mvblob_callback(struct osl_table *table, int fd, - const struct osl_object *query) + static int com_mvblob_callback(struct osl_table *table, + struct afs_callback_arg *aca) { - char *src = (char *) query->data; + char *src = (char *)aca->query.data; struct osl_object obj = {.data = src, .size = strlen(src) + 1}; char *dest = src + obj.size; struct osl_row *row; - struct para_buffer pb = { - .max_size = shm_get_shmmax(), - .private_data = &fd, - .max_size_handler = afs_max_size_handler - }; int ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row)); if (ret < 0) { - para_printf(&pb, "could not locate %s: %s\n", src, - para_strerror(-ret)); + para_printf(&aca->pbout, "cannot find source blob %s\n", src); goto out; } obj.data = dest; obj.size = strlen(dest) + 1; ret = osl(osl_update_object(table, row, BLOBCOL_NAME, &obj)); if (ret < 0) { - para_printf(&pb, "failed to update object %s: %s\n", dest, - para_strerror(-ret)); + para_printf(&aca->pbout, "cannot rename blob %s to %s\n", + src, dest); goto out; } - afs_event(BLOB_RENAME, NULL, table); + ret = afs_event(BLOB_RENAME, NULL, table); out: - if (pb.offset) - pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset); - free(pb.buf); + return ret; } - static int com_mvblob(callback_function *f, struct command_context *cc) + static int com_mvblob(afs_callback *f, struct command_context *cc) { - int ret; - if (cc->argc != 3) return -E_MOOD_SYNTAX; - ret = send_option_arg_callback_request(NULL, cc->argc - 1, + return send_option_arg_callback_request(NULL, cc->argc - 1, cc->argv + 1, f, afs_cb_result_handler, cc); - if (ret < 0) - send_strerror(cc, -ret); - return ret; } #define DEFINE_BLOB_COMMAND(cmd_name, table_name, cmd_prefix) \ - static void com_ ## cmd_name ## cmd_prefix ## _callback(int fd, const struct osl_object *query) \ + static int com_ ## cmd_name ## cmd_prefix ## _callback(struct afs_callback_arg *aca) \ { \ - return com_ ## cmd_name ## blob_callback(table_name ## _table, fd, query); \ + return com_ ## cmd_name ## blob_callback(table_name ## _table, aca); \ } \ int com_ ## cmd_name ## cmd_prefix(struct command_context *cc) \ { \ diff --combined command.c index c3785633,22948dbb..e8f69484 --- a/command.c +++ b/command.c @@@ -171,7 -171,7 +171,7 @@@ static int check_sender_args(int argc, const char *subcmds[] = {"add", "delete", "allow", "deny", "on", "off", NULL}; scd->sender_num = -1; - if (argc < 2) + if (argc < 3) return -E_COMMAND_SYNTAX; for (i = 0; senders[i].name; i++) if (!strcmp(senders[i].name, argv[1])) @@@ -425,9 -425,10 +425,10 @@@ static int com_version(struct command_c char *msg; size_t len; - if (cc->argc != 1) - return -E_COMMAND_SYNTAX; - len = xasprintf(&msg, "%s", version_text("server")); + if (cc->argc > 1 && strcmp(cc->argv[1], "-v") == 0) + len = xasprintf(&msg, "%s", version_text("server")); + else + len = xasprintf(&msg, "%s\n", version_single_line("server")); return send_sb(&cc->scc, msg, len, SBD_OUTPUT, false); } diff --combined error.h index 3818b110,96a0c9a3..5d5666c6 --- a/error.h +++ b/error.h @@@ -98,8 -98,6 +98,8 @@@ extern const char **para_errlist[] PARA_ERROR(FLAC_SKIP_META, "could not skip metadata"), \ PARA_ERROR(FLAC_DECODE_POS, "could not get decode position"), \ PARA_ERROR(FLAC_STREAMINFO, "could not read stream info meta block"), \ + PARA_ERROR(FLAC_REPLACE_COMMENT, "could not replace vorbis comment"), \ + PARA_ERROR(FLAC_WRITE_CHAIN, "failed to write metadata chain"), \ #define AFH_RECV_ERRORS \ @@@ -107,11 -105,9 +107,11 @@@ #define OGG_AFH_COMMON_ERRORS \ - PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \ + PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error"), \ + PARA_ERROR(STREAM_PACKETIN, "ogg stream packet-in error"), \ PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \ - PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \ + PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error"), \ + PARA_ERROR(STREAM_PAGEOUT, "ogg stream page-out error"), \ PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \ PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \ @@@ -279,6 -275,7 +279,7 @@@ PARA_ERROR(NO_AFHI, "audio format handler info required"), \ PARA_ERROR(AFT_SYNTAX, "audio file table syntax error"), \ PARA_ERROR(HASH_MISMATCH, "hash mismatch, consider re-add"), \ + PARA_ERROR(NO_MATCH, "no matches"), \ #define USER_LIST_ERRORS \ @@@ -390,6 -387,7 +391,6 @@@ #define STRING_ERRORS \ PARA_ERROR(ATOI_OVERFLOW, "value too large"), \ - PARA_ERROR(STRTOLL, "unknown strtoll error"), \ PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \ PARA_ERROR(ATOI_JUNK_AT_END, "further characters after number"), \ PARA_ERROR(SIZE_PREFIX, "bad size prefix"), \ @@@ -407,17 -405,13 +408,17 @@@ PARA_ERROR(MP3_INFO, "could not read mp3 info"), \ PARA_ERROR(HEADER_FREQ, "invalid header frequency"), \ PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \ - + PARA_ERROR(ID3_DETACH, "could not detach id3 frame"), \ + PARA_ERROR(ID3_ATTACH, "could not atttach id3 frame"), \ + PARA_ERROR(ID3_SETENCODING, "could not set id3 text encoding field"), \ + PARA_ERROR(ID3_SETSTRING, "could not set id3 string field"), \ #define AAC_AFH_ERRORS \ PARA_ERROR(STSZ, "did not find stcz atom"), \ PARA_ERROR(MP4ASC, "audio spec config error"), \ PARA_ERROR(AAC_AFH_INIT, "failed to init aac decoder"), \ - + PARA_ERROR(MP4V2, "mp4v2 library error"), \ + PARA_ERROR(NO_AUDIO_TRACK, "file contains no valid audio track"), \ #define AAC_COMMON_ERRORS \ PARA_ERROR(ESDS, "did not find esds atom"), \ @@@ -426,7 -420,6 +427,7 @@@ #define OGG_AFH_ERRORS \ PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \ + PARA_ERROR(VORBIS_COMMENTHEADER, "could not create vorbis comment header"), \ PARA_ERROR(OGG_PACKET_IN, "ogg_stream_packetin() failed"), \ PARA_ERROR(OGG_STREAM_FLUSH, "ogg_stream_flush() failed"), \ @@@ -504,6 -497,7 +505,6 @@@ PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \ PARA_ERROR(AAC_DECODE, "aac decode error"), \ - #define CHUNK_QUEUE_ERRORS \ PARA_ERROR(QUEUE, "packet queue overrun"), \ diff --combined mood.c index 94deff46,f709aa85..d29c62c2 --- a/mood.c +++ b/mood.c @@@ -410,20 -410,18 +410,18 @@@ static int check_mood(struct osl_row *m int ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def); if (ret < 0) { - para_printf(pb, "failed to get mood definition: %s\n", - para_strerror(-ret)); + para_printf(pb, "cannot read mood\n"); return ret; } if (!*mood_name) /* ignore dummy row */ goto out; - ret = para_printf(pb, "checking mood %s...\n", mood_name); - if (ret < 0) - goto out; + para_printf(pb, "checking mood %s...\n", mood_name); ret = for_each_line(FELF_READ_ONLY, mood_def.data, mood_def.size, parse_mood_line, &mlpd); if (ret < 0) - para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num, - para_strerror(-ret)); + para_printf(pb, "mood %s: error in line %u: %s\n", mood_name, + mlpd.line_num, para_strerror(-ret)); + ret = 1; /* don't fail the loop on invalid mood definitions */ out: osl_close_disk_object(&mood_def); return ret; @@@ -432,28 -430,16 +430,16 @@@ /** * Check all moods for syntax errors. * - * \param fd The afs socket. - * \param query Unused. + * \param aca Only ->pbout is used for diagnostics. + * + * \return Negative on fatal errors. Inconsistent mood definitions are not + * considered an error. */ - void mood_check_callback(int fd, __a_unused const struct osl_object *query) + int mood_check_callback(struct afs_callback_arg *aca) { - struct para_buffer pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler - }; - - int ret = para_printf(&pb, "checking moods...\n"); - if (ret < 0) - return; - osl_rbtree_loop(moods_table, BLOBCOL_ID, &pb, - check_mood); - if (pb.offset) - pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset); - free(pb.buf); + para_printf(&aca->pbout, "checking moods...\n"); + return osl(osl_rbtree_loop(moods_table, BLOBCOL_ID, &aca->pbout, + check_mood)); } static int64_t normalized_value(int64_t x, int64_t n, int64_t sum, int64_t qd) @@@ -870,9 -856,6 +856,9 @@@ static int reload_current_mood(void int ret; char *mood_name = NULL; + ret = clear_score_table(); + if (ret < 0) + return ret; if (!current_mood) return 1; PARA_NOTICE_LOG("reloading %s\n", current_mood->name? @@@ -901,6 -884,8 +887,6 @@@ int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb, void *data) { - int ret; - if (!current_mood) return 0; switch (event) { @@@ -913,6 -898,10 +899,6 @@@ case BLOB_ADD: if (data == moods_table || data == playlists_table) return 1; /* no reload necessary for these */ - ret = clear_score_table(); - if (ret < 0) - PARA_CRIT_LOG("clear score table returned %s\n", - para_strerror(-ret)); return reload_current_mood(); /* these also require reload of the score table */ case ATTRIBUTE_ADD: