Changeset 222
- Timestamp:
- 10/16/11 10:55:51 (7 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
tsf/main.c
r219 r222 94 94 opt->tree_flags = 0; 95 95 opt->verbose_level = 0; 96 opt->skip_svn = 0; 96 97 for(i = 0; i < n; i++) 97 98 { … … 105 106 break; 106 107 case 'v': 107 case 'V':108 108 opt->verbose_level++; 109 109 break; 110 case 's': 111 opt->skip_svn = 1; 110 112 } 111 113 } tsf/tsf.c
r219 r222 20 20 ***************************************************************************/ 21 21 22 #define _XOPEN_SOURCE 500 22 #define _GNU_SOURCE 23 23 24 #include <ftw.h> 24 25 #include <stdio.h> … … 312 313 break; 313 314 case FTW_D: 315 if(off_a->options.skip_svn && strcmp(".svn", fpath + ftwbuf->base) == 0) 316 { 317 if(off_a->options.verbose_level > 0) 318 printf("Skipping %s\n", fpath); 319 320 return FTW_SKIP_SUBTREE; 321 } 322 314 323 r = tsf_append_folder_entry(off_a, fpath); 315 324 break; 316 325 } 317 return r; 326 if(r < 0) 327 return FTW_STOP; 328 else 329 return FTW_CONTINUE; 318 330 } 319 331 … … 324 336 off_a = a; 325 337 326 if (nftw(dir, &on_file_found, 20, a->options.tree_flags ) == -1)338 if (nftw(dir, &on_file_found, 20, a->options.tree_flags | FTW_ACTIONRETVAL) == FTW_STOP) 327 339 return -1; 328 340 tsf/tsf.h
r221 r222 71 71 int tree_flags; // flags for nftw 72 72 int verbose_level; // verbosity level 73 int skip_svn; 73 74 } tsf_options_t; 74 75
