Improve memory mapping.

[paraslash.git] / afh.c

diff --git a/afh.c b/afh.c
index 86f34ace67e0efcba11fb9ddfe1a2f23ca2416b7..2d92d04d0e7b3ad3907410c556c0c447576bd4d6 100644 (file)
--- a/afh.c
+++ b/afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -60,22 +60,30 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi)
        int ret;
        struct timeval stream_start;
        long unsigned i, first_chunk, last_chunk;
-       char *buf;
+       const char *buf;
        size_t size;
 
 
-       if (conf.begin_chunk_arg < 0)
-               return -ERRNO_TO_PARA_ERROR(EINVAL);
-       first_chunk = conf.begin_chunk_arg;
-
-       if (conf.end_chunk_given) {
-               if (conf.end_chunk_arg < 0)
+       if (conf.begin_chunk_arg < 0) {
+               if (-conf.begin_chunk_arg > afhi->chunks_total)
                        return -ERRNO_TO_PARA_ERROR(EINVAL);
-               if (conf.end_chunk_arg >= afhi->chunks_total)
-                       return -ERRNO_TO_PARA_ERROR(EINVAL);
-               last_chunk = conf.end_chunk_arg;
+               first_chunk = afhi->chunks_total + conf.begin_chunk_arg;
+       } else
+               first_chunk = conf.begin_chunk_arg;
+       if (conf.end_chunk_given) {
+               if (conf.end_chunk_arg < 0) {
+                       if (-conf.end_chunk_arg > afhi->chunks_total)
+                               return -ERRNO_TO_PARA_ERROR(EINVAL);
+                       last_chunk = afhi->chunks_total + conf.end_chunk_arg;
+               } else {
+                       if (conf.end_chunk_arg >= afhi->chunks_total)
+                               return -ERRNO_TO_PARA_ERROR(EINVAL);
+                       last_chunk = conf.end_chunk_arg;
+               }
        } else
                last_chunk = afhi->chunks_total - 1;
+       if (first_chunk >= last_chunk)
+               return -ERRNO_TO_PARA_ERROR(EINVAL);
        if (!afhi->chunks_total)
                return 1;
        afh_get_header(afhi, audio_file_data, &buf, &size);
@@ -104,6 +112,8 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi)
                                        return ret;
                        }
                }
+               if (!size)
+                       continue;
                PARA_INFO_LOG("writing chunk %lu\n", i);
                ret = write_all(STDOUT_FILENO, buf, &size);
                if (ret < 0)
@@ -112,9 +122,17 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi)
        return 1;
 }
 
+/**
+ * The main function of para_afh.
+ *
+ * \param argc Usual argument count.
+ * \param argv Usual argument vector.
+ *
+ * \return \p EXIT_FAILURE or \p EXIT_SUCCESS.
+ */
 int main(int argc, char **argv)
 {
-       int ret, audio_format_num;
+       int i, ret, audio_format_num, fd;
        void *audio_file_data;
        size_t audio_file_size;
        struct afh_info afhi;
@@ -122,24 +140,36 @@ int main(int argc, char **argv)
        afh_cmdline_parser(argc, argv, &conf);
        HANDLE_VERSION_FLAG("afh", conf);
        ret = -E_AFH_SYNTAX;
-       if (conf.inputs_num != 1)
+       if (conf.inputs_num == 0)
                goto out;
-       afh_init();
-       ret = mmap_full_file(conf.inputs[0], O_RDONLY, &audio_file_data,
-               &audio_file_size, NULL);
-       if (ret < 0)
-               goto out;
-       ret = compute_afhi(conf.inputs[0], audio_file_data, audio_file_size, &afhi);
-       if (ret < 0)
+       if (conf.stream_given && conf.inputs_num != 1)
                goto out;
-       audio_format_num = ret;
-       if (conf.stream_given)
-               ret = cat_file(audio_file_data, &afhi);
-       else {
-               print_info(audio_format_num, &afhi);
-               if (conf.chunk_table_given)
-                       print_chunk_table(&afhi);
-               ret = 1;
+       afh_init();
+       for (i = 0; i < conf.inputs_num; i++) {
+               int ret2;
+               ret = mmap_full_file(conf.inputs[i], O_RDONLY, &audio_file_data,
+                       &audio_file_size, &fd);
+               if (ret < 0)
+                       goto out;
+               ret = compute_afhi(conf.inputs[i], audio_file_data, audio_file_size,
+                       fd, &afhi);
+               if (ret < 0)
+                       goto out;
+               audio_format_num = ret;
+               if (conf.stream_given)
+                       ret = cat_file(audio_file_data, &afhi);
+               else {
+                       printf("File %d: %s\n", i + 1, conf.inputs[i]);
+                       print_info(audio_format_num, &afhi);
+                       if (conf.chunk_table_given)
+                               print_chunk_table(&afhi);
+                       printf("\n");
+               }
+               ret2 = para_munmap(audio_file_data, audio_file_size);
+               if (ret2 < 0 && ret >= 0)
+                       ret = ret2;
+               if (ret < 0)
+                       break;
        }
 out:
        if (ret < 0)