From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: "dmh\@ucar.edu" <dmh@ucar.edu>, git@vger.kernel.org
Subject: Re: [PATCH 0/5] consistent setup code for external commands
Date: Wed, 06 Jul 2016 08:17:26 -0700 [thread overview]
Message-ID: <xmqq60sivlrt.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160701223912.GB32545@sigill.intra.peff.net> (Jeff King's message of "Fri, 1 Jul 2016 18:39:12 -0400")
Jeff King <peff@peff.net> writes:
> On Fri, Jul 01, 2016 at 03:19:37PM -0700, Junio C Hamano wrote:
>
>> > Here they are:
>> >
>> > [1/5]: add an extra level of indirection to main()
>> > [2/5]: common-main: call git_extract_argv0_path()
>> > [3/5]: common-main: call sanitize_stdfds()
>> > [4/5]: common-main: call restore_sigpipe_to_default()
>> > [5/5]: common-main: call git_setup_gettext()
>>
>> As this is also a fix to maint-2.8 track, I tweaked them to ensure
>> that they apply there, and queued the result as jk/common-main. I
>> double checked the result by comparing the result of applying these
>> five patches directly on top of master, and the result of merging
>> that jk/common-main (based on maint-2.8) into master, and they seem
>> to match.
>
> Thanks, this obviously is a regression in v2.8, but I didn't even think
> about that and just built it on top of master.
>
> I think the cleanup that Dscho suggested elsewhere in the thread is a
> good idea on top, but that can also just wait and come separately.
OK.
I think that amounts to the following single patch, which I cherry
picked from the topic in Dscho's repository he mentioned earlier.
With this applied on top of jk/common-main-2.8, when I merge it to
his b764cdf, the result matches his common-main topic, so we three
are on the same page, I'd think, and the result can be fed to the
2.8.x maintenance track.
-- >8 --
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 1 Jul 2016 15:01:28 +0200
Subject: [PATCH] mingw: declare main()'s argv as const
In 84d32bf (sparse: Fix mingw_main() argument number/type errors,
2013-04-27), we addressed problems identified by the 'sparse' tool where
argv was declared inconsistently. The way we addressed it was by casting
from the non-const version to the const-version.
This patch is long overdue, fixing compat/mingw.h's declaration to
make the "argv" parameter const. This also allows us to lose the
"const" trickery introduced earlier to common-main.c:main().
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
common-main.c | 8 +-------
compat/mingw.h | 2 +-
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/common-main.c b/common-main.c
index 3be5ad1..44a29e8 100644
--- a/common-main.c
+++ b/common-main.c
@@ -22,15 +22,9 @@ static void restore_sigpipe_to_default(void)
signal(SIGPIPE, SIG_DFL);
}
-int main(int argc, char **av)
+int main(int argc, const char **argv)
{
/*
- * This const trickery is explained in
- * 84d32bf7678259c08406571cd6ce4b7a6724dcba
- */
- const char **argv = (const char **)av;
-
- /*
* Always open file descriptors 0/1/2 to avoid clobbering files
* in die(). It also avoids messing up when the pipes are dup'ed
* onto stdin/stdout/stderr in the child processes we spawn.
diff --git a/compat/mingw.h b/compat/mingw.h
index 69bb43d..1ac9086 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -535,7 +535,7 @@ extern CRITICAL_SECTION pinfo_cs;
void mingw_startup();
#define main(c,v) dummy_decl_mingw_main(); \
static int mingw_main(c,v); \
-int main(int argc, char **argv) \
+int main(int argc, const char **argv) \
{ \
mingw_startup(); \
return mingw_main(__argc, (void *)__argv); \
--
2.9.0-457-ge524329
next prev parent reply other threads:[~2016-07-06 15:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-30 21:24 git-credentials-store.exe crash dmh
2016-07-01 4:07 ` Jeff King
2016-07-01 5:55 ` [PATCH 0/5] consistent setup code for external commands Jeff King
2016-07-01 5:58 ` [PATCH 1/5] add an extra level of indirection to main() Jeff King
2016-07-01 8:04 ` Johannes Schindelin
2016-07-01 8:19 ` Jeff King
2016-07-01 13:39 ` Johannes Schindelin
2016-07-01 22:38 ` Jeff King
2016-07-02 6:52 ` Johannes Schindelin
2016-07-01 6:04 ` [PATCH 2/5] common-main: call git_extract_argv0_path() Jeff King
2016-07-01 8:05 ` Johannes Schindelin
2016-07-01 6:06 ` [PATCH 3/5] common-main: call sanitize_stdfds() Jeff King
2016-07-01 6:06 ` [PATCH 4/5] common-main: call restore_sigpipe_to_default() Jeff King
2016-07-01 6:07 ` [PATCH 5/5] common-main: call git_setup_gettext() Jeff King
2016-07-01 7:45 ` [PATCH 0/5] consistent setup code for external commands Johannes Schindelin
2016-07-01 22:19 ` Junio C Hamano
2016-07-01 22:39 ` Jeff King
2016-07-06 15:17 ` Junio C Hamano [this message]
2016-07-06 15:36 ` Johannes Schindelin
2016-07-01 7:38 ` git-credentials-store.exe crash Johannes Schindelin
2016-07-01 7:43 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq60sivlrt.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=dmh@ucar.edu \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).