From e88986c2014599e820d41ff7e644b11c08b3050f Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 2 Jul 2009 17:58:20 +0200
Subject: [PATCH] --- yaml --- r: 155200 b: refs/heads/master c:
 5a4b181721375700124513cdd9f97056e1c66675 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/tools/perf/util/parse-options.c | 3 ++-
 trunk/tools/perf/util/parse-options.h | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 635cd962f50f..e2da3151beb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14f4654cbd531d48651e005cf05907c14bddb193
+refs/heads/master: 5a4b181721375700124513cdd9f97056e1c66675
diff --git a/trunk/tools/perf/util/parse-options.c b/trunk/tools/perf/util/parse-options.c
index 9a897b7cce79..1bf67190c820 100644
--- a/trunk/tools/perf/util/parse-options.c
+++ b/trunk/tools/perf/util/parse-options.c
@@ -20,7 +20,8 @@ static int get_arg(struct parse_opt_ctx_t *p, const struct option *opt,
 	if (p->opt) {
 		*arg = p->opt;
 		p->opt = NULL;
-	} else if (p->argc == 1 && (opt->flags & PARSE_OPT_LASTARG_DEFAULT)) {
+	} else if ((opt->flags & PARSE_OPT_LASTARG_DEFAULT) && (p->argc == 1 ||
+		    **(p->argv + 1) == '-')) {
 		*arg = (const char *)opt->defval;
 	} else if (p->argc > 1) {
 		p->argc--;
diff --git a/trunk/tools/perf/util/parse-options.h b/trunk/tools/perf/util/parse-options.h
index 15c8aba9c62e..8aa3464c7090 100644
--- a/trunk/tools/perf/util/parse-options.h
+++ b/trunk/tools/perf/util/parse-options.h
@@ -104,6 +104,8 @@ struct option {
 	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), .argh = "time", .help = (h), .callback = parse_opt_approxidate_cb }
 #define OPT_CALLBACK(s, l, v, a, h, f) \
 	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f) }
+#define OPT_CALLBACK_DEFAULT(s, l, v, a, h, f, d) \
+	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f), .defval = (intptr_t)d, .flags = PARSE_OPT_LASTARG_DEFAULT }
 
 /* parse_options() will filter out the processed options and leave the
  * non-option argments in argv[].