From: Jeff King <peff@peff.net>
To: "René Scharfe" <l.s.r@web.de>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Karsten Blees" <karsten.blees@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [PATCH v3 09/10] abspath: convert absolute_path() to strbuf
Date: Mon, 28 Jul 2014 15:15:00 -0400 [thread overview]
Message-ID: <20140728191500.GD11265@peff.net> (raw)
In-Reply-To: <53D69793.3010307@web.de>
On Mon, Jul 28, 2014 at 08:33:55PM +0200, René Scharfe wrote:
> const char *absolute_path(const char *path)
> {
> - static char buf[PATH_MAX + 1];
> -
> - if (!*path) {
> - die("The empty string is not a valid path");
> - } else if (is_absolute_path(path)) {
> - if (strlcpy(buf, path, PATH_MAX) >= PATH_MAX)
> - die("Too long path: %.*s", 60, path);
> - } else {
> - size_t len;
> - const char *fmt;
> - const char *cwd = get_pwd_cwd();
> - if (!cwd)
> - die_errno("Cannot determine the current working directory");
> - len = strlen(cwd);
> - fmt = (len > 0 && is_dir_sep(cwd[len - 1])) ? "%s%s" : "%s/%s";
> - if (snprintf(buf, PATH_MAX, fmt, cwd, path) >= PATH_MAX)
> - die("Too long path: %.*s", 60, path);
> - }
> - return buf;
> + static struct strbuf sb;
> + strbuf_init(&sb, 0);
> + strbuf_add_absolute_path(&sb, path);
> + return sb.buf;
> }
Is it right to strbuf_init here? That means that we are throwing away
the old buffer for each call. I would think you want instead:
static struct strbuf sb = STRBUF_INIT;
strbuf_reset(&sb);
...
-Peff
next prev parent reply other threads:[~2014-07-28 19:15 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-28 18:21 [PATCH v3 0/10] getcwd without PATH_MAX René Scharfe
2014-07-28 18:24 ` [PATCH v3 01/10] strbuf: add strbuf_getcwd() René Scharfe
2014-07-28 18:25 ` [PATCH v3 02/10] unix-sockets: use strbuf_getcwd() René Scharfe
2014-07-28 18:51 ` Jeff King
2014-07-28 18:26 ` [PATCH v3 03/10] setup: convert setup_git_directory_gently_1 et al. to strbuf René Scharfe
2014-07-28 23:23 ` Eric Sunshine
2014-08-16 20:14 ` Torsten Bögershausen
2014-08-16 21:48 ` René Scharfe
2014-08-18 16:50 ` Junio C Hamano
2014-07-28 18:27 ` [PATCH 04/10] abspath: use strbuf_getcwd() to remember original working directory René Scharfe
2014-07-28 18:28 ` [PATCH v3 05/10] abspath: convert real_path_internal() to strbuf René Scharfe
2014-07-28 19:09 ` Jeff King
2014-07-28 22:20 ` René Scharfe
2014-07-28 19:16 ` Jeff King
2014-07-28 21:42 ` Junio C Hamano
2014-07-29 0:04 ` René Scharfe
2014-07-29 16:44 ` Junio C Hamano
2014-07-29 0:05 ` fixup for 05/10: plug leak René Scharfe
2014-07-28 18:29 ` [PATCH v3 06/10] wrapper: add xgetcwd() René Scharfe
2014-07-28 18:30 ` [PATCH v3 07/10] use xgetcwd() to get the current directory or die René Scharfe
2014-07-28 18:31 ` [PATCH v3 08/10] use xgetcwd() to set $GIT_DIR René Scharfe
2014-07-28 18:33 ` [PATCH v3 09/10] abspath: convert absolute_path() to strbuf René Scharfe
2014-07-28 19:15 ` Jeff King [this message]
2014-07-28 22:34 ` René Scharfe
2014-07-29 0:05 ` fixup for 09/10: plug leak René Scharfe
2014-07-28 18:34 ` [PATCH v3 10/10] use strbuf_add_absolute_path() to add absolute paths René Scharfe
2014-07-28 18:37 ` [PATCH v3 04/10] abspath: use strbuf_getcwd() to remember original working directory René Scharfe
2014-07-28 19:19 ` [PATCH v3 0/10] getcwd without PATH_MAX 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140728191500.GD11265@peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karsten.blees@gmail.com \
--cc=l.s.r@web.de \
--cc=pclouds@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).