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 v5 15/28] setup.c: convert is_git_directory() to use strbuf Date: Sat, 8 Mar 2014 09:48:07 +0700 Message-ID: <1394246900-31535-16-git-send-email-pclouds@gmail.com> References: <1393675983-3232-1-git-send-email-pclouds@gmail.com> <1394246900-31535-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 Sat Mar 08 03:49:32 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 1WM7KN-0005W0-7X for gcvg-git-2@plane.gmane.org; Sat, 08 Mar 2014 03:49:31 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753470AbaCHCt1 convert rfc822-to-quoted-printable (ORCPT ); Fri, 7 Mar 2014 21:49:27 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:33893 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752305AbaCHCt0 (ORCPT ); Fri, 7 Mar 2014 21:49:26 -0500 Received: by mail-pb0-f46.google.com with SMTP id rq2so4921477pbb.5 for ; Fri, 07 Mar 2014 18:49:26 -0800 (PST) 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=RNEpKk9s8TgZ+gPo1A1zivDKaSQ4z7YQ+Rz+qaJTMnU=; b=u7LkJ8CemmXJm/lonydsei46sQoqQVcsBeSRsxRrC3steD7fC96v9cAYMi4OZ5kRRF 62lThz+xC9kraSHP/9VbUeviQ/PuFYETgDLYJiMRk13Mjh3ozP9hRLOYF+CjvZLANuij bJx0IRsLeEs+TX5oEKFegM1R+6UqpbB8DdJyLSgHo+28OnKD1bVO2x8hW2pHYjIzXgty e3KzsFLHxbt2LiINquD/77a5gR8fMhxNYOQLaTX6VUPQqCdjDDEBrzCrM/Qyde8ofEDk IIUXl95WWZJDSd3al1VPX3sE867UlUed+4NFCIqgaklfCEei5GMIuFVfeLN94KvwKbVC 2ISg== X-Received: by 10.67.13.134 with SMTP id ey6mr25928876pad.44.1394246966048; Fri, 07 Mar 2014 18:49:26 -0800 (PST) Received: from lanh ([115.73.205.153]) by mx.google.com with ESMTPSA id fk4sm18850277pab.23.2014.03.07.18.49.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Mar 2014 18:49:25 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Sat, 08 Mar 2014 09:49:59 +0700 X-Mailer: git-send-email 1.9.0.40.gaa8c3ea In-Reply-To: <1394246900-31535-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 6c3f85f..4994437 100644 --- a/setup.c +++ b/setup.c @@ -184,31 +184,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.0.40.gaa8c3ea