strcpy(afhi->info_string, buf + AFHI_INFO_STRING_OFFSET);
}
+//#define SIZEOF_CHUNK_TABLE(afhi) (((afhi)->chunks_total + 1) * sizeof(uint32_t))
+
static unsigned sizeof_chunk_info_buf(struct audio_format_info *afhi)
{
if (!afhi)
return 0;
- return 4 * afhi->chunks_total + 20;
+ return 4 * (afhi->chunks_total + 1) + 20;
}
static void save_chunk_table(struct audio_format_info *afhi, char *buf)
{
int i;
- for (i = 0; i < afhi->chunks_total; i++)
+
+ PARA_NOTICE_LOG("%lu chunks\n", afhi->chunks_total);
+ for (i = 0; i <= afhi->chunks_total; i++)
write_u32(buf + 4 * i, afhi->chunk_table[i]);
}
static void load_chunk_table(struct audio_format_info *afhi, char *buf)
{
int i;
- for (i = 0; i < afhi->chunks_total; i++)
+ for (i = 0; i <= afhi->chunks_total; i++)
afhi->chunk_table[i] = read_u32(buf + 4 * i);
}
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);
- if (afhi->chunks_total * 4 + CHUNK_TABLE_OFFSET > obj->size)
+ if ((afhi->chunks_total + 1) * 4 + CHUNK_TABLE_OFFSET > obj->size)
return -E_BAD_DATA_SIZE;
- afhi->chunk_table = para_malloc(afhi->chunks_total * sizeof(size_t));
+ afhi->chunk_table = para_malloc((afhi->chunks_total + 1) * 4);
load_chunk_table(afhi, buf + CHUNK_TABLE_OFFSET);
return 1;
}
* \param row Pointer to a row in the audio file table.
* \param path Result pointer.
*
- * \return Positive on success, negative on errors.
+ * The result is a pointer to mmapped data. The caller must not attempt
+ * to free it.
+ *
+ * \return Standard.
*/
int get_audio_file_path_of_row(const struct osl_row *row, char **path)
{
return 1;
}
-#if 0
-/**
- * Get the chunk table of an audio file, given a row of the audio file table.
- *
- * \param row Pointer to a row of the audio file table.
- * \param afhi Result pointer.
- *
- * \return The return value of the underlying call to osl_open_disk_object().
- *
- * \sa get_afhi_of_row().
- */
-static int get_chunk_table_of_row(const struct osl_row *row, struct audio_format_info *afhi)
-{
- struct osl_object obj;
- int ret = osl_open_disk_object(audio_file_table, row, AFTCOL_CHUNKS,
- &obj);
- if (ret < 0)
- return ret;
- ret = load_chunk_info(&obj, afhi);
- osl_close_disk_object(&obj);
- return ret;
-}
-#endif
-
/* returns shmid on success */
static int save_afd(struct audio_file_data *afd)
{
- size_t path_size = strlen(afd->path) + 1;
- size_t size = sizeof(*afd) + path_size
- + 4 * afd->afhi.chunks_total;
+ size_t size = sizeof(*afd)
+ + 4 * (afd->afhi.chunks_total + 1);
PARA_NOTICE_LOG("size: %zu\n", size);
int shmid, ret = shm_new(size);
*(struct audio_file_data *)shm_afd = *afd;
buf = shm_afd;
buf += sizeof(*afd);
- strcpy(buf, afd->path);
- buf += path_size;
save_chunk_table(&afd->afhi, buf);
shm_detach(shm_afd);
return shmid;
*afd = *(struct audio_file_data *)shm_afd;
buf = shm_afd;
buf += sizeof(*afd);
- afd->path = para_strdup(buf);
- buf += strlen(buf) + 1;
- afd->afhi.chunk_table = para_malloc(afd->afhi.chunks_total * sizeof(size_t));
+ afd->afhi.chunk_table = para_malloc((afd->afhi.chunks_total + 1) * 4);
load_chunk_table(&afd->afhi, buf);
shm_detach(shm_afd);
return 1;
int ret = get_hash_of_row(aft_row, &aft_hash);
struct afsi_change_event_data aced;
struct osl_object map, chunk_table_obj;
+ char *tmp, *path;
if (ret < 0)
return ret;
- ret = get_audio_file_path_of_row(aft_row, &afd->path);
+ ret = get_audio_file_path_of_row(aft_row, &path);
if (ret < 0)
return ret;
+ strncpy(afd->path, path, sizeof(afd->path) - 1);
+ afd->path[sizeof(afd->path) - 1] = '\0';
ret = get_afsi_object_of_row(aft_row, &afsi_obj);
if (ret < 0)
return ret;
AFTCOL_CHUNKS, &chunk_table_obj);
if (ret < 0)
return ret;
- ret = mmap_full_file(afd->path, O_RDONLY, &map.data,
+ ret = mmap_full_file(path, O_RDONLY, &map.data,
&map.size, &afd->fd);
if (ret < 0)
goto err;
ret = load_chunk_info(&chunk_table_obj, &afd->afhi);
if (ret < 0)
goto err;
+ ret = get_attribute_text(&afd->afsi.attributes, " ", &tmp);
+ if (ret < 0)
+ goto err;
+ tmp[sizeof(afd->attributes_string) - 1] = '\0';
+ strcpy(afd->attributes_string, tmp); /* OK */
+ free(tmp);
aced.aft_row = aft_row;
aced.old_afsi = &afd->afsi;
* full list: list everything, including afsi, afhi, atts as clear text
*
* */
-int com_afs_ls(int fd, int argc, char * const * const argv)
+int com_ls(int fd, int argc, char * const * const argv)
{
int i, ret;
unsigned flags = 0;
}
/* TODO options: -r (recursive) */
-int com_afs_rm(int fd, int argc, char * const * const argv)
+int com_rm(int fd, int argc, char * const * const argv)
{
uint32_t flags = 0;
struct osl_object query = {.data = &flags, .size = sizeof(flags)},