Prettify usage()

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 0ec30162a0dcc16d56216a38d93ba08c3ae62ede..ce7664a834d7ddeb1ce01ac3677e7635e1ad7d26 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -72,18 +72,18 @@ static void usage(FILE *fp)
        fprintf(fp, "BabelTrace Trace Converter %u.%u\n\n",
                BABELTRACE_VERSION_MAJOR,
                BABELTRACE_VERSION_MINOR);
-       fprintf(fp, "usage : babeltrace [OPTIONS] INPUT OUTPUT\n");
+       fprintf(fp, "usage : babeltrace [OPTIONS] INPUT <OUTPUT>\n");
        fprintf(fp, "\n");
-       fprintf(fp, "  INPUT               Input trace path\n");
-       fprintf(fp, "  OUTPUT              Output trace path\n");
+       fprintf(fp, "  INPUT                          Input trace path\n");
+       fprintf(fp, "  OUTPUT                         Output trace path (default: stdout)\n");
        fprintf(fp, "\n");
-       fprintf(fp, "  -i, --input-format  Input trace path\n");
-       fprintf(fp, "  -o, --output-format Input trace path\n");
+       fprintf(fp, "  -i, --input-format FORMAT      Input trace format (default: ctf)\n");
+       fprintf(fp, "  -o, --output-format FORMAT     Output trace format (default: text)\n");
        fprintf(fp, "\n");
-       fprintf(fp, "  -h, --help          This help message\n");
-       fprintf(fp, "  -l, --list          List available formats\n");
-       fprintf(fp, "  -v, --verbose       Verbose mode\n");
-       fprintf(fp, "  -d, --debug         Debug mode\n");
+       fprintf(fp, "  -h, --help                     This help message\n");
+       fprintf(fp, "  -l, --list                     List available formats\n");
+       fprintf(fp, "  -v, --verbose                  Verbose mode\n");
+       fprintf(fp, "  -d, --debug                    Debug mode\n");
        list_formats(fp);
        fprintf(fp, "\n");
 }
@@ -133,10 +133,6 @@ static int parse_options(int argc, char **argv)
                goto end;
        }
        opt_output_path = poptGetArg(pc);
-       if (!opt_output_path) {
-               ret = -EINVAL;
-               goto end;
-       }
 end:
        if (pc) {
                poptFreeContext(pc);
@@ -168,19 +164,19 @@ int main(int argc, char **argv)
 
        printf_verbose("Converting from file: %s\n", opt_input_path);
        printf_verbose("Converting from format: %s\n",
-               opt_input_format ? : "<autodetect>");
-       printf_verbose("Converting to file: %s\n", opt_output_path);
+               opt_input_format ? : "ctf <default>");
+       printf_verbose("Converting to file: %s\n",
+               opt_output_path ? : "<stdout>");
        printf_verbose("Converting to format: %s\n",
-               opt_output_format ? : "ctf");
+               opt_output_format ? : "text <default>");
 
-       if (!opt_input_format) {
-               fprintf(stdout, "Error: input format autodetection not implemented yet.\n\n");
-               usage(stdout);
-               exit(EXIT_FAILURE);
-       }
+       if (!opt_input_format)
+               opt_input_format = "ctf";
+       if (!opt_output_format)
+               opt_output_format = "text";
        fmt_read = bt_lookup_format(g_quark_from_static_string(opt_input_format));
        if (!fmt_read) {
-               fprintf(stdout, "Error: format \"%s\" is not supported.\n\n",
+               fprintf(stdout, "[error] Format \"%s\" is not supported.\n\n",
                        opt_input_format);
                exit(EXIT_FAILURE);
        }
@@ -188,14 +184,14 @@ int main(int argc, char **argv)
                opt_output_format = "ctf";
        fmt_write = bt_lookup_format(g_quark_from_static_string(opt_output_format));
        if (!fmt_write) {
-               fprintf(stdout, "Error: format \"%s\" is not supported.\n\n",
+               fprintf(stdout, "[error] format \"%s\" is not supported.\n\n",
                        opt_output_format);
                exit(EXIT_FAILURE);
        }
 
        td_read = fmt_read->open_trace(opt_input_path, O_RDONLY);
        if (!td_read) {
-               fprintf(stdout, "Error opening trace \"%s\" for reading.\n\n",
+               fprintf(stdout, "[error] opening trace \"%s\" for reading.\n\n",
                        opt_input_path);
                goto error_td_read;
        }
@@ -203,16 +199,16 @@ int main(int argc, char **argv)
        td_write = fmt_write->open_trace(opt_output_path, O_WRONLY);
        if (!td_write) {
                fprintf(stdout, "Error opening trace \"%s\" for writing.\n\n",
-                       opt_output_path);
+                       opt_output_path ? : "<none>");
                goto error_td_write;
        }
-#if 0
-       ret = print_trace(fmt_write, td_write, fmt_read, td_read);
+
+       ret = convert_trace(td_write, td_read);
        if (ret) {
                fprintf(stdout, "Error printing trace.\n\n");
                goto error_copy_trace;
        }
-#endif //0
+
        fmt_write->close_trace(td_write);
        fmt_read->close_trace(td_read);
        exit(EXIT_SUCCESS);