faubackup2/src main.cpp,1.2,1.3

Martin Waitz <[email protected]> Tue, 07 Jun 2005 20:33:11 +0000
Newsgroups gmane.comp.sysutils.backup.faubackup.cvs
Message-ID <[email protected]>
Update of /cvsroot/faubackup/faubackup2/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2177/src

Modified Files:
	main.cpp 
Log Message:
whitespace cleanup

Index: main.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/main.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.cpp	7 Jun 2005 13:35:54 -0000	1.2
--- main.cpp	7 Jun 2005 20:33:09 -0000	1.3
***************
*** 42,46 ****
  }
  
! int main(int argc,const char **argv)
  {
  	setIntHandler();
--- 42,46 ----
  }
  
! int main(int argc, const char **argv)
  {
  	setIntHandler();
***************
*** 60,83 ****
  		{ "rsync", 'r', POPT_ARG_NONE, &rsync, 0,
  			"Use Rsync to transfer changed files" , NULL },
! 		                              { "one-file-system", 'x', POPT_ARG_NONE, &boundaries, 0,
! 		                                "don't cross filesystem boundaries"
! 		                                , NULL
! 		                              },
! 		                              { "dry-run", 'n', POPT_ARG_NONE, &do_nothing, 0,
! 		                                "don't cross filesystem boundaries"
! 		                                , NULL
! 		                              },
! 		                              { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0,
! 		                                "Mehr Argumente" },
  
! 		                              { "server", '\0', POPT_ARG_STRING, &server_destdir, 0,
! 		                                "Sollte nicht gezeigt werden", NULL },
! 		                              { "client", '\0', POPT_ARG_STRING, &client_sourcedir, 0,
! 		                                "Sollte nicht gezeigt werden", NULL },
! 		                              { "help", '?', POPT_ARG_NONE, &help, 0,
! 		                                "Help output", NULL},
! 		                              { NULL, '\0', 0, NULL, 0 }
! 	                              };
! 	if (help !=0) {
  		print_usage();
  		exit(0);
--- 60,80 ----
  		{ "rsync", 'r', POPT_ARG_NONE, &rsync, 0,
  			"Use Rsync to transfer changed files" , NULL },
! 		{ "one-file-system", 'x', POPT_ARG_NONE, &boundaries, 0,
! 		  "don't cross filesystem boundaries" , NULL },
! 		{ "dry-run", 'n', POPT_ARG_NONE, &do_nothing, 0,
! 		  "don't cross filesystem boundaries" , NULL },
! 		{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0,
! 		  "Mehr Argumente" },
  
! 		{ "server", '\0', POPT_ARG_STRING, &server_destdir, 0,
! 		  "Sollte nicht gezeigt werden", NULL },
! 		{ "client", '\0', POPT_ARG_STRING, &client_sourcedir, 0,
! 		  "Sollte nicht gezeigt werden", NULL },
! 		{ "help", '?', POPT_ARG_NONE, &help, 0,
! 		  "Help output", NULL},
! 		{ NULL, '\0', 0, NULL, 0 }
! 	};
! 
! 	if (help != 0) {
  		print_usage();
  		exit(0);
***************
*** 85,89 ****
  	/* argument parsing */
  	popt = poptGetContext("faubackup", argc, argv, options, 0);
! 	while( (rc = poptGetNextOpt(popt))  != -1 ) {
  		switch (rc) {
  		case 'v' :
--- 82,86 ----
  	/* argument parsing */
  	popt = poptGetContext("faubackup", argc, argv, options, 0);
! 	while ((rc = poptGetNextOpt(popt))  != -1) {
  		switch (rc) {
  		case 'v' :
***************
*** 92,96 ****
  		}
  	}
! 	if(rc<-1) {
  		print_usage();
  		fprintf(stderr, "%s: %s\n",
--- 89,93 ----
  		}
  	}
! 	if (rc < -1) {
  		print_usage();
  		fprintf(stderr, "%s: %s\n",
***************
*** 100,104 ****
  	//verbose = 1;
  	//rsync = 1;
! 	if(server_destdir) {
  		instance_name = "ssh-server";
  		char bla = 42;
--- 97,101 ----
  	//verbose = 1;
  	//rsync = 1;
! 	if (server_destdir) {
  		instance_name = "ssh-server";
  		char bla = 42;
***************
*** 107,111 ****
  		server(server_destdir, STDIN_FILENO, STDOUT_FILENO);
  		exit(0);
! 	} else if(client_sourcedir) {
  		instance_name = "ssh-client";
  		char bla = 42;
--- 104,108 ----
  		server(server_destdir, STDIN_FILENO, STDOUT_FILENO);
  		exit(0);
! 	} else if (client_sourcedir) {
  		instance_name = "ssh-client";
  		char bla = 42;
***************
*** 126,130 ****
  	}
  	struct cmdline_data destination = parseCmdArg(temp);
! 	if( poptPeekArg(popt) ) {
  		print_usage();
  		fprintf(stderr, "too many parameters\n");
--- 123,127 ----
  	}
  	struct cmdline_data destination = parseCmdArg(temp);
! 	if (poptPeekArg(popt)) {
  		print_usage();
  		fprintf(stderr, "too many parameters\n");



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