On Wed, Oct 01, 2008 at 02:56:06PM +0000, Shawn O. Pearce wrote:
> Pierre Habouzit <madcoder@xxxxxxxxxx> wrote:
> > @@ -347,38 +349,32 @@ int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {
> >
> > int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
> > {
> > + const char *inpath = NULL;
> > + struct option options[] = {
> > + OPT_BOOLEAN(0, "log", &merge_summary, "populate log with the shortlog"),
> > + OPT_BOOLEAN(0, "summary", &merge_summary, "alias for --log"),
> > + OPT_STRING('F', "file", &inpath, "file", "file to read from"),
> > + OPT_END()
>
>
> > + argc = parse_options(argc, argv, options, fmt_merge_msg_usage, 0);
> > + if (argc > 0)
> > + usage_with_options(fmt_merge_msg_usage, options);
> > +
> > + if (!inpath || strcmp(inpath, "-"))
> > + in = stdin;
> > + else {
> > + fclose(in);
> > + in = fopen(argv[2], "r");
> > + if (!in)
> > + die("cannot open %s", argv[2]);
>
> Really argv[2]? Shouldn't that be inpath?
oh crap you're right. I'll submit and updated series soon... *sigh*
--
·O· Pierre Habouzit
··O madcoder@xxxxxxxxxx
OOO http://www.madism.org
Attachment:
pgpsUvoZrgxRp.pgp
Description: PGP signature
