projects
/
backups
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ce454c7
)
No comment
author
Carl N. Baldwin
<cnb@Cone.local>
Wed, 26 Oct 2005 03:20:18 +0000
(21:20 -0600)
committer
Carl N. Baldwin
<cnb@Cone.local>
Wed, 26 Oct 2005 03:20:18 +0000
(21:20 -0600)
main.cpp
patch
|
blob
|
history
diff --git
a/main.cpp
b/main.cpp
index 2323efe3295da8031ab88a111b590f38a8a6787d..3a86a2bb2df27c03a56a987ff49419129ec683db 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-154,29
+154,28
@@
int main() {
// Now find the list of files to backup.
file_set backups;
// Now find the list of files to backup.
file_set backups;
- insert_iterator<file_set> backups_i( backups, backups.begin() );
// backup all added files
// backup all added files
- copy( added.begin(), added.end(),
backups_i
);
+ copy( added.begin(), added.end(),
inserter( backups, backups.begin() )
);
// Track the total size of added files
unsigned long long added_blocks, added_bytes;
sizes( added.begin(), added.end(), added_blocks, added_bytes );
// Track the total size of added files
unsigned long long added_blocks, added_bytes;
sizes( added.begin(), added.end(), added_blocks, added_bytes );
- file_vector modified_
files
;
+ file_vector modified_
v
;
// Backup files that have been modified
file_set::iterator i = common.begin(), j = old_common.begin();
for( ; i != common.end(); ++i, ++j ) {
(*i)->setLastBackupDate( (*j)->getLastBackupDate() );
// Backup files that have been modified
file_set::iterator i = common.begin(), j = old_common.begin();
for( ; i != common.end(); ++i, ++j ) {
(*i)->setLastBackupDate( (*j)->getLastBackupDate() );
- if( needs_backup( *j, *i ) ) modified_
files
.push_back( *i );
+ if( needs_backup( *j, *i ) ) modified_
v
.push_back( *i );
}
}
- copy( modified_
files.begin(), modified_files.end(), backups_i
);
+ copy( modified_
v.begin(), modified_v.end(), inserter( backups, backups.begin() )
);
// Track the total size of modified files
unsigned long long modified_blocks, modified_bytes;
// Track the total size of modified files
unsigned long long modified_blocks, modified_bytes;
- sizes( modified_
files.begin(), modified_files
.end(), modified_blocks, modified_bytes );
+ sizes( modified_
v.begin(), modified_v
.end(), modified_blocks, modified_bytes );
// Now, sort the backups by filesize and build a list that'll fit on a DVD
file_vector backups_s;
// Now, sort the backups by filesize and build a list that'll fit on a DVD
file_vector backups_s;
@@
-186,7
+185,7
@@
int main() {
sort( backups_s.begin(), backups_s.end(), sizecmp );
file_set final;
sort( backups_s.begin(), backups_s.end(), sizecmp );
file_set final;
- unsigned long long space = 0x100000000ULL;
// After looking at how big the ISO can be and how many 1K blocks are left after formatting the filesystem I decided on an even 4GB target
+ unsigned long long space = 0x100000000ULL;
insert_iterator<file_set> final_i( final, final.begin() );
insert_iterator<file_set> final_i( final, final.begin() );