From: Andre Przywara <osp-s5aTT1PPrfyzQB+pC5nmwQ@public.gmane.org>
To: David Gibson
<david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org>,
Jon Loeliger <jdl-CYoMK+44s/E@public.gmane.org>
Cc: devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH 3/3] allow a second parameter to be the output file name
Date: Tue, 26 May 2015 00:11:23 +0100 [thread overview]
Message-ID: <1432595483-26153-4-git-send-email-osp@andrep.de> (raw)
In-Reply-To: <1432595483-26153-1-git-send-email-osp-s5aTT1PPrfyzQB+pC5nmwQ@public.gmane.org>
If there is more than one file name specified on the command line,
assume it is the output file name.
This allows to use a more intuitive cp-style command line syntax,
which (together with the input type guessing) allows something like:
$ dtc input.dts output.dtb
(or the other way round) to cover the most common usage scenarios.
Signed-off-by: Andre Przywara <osp-s5aTT1PPrfyzQB+pC5nmwQ@public.gmane.org>
---
dtc.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/dtc.c b/dtc.c
index ba34a06..714d39e 100644
--- a/dtc.c
+++ b/dtc.c
@@ -159,7 +159,7 @@ int main(int argc, char *argv[])
struct boot_info *bi;
const char *inform = NULL;
const char *outform = NULL;
- const char *outname = "-";
+ const char *outname = NULL;
const char *depname = NULL;
bool force = false, sort = false;
const char *arg;
@@ -244,9 +244,15 @@ int main(int argc, char *argv[])
}
}
- if (argc > (optind+1))
+ if (argc > (optind + 2))
usage("missing files");
- else if (argc < (optind+1))
+
+ if (argc > (optind + 1) && outname == NULL)
+ outname = argv[optind + 1];
+ if (outname == NULL)
+ outname = "-";
+
+ if (argc < (optind + 1))
arg = "-";
else
arg = argv[optind];
--
1.8.4
next prev parent reply other threads:[~2015-05-25 23:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-25 23:11 [PATCH 0/3] dtc: simplify command line invocation Andre Przywara
[not found] ` <1432595483-26153-1-git-send-email-osp-s5aTT1PPrfyzQB+pC5nmwQ@public.gmane.org>
2015-05-25 23:11 ` [PATCH 1/3] guess input file format based on file content or file name Andre Przywara
[not found] ` <1432595483-26153-2-git-send-email-osp-s5aTT1PPrfyzQB+pC5nmwQ@public.gmane.org>
2015-06-30 5:07 ` David Gibson
[not found] ` <20150630050749.GJ26353-1s0os16eZneny3qCrzbmXA@public.gmane.org>
2015-06-30 23:21 ` Andre Przywara
2015-05-25 23:11 ` [PATCH 2/3] guess output file format Andre Przywara
2015-05-25 23:11 ` Andre Przywara [this message]
[not found] ` <1432595483-26153-4-git-send-email-osp-s5aTT1PPrfyzQB+pC5nmwQ@public.gmane.org>
2015-06-30 5:11 ` [PATCH 3/3] allow a second parameter to be the output file name David Gibson
[not found] ` <20150630051119.GK26353-1s0os16eZneny3qCrzbmXA@public.gmane.org>
2015-06-30 23:15 ` Andre Przywara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1432595483-26153-4-git-send-email-osp@andrep.de \
--to=osp-s5att1pprfyzqb+pc5nmwq@public.gmane.org \
--cc=david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org \
--cc=devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=jdl-CYoMK+44s/E@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).