From: Junio C Hamano <gitster@pobox.com>
To: David Turner <dturner@twosigma.com>
Cc: git@vger.kernel.org, peff@peff.net, l.s.r@web.de, jrnieder@gmail.com
Subject: Re: [PATCH v2] xgethostname: handle long hostnames
Date: Mon, 17 Apr 2017 18:19:06 -0700 [thread overview]
Message-ID: <xmqq1ssqikc5.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170417161748.31231-1-dturner@twosigma.com> (David Turner's message of "Mon, 17 Apr 2017 12:17:48 -0400")
David Turner <dturner@twosigma.com> writes:
> @@ -250,14 +250,14 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
> ...
> if (!force) {
> - static char locking_host[128];
> + static char locking_host[HOST_NAME_MAX + 1];
> int should_exit;
> fp = fopen(pidfile_path, "r");
> memset(locking_host, 0, sizeof(locking_host));
I compared the result of applying this v2 directly on top of master
and applying René's "Use HOST_NAME_MAX"and then applying your v1.
This hunk is the only difference.
As this locking_host is used like so in the later part of the code:
time(NULL) - st.st_mtime <= 12 * 3600 &&
fscanf(fp, "%"SCNuMAX" %127c", &pid, locking_host) == 2 &&
/* be gentle to concurrent "gc" on remote hosts */
(strcmp(locking_host, my_host) || !kill(pid, 0) || errno == EPERM);
I suspect that turning it to HOST_NAME_MAX + 1 without tweaking
the format "%127c" gives us an inconsistent resulting code.
Of course, my_host is sized to HOST_NAME_MAX + 1 and we are
comparing it with locking_host, so perhaps we'd need to take this
version to size locking_host to also HOST_NAME_MAX + 1, and then
scan with %255c (but then shouldn't we scan with %256c instead? I
am not sure where these +1 comes from).
next prev parent reply other threads:[~2017-04-18 1:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-17 16:17 [PATCH v2] xgethostname: handle long hostnames David Turner
2017-04-18 1:19 ` Junio C Hamano [this message]
2017-04-18 1:41 ` Junio C Hamano
2017-04-18 16:07 ` René Scharfe
2017-04-18 16:17 ` Jeff King
2017-04-19 1:47 ` Junio C Hamano
2017-04-18 17:52 ` David Turner
2017-04-19 3:49 ` Junio C Hamano
2017-04-19 1:49 ` Junio C Hamano
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=xmqq1ssqikc5.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=dturner@twosigma.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=l.s.r@web.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox