para_afh: Accept more than one input file in info mode.

diff --git a/afh.c b/afh.c
index c82d17fd19acc5c1484d883b4021a59d4718c599..24c2bc67dcd81addb013f2f00a87a64494f5933a 100644 (file)
--- a/afh.c
+++ b/afh.c
@@ -132,7 +132,7 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi)
  */
 int main(int argc, char **argv)
 {
  */
 int main(int argc, char **argv)
 {

-       int ret, audio_format_num, fd;
+       int i, ret, audio_format_num, fd;

        void *audio_file_data;
        size_t audio_file_size;
        struct afh_info afhi;
        void *audio_file_data;
        size_t audio_file_size;
        struct afh_info afhi;


@@ -140,25 +140,36 @@ int main(int argc, char **argv)
        afh_cmdline_parser(argc, argv, &conf);
        HANDLE_VERSION_FLAG("afh", conf);
        ret = -E_AFH_SYNTAX;
        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;
                goto out;

-       afh_init();
-       ret = mmap_full_file(conf.inputs[0], O_RDONLY, &audio_file_data,
-               &audio_file_size, &fd);
-       if (ret < 0)
+       if (conf.stream_given && conf.inputs_num != 1)

                goto out;
                goto out;

-       ret = compute_afhi(conf.inputs[0], 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 {
-               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)
        }
 out:
        if (ret < 0)