Re: [PATCH 1/5] add an extra level of indirection to main()
- From
Jeff King <peff@peff.net>
- Date
- Jul 1, 2016, 08:19 UTC
- Message-ID
- <20160701081919.GA21076@sigill.intra.peff.net>
- In-Reply-To
- <alpine.DEB.2.20.1607010953440.12947@virtualbox>
On Fri, Jul 01, 2016 at 10:04:44AM +0200, Johannes Schindelin wrote:
Show 14 quoted lines
> Hi Peff, > > On Fri, 1 Jul 2016, Jeff King wrote: > > > I waffled between the two mechanisms. Opinions welcome. > > I am happy you took the cmd_main() approach: we do have to play some > tricks on Windows, in particular in some upcoming changes that support > building with MS Visual C++ (we want to ensure that `argv` is in UTF-8, > which means that we actually have to use the UTF-16 versions and convert > them manually lest argv has the current Windows encoding of strings). > Which means that we still have to use that mingw_startup() trick you > mentioned, and which would have interfered had you chosen a similar > method.
I actually wondered if it would make sense to get rid of the mingw_main() macro, and do it here as just:
#ifdef MINGW
mingw_startup();
#endifor something. But I didn't look deeply at it, and anyway I am afraid to touch anything in that area because I can't even compile-test it.
Show 17 quoted lines
> > diff --git a/common-main.c b/common-main.c
> > new file mode 100644
> > index 0000000..2b96bbf
> > --- /dev/null
> > +++ b/common-main.c
> > @@ -0,0 +1,12 @@
> > +#include "git-compat-util.h"
> > +
> > +int main(int argc, char **av)
> > +{
> > + /*
> > + * This const trickery is explained in
> > + * 84d32bf7678259c08406571cd6ce4b7a6724dcba
>
> This commit message says that mingw_main() is declared with char **argv,
> and that is the reason why we have to convert. Maybe spell that out here,
> and then in a subsequent commit, we can fix the mingw_main() declaration?The description was sufficiently long that I didn't want to try repeating it, and opted for a reference instead. If you're planning to fix mingw_main(), I'd be happy to do that as a preparatory patch, and then just skip this trickery entirely. :)
-Peff