X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.c;h=15b5e6b940b17b02043b38937ff8f44fca0dc04e;hp=4f774f19b846203d9000b56bb6d8e81e4a7b0f7d;hb=e8ca7526ddebc98f3023736f77fa13b65034767b;hpb=06f33ca150a15c0c3ec97e3475bc05551839071e

diff --git a/afh.c b/afh.c
index 4f774f19..15b5e6b9 100644
--- a/afh.c
+++ b/afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file afh.c Paraslash's standalone audio format handler tool. */
 
 #include <regex.h>
-#include <sys/time.h>
 
 #include "para.h"
 #include "string.h"
@@ -16,6 +15,7 @@
 #include "afh.h"
 #include "error.h"
 #include "version.h"
+#include "ggo.h"
 
 static struct afh_args_info conf;
 INIT_AFH_ERRLISTS;
@@ -57,6 +57,17 @@ static void print_chunk_table(struct afh_info *afhi)
 	}
 }
 
+__noreturn static void print_help_and_die(void)
+{
+	struct ggo_help h = DEFINE_GGO_HELP(afh);
+	int d = conf.detailed_help_given;
+	unsigned flags = d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS;
+
+	ggo_print_help(&h, flags);
+	printf("supported audio formats: %s\n", AUDIO_FORMAT_HANDLERS);
+	exit(EXIT_SUCCESS);
+}
+
 /**
  * The main function of para_afh.
  *
@@ -73,12 +84,14 @@ int main(int argc, char **argv)
 	struct afh_info afhi;
 
 	afh_cmdline_parser(argc, argv, &conf);
-	HANDLE_VERSION_FLAG("afh", conf);
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
+	version_handle_flag("afh", conf.version_given);
+	if (conf.help_given || conf.detailed_help_given)
+		print_help_and_die();
+	afh_init();
 	ret = -E_AFH_SYNTAX;
 	if (conf.inputs_num == 0)
 		goto out;
-	afh_init();
 	for (i = 0; i < conf.inputs_num; i++) {
 		int ret2;
 		ret = mmap_full_file(conf.inputs[i], O_RDONLY, &audio_file_data,