[Box Backup-dev] Merges

[Chris Wilson]

Hi Martin,

> Can you go through this and check all your added catch blocks. At least
> one of them the catch(std::exception) doesn't do the same as the
> catch(...).

OK, fixed, I think. Please review for merge:

   svn diff -r 748:803 \
   http://bbdev.fluffy.co.uk/svn/box/chris/merge/bin/bbackupd/BackupDaemon.cpp

>> Fixed both. Please review for merge:
>>
>>    svn diff -r 766:800 \
>>    http://bbdev.fluffy.co.uk/svn/box/chris/general/bin/bbackupd/BackupClientDirectoryRecord.cpp
>
> Yep, that's ok now.

I just noticed that another patch got mixed in there: the one that uses 
en->d_type rather than ::lstat to identify excluded files/dirs on Win32.

I don't think it's ready to merge yet, so I removed it (it requires 
changes to emu.cpp as well to make it work, and it's not much tested) and 
merged the rest.

>> Thanks again! OK if I send you some more patches for review this weekend?
>
> Sure, just keep sending them as and when. I'll review them when I can
> grab some time. Can't guarantee it'll be this weekend though.

Thanks, please review for merge:

   svn diff -r 755:802
   http://bbdev.fluffy.co.uk/svn/box/chris/merge/bin/bbackupquery/BackupQueries.cpp

Cheers, Chris.
-- 
_ ___ __     _
  / __/ / ,__(_)_  | Chris Wilson <0000 at qwirx.com> - Cambs UK |
/ (_/ ,\/ _/ /_ \ | Security/C/C++/Java/Perl/SQL/HTML Developer |
\ _/_/_/_//_/___/ | We are GNU-free your mind-and your software |