X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=102856bafd6ecf319f50d696149dc800dd1fab5a;hp=acf751566c61d82e23cc34565c1189f2db147917;hb=9bf6dc2eaf7b3252fb7db73ed8ead6f568bbb0ec;hpb=e70beecd3fa6378aadf8773660741873023befcf diff --git a/aft.c b/aft.c index acf75156..102856ba 100644 --- a/aft.c +++ b/aft.c @@ -1439,18 +1439,26 @@ int com_ls(struct command_context *cc) 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': @@ -1485,10 +1493,12 @@ int com_ls(struct command_context *cc) 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; @@ -1563,16 +1573,16 @@ static struct osl_row *find_hash_sister(unsigned char *hash) /** 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), }; @@ -1593,27 +1603,23 @@ static void save_add_callback_buffer(unsigned char *hash, const char *path, 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; } @@ -1757,8 +1763,8 @@ static void com_add_callback(int fd, const struct osl_object *query) 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; @@ -1811,7 +1817,7 @@ static void com_add_callback(int fd, const struct osl_object *query) goto out; } 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; @@ -1876,8 +1882,10 @@ static int add_one_audio_file(const char *path, void *private_data) unsigned char hash[HASH_SIZE]; ret = guess_audio_format(path); - if (ret < 0 && !(pad->flags & ADD_FLAG_ALL)) + if (ret < 0 && !(pad->flags & ADD_FLAG_ALL)) { + ret = 0; goto out_free; + } query.data = (char *)path; query.size = strlen(path) + 1; ret = send_callback_request(path_brother_callback, &query, @@ -2546,8 +2554,10 @@ static void com_setatt_callback(int fd, const struct osl_object *query) break; p[len - 1] = '\0'; ret = get_attribute_bitnum_by_name(p, &bitnum); - if (ret < 0) + if (ret < 0) { + para_printf(&cad.pb, "attribute not found: %s\n", p); goto out; + } if (c == '+') cad.add_mask |= (1UL << bitnum); else @@ -2557,7 +2567,8 @@ static void com_setatt_callback(int fd, const struct osl_object *query) if (!cad.add_mask && !cad.del_mask) goto out; pmd.patterns.data = p; - assert(p < (char *)query->data + query->size); + if (p >= (char *)query->data + query->size) + goto out; pmd.patterns.size = (char *)query->data + query->size - p; ret = for_each_matching_row(&pmd); if (ret < 0) @@ -2718,9 +2729,9 @@ static int aft_open(const char *dir) PARA_INFO_LOG("audio file table contains %d files\n", num); return ret; } - PARA_INFO_LOG("failed to open audio file table\n"); + PARA_NOTICE_LOG("failed to open audio file table\n"); audio_file_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; }