faubackup2/src/common backup_control.cpp,1.5,1.6

Update of /cvsroot/faubackup/faubackup2/src/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8958/common

Modified Files:
	backup_control.cpp 
Log Message:
alternate hardlink function - TODO: preserve Hardlinks


Index: backup_control.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/common/backup_control.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** backup_control.cpp	6 Jun 2005 19:45:06 -0000	1.5
--- backup_control.cpp	7 Jun 2005 11:39:12 -0000	1.6
***************
*** 9,15 ****
   
    $Log$
    Revision 1.5  2005/06/06 19:45:06  siermerk
    implemented variable blocksize based on filesize for rsync mode
! 
    Revision 1.4  2005/06/06 12:32:35  siermerk
    removed unused multiplexer-code
--- 9,18 ----
   
    $Log$
+   Revision 1.6  2005/06/07 11:39:12  siermerk
+   alternate hardlink function - TODO: preserve Hardlinks
+ 
    Revision 1.5  2005/06/06 19:45:06  siermerk
    implemented variable blocksize based on filesize for rsync mode
!  
    Revision 1.4  2005/06/06 12:32:35  siermerk
    removed unused multiplexer-code
***************
*** 167,172 ****
  	try {
  		globalConfig = new SettingsFileParser(conf_file);
! 	}
! 	catch(int i) {
  		globalConfig = NULL;
  	}
--- 170,174 ----
  	try {
  		globalConfig = new SettingsFileParser(conf_file);
! 	} catch(int i) {
  		globalConfig = NULL;
  	}
***************
*** 307,313 ****
  
  
! 
! 	XThread *distri = server_distributor(destdir, lastbackupdir, com_Distributor);
! 	XThread *receiv = server_file_recveiver(destdir, lastbackupdir, com_FileReceiver);
  	if(distri)
  		distri->wait();
--- 309,316 ----
  
  
! 	tempdir = dir_create(destdir);
! 	destinationdir = destdir;
! 	XThread *distri = server_distributor(tempdir, lastbackupdir, com_Distributor);
! 	XThread *receiv = server_file_recveiver(tempdir, lastbackupdir, com_FileReceiver);
  	if(distri)
  		distri->wait();
***************
*** 398,403 ****
  	try {
  		globalConfig = new SettingsFileParser(conf_file);
! 	}
! 	catch(int i) {
  		globalConfig = NULL;
  	}
--- 401,405 ----
  	try {
  		globalConfig = new SettingsFileParser(conf_file);
! 	} catch(int i) {
  		globalConfig = NULL;
  	}
***************
*** 448,452 ****
  	com.sendByte(blub);
  
! 	Distributor *distributor = new Distributor(com, lastbackupdir);
  
  	XThread * thread = new XThread;
--- 450,454 ----
  	com.sendByte(blub);
  
! 	Distributor *distributor = new Distributor(com, lastbackupdir, destdir);
  
  	XThread * thread = new XThread;
***************
*** 466,472 ****
  	XThread * thread = NULL;
  	if(!do_nothing) {
! 		tempdir = dir_create(destdir);
! 		destinationdir = destdir;
! 		FileReceiver * receiver = new FileReceiver(tempdir, lastbackupdir, com);
  		thread = new XThread;
  		thread->start(*receiver, &FileReceiver::receiveFiles);
--- 468,472 ----
  	XThread * thread = NULL;
  	if(!do_nothing) {
! 		FileReceiver * receiver = new FileReceiver(destdir, lastbackupdir, com);
  		thread = new XThread;
  		thread->start(*receiver, &FileReceiver::receiveFiles);



-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20