From 97b0464d75efc8bbe4f01480651a91c352f23566 Mon Sep 17 00:00:00 2001 From: Andrea Mazzoleni Date: Tue, 3 Jul 2012 21:51:50 +0200 Subject: [PATCH] Fixed directories exclusion. --- HISTORY | 5 +++++ configure.ac | 2 +- elem.c | 6 ++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/HISTORY b/HISTORY index aa1d003f..bbce098b 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,11 @@ SnapRAID HISTORY ================ +1.11 2012/7 +=========== + * Fixed again directories inclusion. Exclusion rules for directories were + ignored. + 1.10 2012/6 =========== * Fixed directory inclusion, in case the last rule is an "include" one. diff --git a/configure.ac b/configure.ac index 174fc0ec..071dd64d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.65]) -AC_INIT([snapraid], [1.10], [], [], [http://snapraid.sourceforge.net]) +AC_INIT([snapraid], [1.11], [], [], [http://snapraid.sourceforge.net]) AM_INIT_AUTOMAKE([foreign no-dependencies -Wall]) AC_CONFIG_SRCDIR([snapraid.c]) AC_CONFIG_HEADER([config.h]) diff --git a/elem.c b/elem.c index 1d9a7ac5..0f018a49 100644 --- a/elem.c +++ b/elem.c @@ -163,12 +163,10 @@ static int filter_element(tommy_list* filterlist, const char* sub, int is_dir) ret = filter_recurse(filter, sub, is_dir); if (ret > 0) { /* include the file */ - direction = 1; - break; + return 0; } else if (ret < 0) { /* exclude the file */ - direction = -1; - break; + return -1; } else { /* default is opposite of the last filter */ direction = -filter->direction;