faubackup2/src/common backup_control.cpp,1.9,1.10

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

Modified Files:
	backup_control.cpp 
Log Message:
rsync switch work with local backups


Index: backup_control.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/common/backup_control.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** backup_control.cpp	9 Jun 2005 15:32:51 -0000	1.9
--- backup_control.cpp	13 Jun 2005 20:12:35 -0000	1.10
***************
*** 78,82 ****
  	try {
  		globalConfig = new SettingsFileParser(conf_file);
! 	} catch(int i) {
  		globalConfig = NULL;
  	}
--- 78,83 ----
  	try {
  		globalConfig = new SettingsFileParser(conf_file);
! 	}
! 	catch(int i) {
  		globalConfig = NULL;
  	}
***************
*** 90,94 ****
  	int fd_in_remote;
  	int fd_out_remote;
! 	rsync = 0;
  
  	//create server process
--- 91,97 ----
  	int fd_in_remote;
  	int fd_out_remote;
! 	/* not specified from command line */
! 	if(rsync == -1)
! 		rsync = 0;
  
  	//create server process
***************
*** 114,117 ****
--- 117,124 ----
  	int fd_out_remote;
  
+ 	/* not specified from command line */
+ 	if(rsync == -1)
+ 		rsync = 1;
+ 
  	//create ssh process
  	string outp = "";
***************
*** 153,156 ****
--- 160,167 ----
  	int fd_out_remote;
  
+ 	/* not specified from command line */
+ 	if(rsync == -1)
+ 		rsync = 1;
+ 
  	//create ssh process
  	string outp = "";
***************
*** 309,313 ****
  	try {
  		globalConfig = new SettingsFileParser(conf_file);
! 	} catch(int i) {
  		globalConfig = NULL;
  	}
--- 320,325 ----
  	try {
  		globalConfig = new SettingsFileParser(conf_file);
! 	}
! 	catch(int i) {
  		globalConfig = NULL;
  	}



-------------------------------------------------------
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