[Box Backup-dev] Reviewing code -- help!

Chris Wilson boxbackup-dev@fluffy.co.uk
Wed, 7 Dec 2005 12:48:19 +0000 (GMT)


Hi all,

> svn diff http://bbdev.fluffy.co.uk/svn/box/trunk http://bbdev.fluffy.co.uk/svn/box/martin/autoconf
>
> I am planning on reviewing Jonathan's fixes and then merging his branch
> then my autoconf into trunk this afternoon, unless someone objects.

Fine by me. Please let me know when you're done, and I'll create a new 
win32 merge branch based off your new code.

> As I understand it the win32 branch to be merged is:
>
> svn diff http://bbdev.fluffy.co.uk/svn/box/trunk 
> http://bbdev.fluffy.co.uk/svn/box/chris/win32/11-code-cleanups/

As you pointed out in your next email, this is not a good idea - it undoes 
all changes in the trunk since 0.08.

If you want the raw win32 patch for 0.08, then run:

svn diff 
http://bbdev.fluffy.co.uk/svn/box/chris/win32/0-bens-original-0.08/ 
http://bbdev.fluffy.co.uk/svn/box/chris/win32/11-code-cleanups/

This is the patch for win32 without the other stuff (although it does 
still include BERKELY_V4), against 0.08. It's what I merged onto the 
trunk, resulting in 
[http://bbdev.fluffy.co.uk/svn/box/chris/win32/merge/01-apply-win32-patch-11/]

> I reviewed this one yesterday, and feel there's still a few things that
> could be improved before merging it. However, I was generally impressed
> with it, seems to be getting pretty close.

Thanks :-) Please do send any comments - feel free to drop me a private 
email for any small comment or question as it comes to mind, if you don't 
want to bother the list.

> The biggest issue I had with the win32 patch was a whole load of #ifdefs
> for (s)printf. This is really an issue with the box code - we really
> need to convert from printf to streams because printf is a portability
> disaster. I'm not sure at which stage it would be best to do this, maybe
> after the win32 merge.

I'd go with that too.

> Nick's non-win32 changes:
> - adding -i to bbackupquery
> - change to BackupClientRestore's handling when a file already exists

I think these are already in the trunk.

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 |