Use the generic call to move_pos_slow

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 22743c96878a1072585315e3d4eb0fb571d52a83..2870df8fdbdb03216b18c15c2f0e3bd2644b84ce 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -97,8 +97,10 @@ static void usage(FILE *fp)
        fprintf(fp, "                                 (or set BABELTRACE_DEBUG environment variable)\n");
        fprintf(fp, "  -n, --names name1<,name2,...>  Print field names.\n");
        fprintf(fp, "                                 Available field names:\n");
-       fprintf(fp, "                                     payload OR args OR arg\n");
-       fprintf(fp, "                                     all, scope, header, context OR ctx\n");
+       fprintf(fp, "                                     (payload OR args OR arg)\n");
+       fprintf(fp, "                                     all, scope, header, (context OR ctx)\n");
+       fprintf(fp, "                                     trace, trace:domain, trace:procname, trace:vpid,\n");
+       fprintf(fp, "                                     loglevel.\n");
        fprintf(fp, "                                        (payload active by default)\n");
        list_formats(fp);
        fprintf(fp, "\n");
@@ -125,6 +127,16 @@ static int get_names_args(poptContext *pc)
                        opt_header_field_names = 1;
                else if (!strcmp(str, "payload") || !strcmp(str, "args") || !strcmp(str, "arg"))
                        opt_payload_field_names = 1;
+               else if (!strcmp(str, "trace"))
+                       opt_trace_name = 1;
+               else if (!strcmp(str, "trace:domain"))
+                       opt_trace_domain = 1;
+               else if (!strcmp(str, "trace:procname"))
+                       opt_trace_procname = 1;
+               else if (!strcmp(str, "trace:vpid"))
+                       opt_trace_vpid = 1;
+               else if (!strcmp(str, "loglevel"))
+                       opt_loglevel = 1;
                else {
                        fprintf(stdout, "[error] unknown field name type %s\n", str);
                        return -EINVAL;
@@ -251,7 +263,8 @@ static int traverse_dir(const char *fpath, const struct stat *sb,
        } else {
                close(fd);
                close(dirfd);
-               td_read = fmt_read->open_trace(fpath, O_RDONLY, ctf_move_pos_slow,
+               td_read = fmt_read->open_trace(opt_input_path,
+                               fpath, O_RDONLY, ctf_move_pos_slow,
                                NULL);
                if (!td_read) {
                        fprintf(stdout, "Error opening trace \"%s\" "
@@ -330,7 +343,7 @@ int main(int argc, char **argv)
                return 0;
        }
 
-       td_write = fmt_write->open_trace(opt_output_path, O_RDWR, NULL, NULL);
+       td_write = fmt_write->open_trace(NULL, opt_output_path, O_RDWR, NULL, NULL);
        if (!td_write) {
                fprintf(stdout, "Error opening trace \"%s\" for writing.\n\n",
                        opt_output_path ? : "<none>");