X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=20cbb6447a80b46da2e4aba470e1fcea6896df11;hb=7bf812579c1cfead7a06d9cab78621bf120b80e4;hp=edf787c8316f98c3a4e9c696b8b26d26bff8baf9;hpb=93906c238d9309f95afeddfa9ac8d7ce92351e70;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index edf787c..20cbb64 100644 --- a/src/common.h +++ b/src/common.h @@ -725,7 +725,7 @@ int uname_to_uid (char const *uname, uid_t *puid); void name_init (void); void name_add_name (const char *name, int matching_flags); void name_add_dir (const char *name); -void name_add_file (const char *name, int term); +void name_add_file (const char *name, int term, int matching_flags); void name_term (void); const char *name_next (int change_dirs); void name_gather (void); @@ -748,10 +748,12 @@ bool is_avoided_name (char const *name); bool contains_dot_dot (char const *name); -#define ISFOUND(c) ((occurrence_option == 0) ? (c)->found_count : \ - (c)->found_count == occurrence_option) -#define WASFOUND(c) ((occurrence_option == 0) ? (c)->found_count : \ - (c)->found_count >= occurrence_option) +#define ISFOUND(c) (occurrence_option == 0 \ + ? (c)->found_count != 0 \ + : (c)->found_count == occurrence_option) +#define WASFOUND(c) (occurrence_option == 0 \ + ? (c)->found_count != 0 \ + : (c)->found_count >= occurrence_option) /* Module tar.c. */