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 v6 17/32] setup.c: convert is_git_directory() to use strbuf Date: Wed, 9 Jul 2014 14:33:02 +0700 Message-ID: <1404891197-18067-18-git-send-email-pclouds@gmail.com> References: <1404891197-18067-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 Wed Jul 09 09:35:10 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 1X4mPB-0003qD-U5 for gcvg-git-2@plane.gmane.org; Wed, 09 Jul 2014 09:35:06 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754842AbaGIHfA convert rfc822-to-quoted-printable (ORCPT ); Wed, 9 Jul 2014 03:35:00 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:34437 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754802AbaGIHe7 (ORCPT ); Wed, 9 Jul 2014 03:34:59 -0400 Received: by mail-pa0-f51.google.com with SMTP id hz1so8799192pad.10 for ; Wed, 09 Jul 2014 00:34:59 -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=j8YZOX+/a5MoCwqXUrysc2Zac66JTQ9DlndRk4v+FpA=; b=ijQosiKuIqEOlxbDBrnC3yP3IgnRuhWVLFBHjb7S1uhRJDZG/x/YuqBTjUX7H8lJS4 7SSJtCC0DPHdD09CcDnO7DkcmrYtAPtPh71OgjPxWTi7jPrY+iMSSWp3AHiGdTdowxF+ pQUW6EtNaq6YavLsVl8ulLVVUupxG0/cbQRVLCJjCVob0DyPpf9i5IwxM1G3QfiBHruE 2/kHQngneral8V5C2yyymIXRf4PqlOQ5bW+BDBI5HfqNABXP9rsaP3kySeSDu2P/Q2E5 WlR0Tam3ZTvppkiPtsoucmYP/WO5CNJPf2IyegF4pGJAb9QVhtXcgDrYCtA2MZEUiXO0 c68g== X-Received: by 10.66.132.3 with SMTP id oq3mr40315678pab.33.1404891299419; Wed, 09 Jul 2014 00:34:59 -0700 (PDT) Received: from lanh ([115.73.209.165]) by mx.google.com with ESMTPSA id da10sm12688103pdb.60.2014.07.09.00.34.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Jul 2014 00:34:58 -0700 (PDT) Received: by lanh (sSMTP sendmail emulation); Wed, 09 Jul 2014 14:34:56 +0700 X-Mailer: git-send-email 1.9.1.346.ga2b5940 In-Reply-To: <1404891197-18067-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 --- setup.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/setup.c b/setup.c index 0a22f8b..425fd79 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 1.9.1.346.ga2b5940