From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v2 03/32] git_snpath(): retire and replace with strbuf_git_path() Date: Thu, 11 Sep 2014 05:41:39 +0700 Message-ID: <1410388928-32265-4-git-send-email-pclouds@gmail.com> References: <1409387642-24492-1-git-send-email-pclouds@gmail.com> <1410388928-32265-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Sep 11 00:42:27 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XRqao-0001Am-Aw for gcvg-git-2@plane.gmane.org; Thu, 11 Sep 2014 00:42:26 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752781AbaIJWmV convert rfc822-to-quoted-printable (ORCPT ); Wed, 10 Sep 2014 18:42:21 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:37911 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752342AbaIJWmT (ORCPT ); Wed, 10 Sep 2014 18:42:19 -0400 Received: by mail-pa0-f42.google.com with SMTP id lj1so7373995pab.1 for ; Wed, 10 Sep 2014 15:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=TnhugbRMFJh7MmZmEWpil9zcjXU4sxDLGOP1naIR3GY=; b=EWTyIriivGzEhMa1LS2w/ZUpJ+/q0v9J2CW8XODocz+/vIqF8y5SWnqscLYs7hNWkE hb2RpjOTh5i5+cfy6UukJNHnogEki7/YiMf3wDZ1ZZ1pkUNYuID+0Sx3eAS/YaTONRFR 0/fkkcCiL/yjPf1lZ2O22leSCGj1rALI2wi3Y7BgHH6of+JGWNufPHSbV2M11SG3n4eA fuAIkH83smLl0SpkBcxYGUQ8jIzE719qySY/LqJb/W06mazAVXU6JOLbnXTxA6Oxn6oA mOpOjHO5oXedssacLpZSV6hFt2piuVZgrnuMl40gZUWO2QR/JAetPtrNqjmHpss7EDff 8i7g== X-Received: by 10.68.229.166 with SMTP id sr6mr42185148pbc.33.1410388939515; Wed, 10 Sep 2014 15:42:19 -0700 (PDT) Received: from lanh ([115.73.197.210]) by mx.google.com with ESMTPSA id fk5sm15428861pbc.53.2014.09.10.15.42.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Sep 2014 15:42:18 -0700 (PDT) Received: by lanh (sSMTP sendmail emulation); Thu, 11 Sep 2014 05:42:39 +0700 X-Mailer: git-send-email 2.1.0.rc0.78.gc0d8480 In-Reply-To: <1410388928-32265-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: In the previous patch, git_snpath() is modified to allocate a new strbuf buffer because vsnpath() needs that. But that makes it awkward because git_snpath() receives a pre-allocated buffer from outside and has to copy data back. Rename it to strbuf_git_path() and make it receive strbuf directly. Using git_path() in update_refs_for_switch() which used to call git_snpath() is safe because that function and all of its callers do not keep any pointer to the round-robin buffer pool allocated by get_pathname(). Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy Signed-off-by: Junio C Hamano --- builtin/checkout.c | 13 +++++---- cache.h | 4 +-- path.c | 11 ++------ refs.c | 78 +++++++++++++++++++++++++++++++++-------------= -------- refs.h | 2 +- 5 files changed, 61 insertions(+), 47 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 3abcef1..8023987 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -584,18 +584,21 @@ static void update_refs_for_switch(const struct c= heckout_opts *opts, if (opts->new_orphan_branch) { if (opts->new_branch_log && !log_all_ref_updates) { int temp; - char log_file[PATH_MAX]; - const char *ref_name =3D mkpath("refs/heads/%s", opts->new_orphan_= branch); + struct strbuf log_file =3D STRBUF_INIT; + int ret; + const char *ref_name; =20 + ref_name =3D mkpath("refs/heads/%s", opts->new_orphan_branch); temp =3D log_all_ref_updates; log_all_ref_updates =3D 1; - if (log_ref_setup(ref_name, log_file, sizeof(log_file))) { + ret =3D log_ref_setup(ref_name, &log_file); + log_all_ref_updates =3D temp; + strbuf_release(&log_file); + if (ret) { fprintf(stderr, _("Can not do reflog for '%s'\n"), opts->new_orphan_branch); - log_all_ref_updates =3D temp; return; } - log_all_ref_updates =3D temp; } } else diff --git a/cache.h b/cache.h index 707408b..279b581 100644 --- a/cache.h +++ b/cache.h @@ -674,8 +674,8 @@ extern int check_repository_format(void); =20 extern char *mksnpath(char *buf, size_t n, const char *fmt, ...) __attribute__((format (printf, 3, 4))); -extern char *git_snpath(char *buf, size_t n, const char *fmt, ...) - __attribute__((format (printf, 3, 4))); +extern void strbuf_git_path(struct strbuf *sb, const char *fmt, ...) + __attribute__((format (printf, 2, 3))); extern char *git_pathdup(const char *fmt, ...) __attribute__((format (printf, 1, 2))); extern char *mkpathdup(const char *fmt, ...) diff --git a/path.c b/path.c index a3f8826..e545064 100644 --- a/path.c +++ b/path.c @@ -70,19 +70,12 @@ static void vsnpath(struct strbuf *buf, const char = *fmt, va_list args) strbuf_cleanup_path(buf); } =20 -char *git_snpath(char *buf, size_t n, const char *fmt, ...) +void strbuf_git_path(struct strbuf *sb, const char *fmt, ...) { - struct strbuf sb =3D STRBUF_INIT; va_list args; va_start(args, fmt); - vsnpath(&sb, fmt, args); + vsnpath(sb, fmt, args); va_end(args); - if (sb.len >=3D n) - strlcpy(buf, bad_path, n); - else - memcpy(buf, sb.buf, sb.len + 1); - strbuf_release(&sb); - return buf; } =20 char *git_pathdup(const char *fmt, ...) diff --git a/refs.c b/refs.c index dbd131e..00b2312 100644 --- a/refs.c +++ b/refs.c @@ -1535,10 +1535,12 @@ static const char *handle_missing_loose_ref(con= st char *refname, =20 const char *resolve_ref_unsafe(const char *refname, unsigned char *sha= 1, int reading, int *flag) { + struct strbuf sb_path =3D STRBUF_INIT; int depth =3D MAXDEPTH; ssize_t len; char buffer[256]; static char refname_buffer[256]; + const char *ret; =20 if (flag) *flag =3D 0; @@ -1547,15 +1549,17 @@ const char *resolve_ref_unsafe(const char *refn= ame, unsigned char *sha1, int rea return NULL; =20 for (;;) { - char path[PATH_MAX]; + const char *path; struct stat st; char *buf; int fd; =20 if (--depth < 0) - return NULL; + goto fail; =20 - git_snpath(path, sizeof(path), "%s", refname); + strbuf_reset(&sb_path); + strbuf_git_path(&sb_path, "%s", refname); + path =3D sb_path.buf; =20 /* * We might have to loop back here to avoid a race @@ -1569,10 +1573,11 @@ const char *resolve_ref_unsafe(const char *refn= ame, unsigned char *sha1, int rea stat_ref: if (lstat(path, &st) < 0) { if (errno =3D=3D ENOENT) - return handle_missing_loose_ref(refname, sha1, - reading, flag); + ret =3D handle_missing_loose_ref(refname, sha1, + reading, flag); else - return NULL; + ret =3D NULL; + goto done; } =20 /* Follow "normalized" - ie "refs/.." symlinks by hand */ @@ -1583,7 +1588,7 @@ const char *resolve_ref_unsafe(const char *refnam= e, unsigned char *sha1, int rea /* inconsistent with lstat; retry */ goto stat_ref; else - return NULL; + goto fail; } buffer[len] =3D 0; if (starts_with(buffer, "refs/") && @@ -1599,7 +1604,7 @@ const char *resolve_ref_unsafe(const char *refnam= e, unsigned char *sha1, int rea /* Is it a directory? */ if (S_ISDIR(st.st_mode)) { errno =3D EISDIR; - return NULL; + goto fail; } =20 /* @@ -1612,12 +1617,13 @@ const char *resolve_ref_unsafe(const char *refn= ame, unsigned char *sha1, int rea /* inconsistent with lstat; retry */ goto stat_ref; else - return NULL; + goto fail; } + len =3D read_in_full(fd, buffer, sizeof(buffer)-1); close(fd); if (len < 0) - return NULL; + goto fail; while (len && isspace(buffer[len-1])) len--; buffer[len] =3D '\0'; @@ -1634,9 +1640,10 @@ const char *resolve_ref_unsafe(const char *refna= me, unsigned char *sha1, int rea (buffer[40] !=3D '\0' && !isspace(buffer[40]))) { if (flag) *flag |=3D REF_ISBROKEN; - return NULL; + goto fail; } - return refname; + ret =3D refname; + goto done; } if (flag) *flag |=3D REF_ISSYMREF; @@ -1646,10 +1653,15 @@ const char *resolve_ref_unsafe(const char *refn= ame, unsigned char *sha1, int rea if (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL)) { if (flag) *flag |=3D REF_ISBROKEN; - return NULL; + goto fail; } refname =3D strcpy(refname_buffer, buf); } +fail: + ret =3D NULL; +done: + strbuf_release(&sb_path); + return ret; } =20 char *resolve_refdup(const char *ref, unsigned char *sha1, int reading= , int *flag) @@ -2940,41 +2952,41 @@ static int copy_msg(char *buf, const char *msg) return cp - buf; } =20 -int log_ref_setup(const char *refname, char *logfile, int bufsize) +int log_ref_setup(const char *refname, struct strbuf *logfile) { int logfd, oflags =3D O_APPEND | O_WRONLY; =20 - git_snpath(logfile, bufsize, "logs/%s", refname); + strbuf_git_path(logfile, "logs/%s", refname); if (log_all_ref_updates && (starts_with(refname, "refs/heads/") || starts_with(refname, "refs/remotes/") || starts_with(refname, "refs/notes/") || !strcmp(refname, "HEAD"))) { - if (safe_create_leading_directories(logfile) < 0) + if (safe_create_leading_directories(logfile->buf) < 0) return error("unable to create directory for %s", - logfile); + logfile->buf); oflags |=3D O_CREAT; } =20 - logfd =3D open(logfile, oflags, 0666); + logfd =3D open(logfile->buf, oflags, 0666); if (logfd < 0) { if (!(oflags & O_CREAT) && errno =3D=3D ENOENT) return 0; =20 if ((oflags & O_CREAT) && errno =3D=3D EISDIR) { - if (remove_empty_directories(logfile)) { + if (remove_empty_directories(logfile->buf)) { return error("There are still logs under '%s'", - logfile); + logfile->buf); } - logfd =3D open(logfile, oflags, 0666); + logfd =3D open(logfile->buf, oflags, 0666); } =20 if (logfd < 0) return error("Unable to append to %s: %s", - logfile, strerror(errno)); + logfile->buf, strerror(errno)); } =20 - adjust_shared_perm(logfile); + adjust_shared_perm(logfile->buf); close(logfd); return 0; } @@ -2985,20 +2997,22 @@ static int log_ref_write(const char *refname, c= onst unsigned char *old_sha1, int logfd, result, written, oflags =3D O_APPEND | O_WRONLY; unsigned maxlen, len; int msglen; - char log_file[PATH_MAX]; + struct strbuf sb_log_file =3D STRBUF_INIT; + const char *log_file; char *logrec; const char *committer; =20 if (log_all_ref_updates < 0) log_all_ref_updates =3D !is_bare_repository(); =20 - result =3D log_ref_setup(refname, log_file, sizeof(log_file)); + result =3D log_ref_setup(refname, &sb_log_file); if (result) - return result; + goto done; + log_file =3D sb_log_file.buf; =20 logfd =3D open(log_file, oflags); if (logfd < 0) - return 0; + goto done; msglen =3D msg ? strlen(msg) : 0; committer =3D git_committer_info(0); maxlen =3D strlen(committer) + msglen + 100; @@ -3011,9 +3025,13 @@ static int log_ref_write(const char *refname, co= nst unsigned char *old_sha1, len +=3D copy_msg(logrec + len - 1, msg) - 1; written =3D len <=3D maxlen ? write_in_full(logfd, logrec, len) : -1; free(logrec); - if (close(logfd) !=3D 0 || written !=3D len) - return error("Unable to append to %s", log_file); - return 0; + if (close(logfd) !=3D 0 || written !=3D len) { + error("Unable to append to %s", log_file); + result =3D -1; + } +done: + strbuf_release(&sb_log_file); + return result; } =20 static int is_branch(const char *refname) diff --git a/refs.h b/refs.h index 4e3050d..99d88a7 100644 --- a/refs.h +++ b/refs.h @@ -157,7 +157,7 @@ extern void unlock_ref(struct ref_lock *lock); extern int write_ref_sha1(struct ref_lock *lock, const unsigned char *= sha1, const char *msg); =20 /** Setup reflog before using. **/ -int log_ref_setup(const char *refname, char *logfile, int bufsize); +int log_ref_setup(const char *refname, struct strbuf *logfile); =20 /** Reads log for the value of ref during at_time. **/ extern int read_ref_at(const char *refname, unsigned long at_time, int= cnt, --=20 2.1.0.rc0.78.gc0d8480