kernelshark/trace-cmd: Use command line as input_file if -i is left out

If a user types "kernelshark mytrace.dat" without using te -i option,
still use the mytrace.dat as the input file for the trace, instead
of the default trace.dat.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

4 files changed, 29 insertions, 1 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 86ea2fc..1f1d459 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -676,6 +676,12 @@ void kernel_shark(int argc, char **argv)
                 }
         }
 
+        if ((argc - optind) >= 1) {
+                if (input_file)
+                        usage(basename(argv[0]));
+                input_file = argv[optind];
+        }
+
         info = g_new0(typeof(*info), 1);
         if (!info)
                 die("Unable to allocate info");
diff --git a/trace-graph-main.c b/trace-graph-main.c
index a6507ee..b373dd2 100644
--- a/trace-graph-main.c
+++ b/trace-graph-main.c
@@ -189,6 +189,12 @@ void trace_graph(int argc, char **argv)
                 }
         }
 
+        if ((argc - optind) >= 1) {
+                if (input_file)
+                        usage(basename(argv[0]));
+                input_file = argv[optind];
+        }
+
         if (!input_file) {
                 ret = stat(default_input_file, &st);
                 if (ret >= 0)
diff --git a/trace-read.c b/trace-read.c
index 76f5b7b..ca6661e 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -51,7 +51,8 @@ static struct event_filter *event_filter_out;
 
 static unsigned int page_size;
 static int input_fd;
-const char *input_file = "trace.dat";
+const char *default_input_file = "trace.dat";
+const char *input_file;
 
 static int filter_cpu = -1;
 
@@ -632,6 +633,15 @@ void trace_report (int argc, char **argv)
                 }
         }
 
+        if ((argc - optind) >= 2) {
+                if (input_file)
+                        usage(argv);
+                input_file = argv[optind + 1];
+        }
+
+        if (!input_file)
+                input_file = default_input_file;
+
         handle = read_trace_header();
         if (!handle)
                 die("error reading header");
diff --git a/trace-view-main.c b/trace-view-main.c
index d298e68..52678ce 100644
--- a/trace-view-main.c
+++ b/trace-view-main.c
@@ -212,6 +212,12 @@ void trace_view(int argc, char **argv)
                 }
         }
 
+        if ((argc - optind) >= 1) {
+                if (input_file)
+                        usage(basename(argv[0]));
+                input_file = argv[optind];
+        }
+
         if (!input_file) {
                 ret = stat(default_input_file, &st);
                 if (ret >= 0)