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 v3 15/32] setup.c: convert is_git_directory() to use strbuf Date: Sun, 28 Sep 2014 08:22:29 +0700 Message-ID: <1411867366-3821-16-git-send-email-pclouds@gmail.com> References: <1411867366-3821-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 Sun Sep 28 03:24:17 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 1XY3Dl-0002Rj-ES for gcvg-git-2@plane.gmane.org; Sun, 28 Sep 2014 03:24:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753377AbaI1BYN convert rfc822-to-quoted-printable (ORCPT ); Sat, 27 Sep 2014 21:24:13 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:39579 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753183AbaI1BYL (ORCPT ); Sat, 27 Sep 2014 21:24:11 -0400 Received: by mail-pd0-f169.google.com with SMTP id p10so3188324pdj.0 for ; Sat, 27 Sep 2014 18:24:11 -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=cWNDTHpS7lim+LhrbSvH2J63syyDhFSPSpGACyR3UKQ=; b=yDjZNHe9Ca2hKiu2QCfGyINq/sj5G7WXBwriiHvrniJS+zcYgHJtwTeK+wPkXa6PTj oY+gRlAYfYWd0LvuqTQpoOJCSbfvHNV6ttrdUohKBx5KaErKu//IAXPrxioobfKMA7fE k2vHv2Ghj1DB3azQ0BzrJEVCMbE472XljTHhvXnOooz2pXvVKeuCkwhde1aiNXl1Mrvw PeMZQ1rTzIA34IpjKThLcx51HFE3OAr6ys8QZUCYGKW4SgEc90bP5dtjEIm991ECL8eE R8PQK0X9DCyvfCAEDFFDhBHr7y2Fuf55XHIB4p2Q7/NJvapd1CvNcaAsXRcL68jcyU3d qctg== X-Received: by 10.70.10.100 with SMTP id h4mr70047pdb.162.1411867451423; Sat, 27 Sep 2014 18:24:11 -0700 (PDT) Received: from lanh ([115.73.212.224]) by mx.google.com with ESMTPSA id pw10sm8490806pbc.93.2014.09.27.18.24.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Sep 2014 18:24:10 -0700 (PDT) Received: by lanh (sSMTP sendmail emulation); Sun, 28 Sep 2014 08:24:14 +0700 X-Mailer: git-send-email 2.1.0.rc0.78.gc0d8480 In-Reply-To: <1411867366-3821-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: Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy Signed-off-by: Junio C Hamano --- setup.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/setup.c b/setup.c index 979b13f..afd6742 100644 --- a/setup.c +++ b/setup.c @@ -238,31 +238,36 @@ void verify_non_filename(const char *prefix, cons= t char *arg) */ int is_git_directory(const char *suspect) { - char path[PATH_MAX]; - size_t len =3D strlen(suspect); + struct strbuf path =3D STRBUF_INIT; + int ret =3D 0; + size_t len; =20 - if (PATH_MAX <=3D len + strlen("/objects")) - die("Too long path: %.*s", 60, suspect); - strcpy(path, suspect); + strbuf_addstr(&path, suspect); + len =3D path.len; if (getenv(DB_ENVIRONMENT)) { if (access(getenv(DB_ENVIRONMENT), X_OK)) - return 0; + goto done; } else { - strcpy(path + len, "/objects"); - if (access(path, X_OK)) - return 0; + strbuf_addstr(&path, "/objects"); + if (access(path.buf, X_OK)) + goto done; } =20 - strcpy(path + len, "/refs"); - if (access(path, X_OK)) - return 0; + strbuf_setlen(&path, len); + strbuf_addstr(&path, "/refs"); + if (access(path.buf, X_OK)) + goto done; =20 - strcpy(path + len, "/HEAD"); - if (validate_headref(path)) - return 0; + strbuf_setlen(&path, len); + strbuf_addstr(&path, "/HEAD"); + if (validate_headref(path.buf)) + goto done; =20 - return 1; + ret =3D 1; +done: + strbuf_release(&path); + return ret; } =20 int is_inside_git_dir(void) --=20 2.1.0.rc0.78.gc0d8480