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 05/22] untracked cache: make a wrapper around {open,read,close}dir() Date: Sat, 8 Nov 2014 16:39:38 +0700 Message-ID: <1415439595-469-6-git-send-email-pclouds@gmail.com> References: <1414411846-4450-1-git-send-email-pclouds@gmail.com> <1415439595-469-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?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 Nov 08 10:40:25 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 1Xn2VM-0000d7-NJ for gcvg-git-2@plane.gmane.org; Sat, 08 Nov 2014 10:40:25 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753583AbaKHJkR convert rfc822-to-quoted-printable (ORCPT ); Sat, 8 Nov 2014 04:40:17 -0500 Received: from mail-pd0-f179.google.com ([209.85.192.179]:63337 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753567AbaKHJkP (ORCPT ); Sat, 8 Nov 2014 04:40:15 -0500 Received: by mail-pd0-f179.google.com with SMTP id g10so4821145pdj.10 for ; Sat, 08 Nov 2014 01:40:15 -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=FEkneGBh9bp6ni1aVXuP6J8GWoe3V5nW4cwZ2aqsuWw=; b=ikS6PTVtWnjIgCotMpSyHI4gIyFI3nSSgGt5xhzZ3pcqm/ddx/mjFkQdBxcuCWGRGT RZU8wI9WwnRB/QeqsM9nlZpfdck1Ehfr6h3ThR/EJMXN9DyzVtLrO2Z/9pS5mdcGAt+E 2/pm/mm6OPWYtFWHm7zDel7IDDlWDgu12+yARB3PcmuNtuZrO3k3QrvzjjTQxwEcdK/k cc785Lwk4FdTlIRNRMPZM5eQdNXf0iUjEHFiLF5kpqeaVBIqUfYQLNwJcEteYLQiQtsW cPUHt4s+Ye+k6ZGD/luszQ+t2oAw6bMu1jz5UF3GFr2fUmK/gFSg4JgS4AY2jo35VFox QWDw== X-Received: by 10.70.49.101 with SMTP id t5mr12392939pdn.91.1415439615295; Sat, 08 Nov 2014 01:40:15 -0800 (PST) Received: from lanh ([115.73.197.54]) by mx.google.com with ESMTPSA id eb7sm9654641pad.9.2014.11.08.01.40.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Nov 2014 01:40:14 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Sat, 08 Nov 2014 16:40:29 +0700 X-Mailer: git-send-email 2.1.0.rc0.78.gc0d8480 In-Reply-To: <1415439595-469-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This allows us to feed different info to read_directory_recursive() based on untracked cache in the next patch. Helped-by: Ramsay Jones Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- dir.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/dir.c b/dir.c index d5e35ea..65ba98e 100644 --- a/dir.c +++ b/dir.c @@ -31,6 +31,15 @@ enum path_treatment { path_untracked }; =20 +/* + * Support data structure for our opendir/readdir/closedir wrappers + */ +struct cached_dir { + DIR *fdir; + struct untracked_cache_dir *untracked; + struct dirent *de; +}; + static enum path_treatment read_directory_recursive(struct dir_struct = *dir, const char *path, int len, struct untracked_cache_dir *untracked, int check_only, const struct path_simplify *simplify); @@ -1416,12 +1425,13 @@ static enum path_treatment treat_one_path(struc= t dir_struct *dir, =20 static enum path_treatment treat_path(struct dir_struct *dir, struct untracked_cache_dir *untracked, - struct dirent *de, + struct cached_dir *cdir, struct strbuf *path, int baselen, const struct path_simplify *simplify) { int dtype; + struct dirent *de =3D cdir->de; =20 if (is_dot_or_dotdot(de->d_name) || !strcmp(de->d_name, ".git")) return path_none; @@ -1443,6 +1453,37 @@ static void add_untracked(struct untracked_cache= _dir *dir, const char *name) dir->untracked[dir->untracked_nr++] =3D xstrdup(name); } =20 +static int open_cached_dir(struct cached_dir *cdir, + struct dir_struct *dir, + struct untracked_cache_dir *untracked, + struct strbuf *path, + int check_only) +{ + memset(cdir, 0, sizeof(*cdir)); + cdir->untracked =3D untracked; + cdir->fdir =3D opendir(path->len ? path->buf : "."); + if (!cdir->fdir) + return -1; + return 0; +} + +static int read_cached_dir(struct cached_dir *cdir) +{ + if (cdir->fdir) { + cdir->de =3D readdir(cdir->fdir); + if (!cdir->de) + return -1; + return 0; + } + return -1; +} + +static void close_cached_dir(struct cached_dir *cdir) +{ + if (cdir->fdir) + closedir(cdir->fdir); +} + /* * Read a directory tree. We currently ignore anything but * directories, regular files and symlinks. That's because git @@ -1459,23 +1500,21 @@ static enum path_treatment read_directory_recur= sive(struct dir_struct *dir, struct untracked_cache_dir *untracked, int check_only, const struct path_simplify *simplify) { - DIR *fdir; + struct cached_dir cdir; enum path_treatment state, subdir_state, dir_state =3D path_none; - struct dirent *de; struct strbuf path =3D STRBUF_INIT; =20 strbuf_add(&path, base, baselen); =20 - fdir =3D opendir(path.len ? path.buf : "."); - if (!fdir) + if (open_cached_dir(&cdir, dir, untracked, &path, check_only)) goto out; =20 if (untracked) untracked->check_only =3D !!check_only; =20 - while ((de =3D readdir(fdir)) !=3D NULL) { + while (!read_cached_dir(&cdir)) { /* check how the file or directory should be treated */ - state =3D treat_path(dir, untracked, de, &path, baselen, simplify); + state =3D treat_path(dir, untracked, &cdir, &path, baselen, simplify= ); =20 if (state > dir_state) dir_state =3D state; @@ -1528,7 +1567,7 @@ static enum path_treatment read_directory_recursi= ve(struct dir_struct *dir, break; } } - closedir(fdir); + close_cached_dir(&cdir); out: strbuf_release(&path); =20 --=20 2.1.0.rc0.78.gc0d8480