From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git List <git@vger.kernel.org>, Jeff King <peff@peff.net>
Subject: Re: [PATCH] apply: replace mksnpath() with a mkpathdup() call
Date: Thu, 04 Apr 2024 14:29:42 -0700 [thread overview]
Message-ID: <xmqqo7aozuih.fsf@gitster.g> (raw)
In-Reply-To: <df774306-f29b-4a75-a282-59db89812b9a@web.de> ("René Scharfe"'s message of "Thu, 4 Apr 2024 23:08:38 +0200")
René Scharfe <l.s.r@web.de> writes:
> Support paths longer than PATH_MAX in create_one_file() (which is not a
> hard limit e.g. on Linux) by calling mkpathdup() instead of mksnpath().
> Remove the latter, as it becomes unused by this change. Resist the
> temptation of using the more convenient mkpath() to avoid introducing a
> dependency on a static variable deep inside the apply machinery.
>
> Suggested-by: Jeff King <peff@peff.net>
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
> apply.c | 13 +++++++++----
> path.c | 17 -----------------
> path.h | 6 ------
> 3 files changed, 9 insertions(+), 27 deletions(-)
As a patch to "apply", this is perfectly good, but in the larger
picture, the value of the patch is in getting rid of mksnpath, isn't
it?
I am tempted to
- queue it on rs/retire-mksnpath topic branch
- remove the mention of mksnpath in contrib/vscode/init.sh (I think
it is registering non-words to spell checker, so having an extra
entry there would not hurt, but it would more likely to be a typo
of mkpath than before this patch retires mksnpath function).
- ask you to come up with a title with more focus on mksnpath than
on apply.
Thanks.
> diff --git a/apply.c b/apply.c
> index 432837a674..4793b05f3d 100644
> --- a/apply.c
> +++ b/apply.c
> @@ -4502,17 +4502,22 @@ static int create_one_file(struct apply_state *state,
> unsigned int nr = getpid();
>
> for (;;) {
> - char newpath[PATH_MAX];
> - mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);
> + char *newpath = mkpathdup("%s~%u", path, nr);
> res = try_create_file(state, newpath, mode, buf, size);
> - if (res < 0)
> + if (res < 0) {
> + free(newpath);
> return -1;
> + }
> if (!res) {
> - if (!rename(newpath, path))
> + if (!rename(newpath, path)) {
> + free(newpath);
> return 0;
> + }
> unlink_or_warn(newpath);
> + free(newpath);
> break;
> }
> + free(newpath);
> if (errno != EEXIST)
> break;
> ++nr;
> diff --git a/path.c b/path.c
> index 8bb223c92c..67229edb9c 100644
> --- a/path.c
> +++ b/path.c
> @@ -28,8 +28,6 @@ static int get_st_mode_bits(const char *path, int *mode)
> return 0;
> }
>
> -static char bad_path[] = "/bad-path/";
> -
> static struct strbuf *get_pathname(void)
> {
> static struct strbuf pathname_array[4] = {
> @@ -59,21 +57,6 @@ static void strbuf_cleanup_path(struct strbuf *sb)
> strbuf_remove(sb, 0, path - sb->buf);
> }
>
> -char *mksnpath(char *buf, size_t n, const char *fmt, ...)
> -{
> - va_list args;
> - unsigned len;
> -
> - va_start(args, fmt);
> - len = vsnprintf(buf, n, fmt, args);
> - va_end(args);
> - if (len >= n) {
> - strlcpy(buf, bad_path, n);
> - return buf;
> - }
> - return (char *)cleanup_path(buf);
> -}
> -
> static int dir_prefix(const char *buf, const char *dir)
> {
> int len = strlen(dir);
> diff --git a/path.h b/path.h
> index e053effef2..ea96487b29 100644
> --- a/path.h
> +++ b/path.h
> @@ -23,12 +23,6 @@ const char *mkpath(const char *fmt, ...)
> char *mkpathdup(const char *fmt, ...)
> __attribute__((format (printf, 1, 2)));
>
> -/*
> - * Construct a path and place the result in the provided buffer `buf`.
> - */
> -char *mksnpath(char *buf, size_t n, const char *fmt, ...)
> - __attribute__((format (printf, 3, 4)));
> -
> /*
> * The `git_common_path` family of functions will construct a path into a
> * repository's common git directory, which is shared by all worktrees.
> --
> 2.44.0
next prev parent reply other threads:[~2024-04-04 21:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-04 21:08 [PATCH] apply: replace mksnpath() with a mkpathdup() call René Scharfe
2024-04-04 21:29 ` Junio C Hamano [this message]
2024-04-04 22:53 ` free and errno, was " Jeff King
2024-04-04 23:08 ` Junio C Hamano
2024-04-05 10:52 ` René Scharfe
2024-04-05 17:35 ` Jeff King
2024-04-05 17:41 ` Jeff King
2024-04-06 17:45 ` René Scharfe
2024-04-07 1:18 ` Jeff King
2024-04-14 15:17 ` René Scharfe
2024-04-24 1:11 ` Jeff King
2024-04-05 10:53 ` [PATCH v2 1/2] apply: avoid fixed-size buffer in create_one_file() René Scharfe
2024-04-05 10:56 ` [PATCH v2 2/2] path: remove mksnpath() René Scharfe
2024-04-05 17:37 ` Jeff King
2024-04-05 16:51 ` [PATCH v2 1/2] apply: avoid fixed-size buffer in create_one_file() 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
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=xmqqo7aozuih.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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.
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).