Changeset 441
- Timestamp:
- 05/06/04 13:10:37 (5 years ago)
- Files:
-
- wired/trunk/wired/files.c (modified) (14 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
wired/trunk/wired/files.c
r427 r441 1 /* $Id: files.c,v 1.1 2 2004/05/05 19:57:22morris Exp $ */1 /* $Id: files.c,v 1.13 2004/05/06 11:10:37 morris Exp $ */ 2 2 3 3 /* … … 50 50 #include <openssl/rand.h> 51 51 #include <openssl/sha.h> 52 #include <regex.h> 52 53 53 54 #include "accounts.h" … … 146 147 if(chp != NULL) { 147 148 for(cur = chp; cur != NULL; cur = cur->fts_link) { 148 /* skip . files */149 if(cur->fts_name[0] == '.') {150 fts_set(fts, cur, FTS_SKIP);151 152 continue;153 }154 155 149 /* skip WIRED */ 156 150 if(strcmp(cur->fts_name, "WIRED") == 0) { … … 160 154 } 161 155 156 /* skip . files */ 157 if(wd_settings.ignoredot) { 158 if(cur->fts_name[0] == '.') { 159 fts_set(fts, cur, FTS_SKIP); 160 161 continue; 162 } 163 } 164 165 /* skip regular expression */ 166 if(regexec(&wd_settings.ignoreexpression, cur->fts_name, 0, NULL, 0) == 0) { 167 fts_set(fts, cur, FTS_SKIP); 168 169 continue; 170 } 171 162 172 /* get a real access path */ 163 173 snprintf(real_path, sizeof(real_path), "%s/%s", … … 167 177 #ifdef HAVE_CARBON_CARBON_H 168 178 /* skip mac invisibles */ 169 if(wd_apple_is_invisible(real_path)) { 170 fts_set(fts, cur, FTS_SKIP); 171 172 continue; 179 if(wd_settings.ignoreinvisible) { 180 if(wd_apple_is_invisible(real_path)) { 181 fts_set(fts, cur, FTS_SKIP); 182 183 continue; 184 } 173 185 } 174 186 #endif … … 273 285 if(chp != NULL) { 274 286 for(cur = chp; cur != NULL; cur = cur->fts_link) { 275 /* skip . files */276 if(cur->fts_name[0] == '.') {277 fts_set(fts, cur, FTS_SKIP);278 279 continue;280 }281 282 287 /* skip WIRED */ 283 288 if(strcmp(cur->fts_name, "WIRED") == 0) { … … 287 292 } 288 293 294 /* skip . files */ 295 if(wd_settings.ignoredot) { 296 if(cur->fts_name[0] == '.') { 297 fts_set(fts, cur, FTS_SKIP); 298 299 continue; 300 } 301 } 302 303 /* skip regular expression */ 304 if(regexec(&wd_settings.ignoreexpression, cur->fts_name, 0, NULL, 0) == 0) { 305 fts_set(fts, cur, FTS_SKIP); 306 307 continue; 308 } 309 289 310 /* get a real access path */ 290 311 snprintf(real_path, sizeof(real_path), "%s/%s", … … 294 315 #ifdef HAVE_CARBON_CARBON_H 295 316 /* skip mac invisibles */ 296 if(wd_apple_is_invisible(real_path)) { 297 fts_set(fts, cur, FTS_SKIP); 298 299 continue; 317 if(wd_settings.ignoreinvisible) { 318 if(wd_apple_is_invisible(real_path)) { 319 fts_set(fts, cur, FTS_SKIP); 320 321 continue; 322 } 300 323 } 301 324 #endif … … 670 693 if(chp != NULL) { 671 694 for(cur = chp; cur != NULL; cur = cur->fts_link) { 672 /* skip . files */673 if(cur->fts_name[0] == '.') {674 fts_set(fts, cur, FTS_SKIP);675 676 continue;677 }678 679 695 /* skip very deep levels */ 680 696 if(cur->fts_level >= 10) { … … 691 707 } 692 708 709 /* skip . files */ 710 if(wd_settings.ignoredot) { 711 if(cur->fts_name[0] == '.') { 712 fts_set(fts, cur, FTS_SKIP); 713 714 continue; 715 } 716 } 717 718 /* skip regular expression */ 719 if(regexec(&wd_settings.ignoreexpression, cur->fts_name, 0, NULL, 0) == 0) { 720 fts_set(fts, cur, FTS_SKIP); 721 722 continue; 723 } 724 693 725 /* get a real access path */ 694 726 snprintf(real_path, sizeof(real_path), "%s/%s", … … 698 730 #ifdef HAVE_CARBON_CARBON_H 699 731 /* skip mac invisibles */ 700 if(wd_apple_is_invisible(real_path)) { 701 fts_set(fts, cur, FTS_SKIP); 702 703 continue; 732 if(wd_settings.ignoreinvisible) { 733 if(wd_apple_is_invisible(real_path)) { 734 fts_set(fts, cur, FTS_SKIP); 735 736 continue; 737 } 704 738 } 705 739 #endif … … 821 855 if(chp != NULL) { 822 856 for(cur = chp; cur != NULL; cur = cur->fts_link) { 823 /* skip . files */824 if(cur->fts_name[0] == '.') {825 fts_set(fts, cur, FTS_SKIP);826 827 continue;828 }829 830 857 /* skip very deep levels */ 831 858 if(cur->fts_level >= 10) { … … 842 869 } 843 870 871 /* skip . files */ 872 if(wd_settings.ignoredot) { 873 if(cur->fts_name[0] == '.') { 874 fts_set(fts, cur, FTS_SKIP); 875 876 continue; 877 } 878 } 879 880 /* skip regular expression */ 881 if(regexec(&wd_settings.ignoreexpression, cur->fts_name, 0, NULL, 0) == 0) { 882 fts_set(fts, cur, FTS_SKIP); 883 884 continue; 885 } 886 844 887 /* get a real access path */ 845 888 snprintf(real_path, sizeof(real_path), "%s/%s", … … 849 892 #ifdef HAVE_CARBON_CARBON_H 850 893 /* skip mac invisibles */ 851 if(wd_apple_is_invisible(real_path)) { 852 fts_set(fts, cur, FTS_SKIP); 853 854 continue; 894 if(wd_settings.ignoreinvisible) { 895 if(wd_apple_is_invisible(real_path)) { 896 fts_set(fts, cur, FTS_SKIP); 897 898 continue; 899 } 855 900 } 856 901 #endif
