diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-01-23 10:22:33 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-01-23 10:22:33 +0000 |
commit | 12afca6d673bf3f44156a8275da5cad5bc4454e2 (patch) | |
tree | b85b6211e61c264006a2891b75f4882172379e0f /src/triplet.c | |
parent | 806fa9b42234f31b1063d47d8318b8d18c6c05e7 (diff) | |
download | wydawca-12afca6d673bf3f44156a8275da5cad5bc4454e2.tar.gz wydawca-12afca6d673bf3f44156a8275da5cad5bc4454e2.tar.bz2 |
Version 1.2
* configure.ac, NEWS: Version 1.2
* doc/wydawca.texi: Document new features.
* src/wydawca.c (archive_signatures): New variable.
* src/wydawca.h (SUF_SIG,SUF_SIG_LEN,SUF_DIR,SUF_DIR_LEN): New
macros.
(archive_signatures): New variable.
* src/config.c: New configuration file statement
archive-signatures.
* src/process.c (SUF_SIG,SUF_DIR): Move to src/wydawca.
* src/diskio.c (backup_file): Do not update statistics.
(do_archive_file): Unlink the file after archivation.
(archive_single_file): New function.
(archive_file): Implicitly archive .sig file, if
archive_signatures is set.
* src/triplet.c (check_triplet_state): Call
verify_directive_file.
(triplet_processor): Remove call to verify_directive_file.
git-svn-id: file:///svnroot/wydawca/trunk@337 6bb4bd81-ecc2-4fd4-a2d4-9571d19c0d33
Diffstat (limited to 'src/triplet.c')
-rw-r--r-- | src/triplet.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/triplet.c b/src/triplet.c index de8c8d6..c93af0f 100644 --- a/src/triplet.c +++ b/src/triplet.c @@ -127,14 +127,17 @@ enum triplet_state static enum triplet_state check_triplet_state (struct file_triplet *trp) -{ +{ + if (verify_directive_file (trp, trp->dpair)) + return triplet_bad; + if (trp->file[file_directive].name) { if (trp->file[file_dist].name == 0 && trp->file[file_signature].name == 0) { if (directive_get_value (trp, "filename", NULL)) - return triplet_directive ; + return triplet_directive; } else if (trp->file[file_dist].name && trp->file[file_signature].name) @@ -197,17 +200,8 @@ triplet_processor (void *data, void *proc_data) case triplet_complete: if (debug_level) logmsg (LOG_DEBUG, "Processing triplet `%s'", trp->name); - if (verify_directive_file (trp, dpair) == 0) - { - process_directives (trp, dpair); - return true; - } - else - { - UPDATE_STATS (STAT_BAD_TRIPLETS); - remove_triplet (trp); - } - break; + process_directives (trp, dpair); + return true; case triplet_incomplete: if (debug_level) |