faubackup2/src main.cpp,1.13,1.14

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

Modified Files:
	main.cpp 
Log Message:
fix for broken popt arguments for ssh hidden servers


Index: main.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/main.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main.cpp	11 Jun 2005 21:41:56 -0000	1.13
--- main.cpp	12 Jun 2005 18:16:06 -0000	1.14
***************
*** 50,77 ****
  
  static const char doc[] =
! 	N_("FauBackup -- backup system using a filesystem for storage"
! 	   "\v"
! 	   "FauBackup uses a filesystem on a hard drive for incremental "
! 	   "and full backups. This enables the backup to be accessable "
! 	   "through standard filesystem tools.");
  
  static const char args_doc[] =
! 	N_("[host:]srcdir [host:]destdir");
  
! static const struct argp_option options[] = {
! 	{ "verbose", 'v', 0, 0,
! 		N_("produce verbose output") },
! 	{ "rsync", 'r', 0, OPTION_HIDDEN,
! 		N_("Use Rsync to transfer changed files")},
! 	{ "no-rsync", 'R', 0, 0,
! 		N_("Don't use Rsync to transfer changed files")},
! 	{ "one-file-system", 'x', 0, 0,
! 		N_("don't cross filesystem boundaries")},
! 	{ "dry-run", 'n', 0, 0,
! 		N_("don't create a new backup, test only")},
! 	{ "client", OPT_CLIENT, 0, OPTION_HIDDEN },
! 	{ "server", OPT_SERVER, 0, OPTION_HIDDEN },
! 	{ 0 }
! };
  
  /* parse options and arguments */
--- 50,79 ----
  
  static const char doc[] =
!         N_("FauBackup -- backup system using a filesystem for storage"
!            "\v"
!            "FauBackup uses a filesystem on a hard drive for incremental "
!            "and full backups. This enables the backup to be accessable "
!            "through standard filesystem tools.");
  
  static const char args_doc[] =
!         N_("[host:]srcdir [host:]destdir");
  
! static const struct argp_option options[] =
!         {
! 	        { "verbose", 'v', 0, 0,
! 		        N_("produce verbose output")
! 	        },
! 	        { "rsync", 'r', 0, OPTION_HIDDEN,
! 	          N_("Use Rsync to transfer changed files")},
! 	        { "no-rsync", 'R', 0, 0,
! 	          N_("Don't use Rsync to transfer changed files")},
! 	        { "one-file-system", 'x', 0, 0,
! 	          N_("don't cross filesystem boundaries")},
! 	        { "dry-run", 'n', 0, 0,
! 	          N_("don't create a new backup, test only")},
! 	        { "client", OPT_CLIENT, "Source" , OPTION_HIDDEN },
! 	        { "server", OPT_SERVER, "Destination", OPTION_HIDDEN},
! 	        { 0 }
!         };
  
  /* parse options and arguments */
***************
*** 79,83 ****
  parse_opt(int key, char * arg, struct argp_state * state)
  {
! 	switch (key) {
  	case 'v':
  		verbose++;
--- 81,86 ----
  parse_opt(int key, char * arg, struct argp_state * state)
  {
! 	switch (key)
! 	{
  	case 'v':
  		verbose++;
***************
*** 119,124 ****
  			if (client_sourcedir && server_destdir)
  				argp_usage(state);
! 			if (client_sourcedir) break;
! 			if (server_destdir) break;
  			argp_usage(state);
  		case 2:
--- 122,129 ----
  			if (client_sourcedir && server_destdir)
  				argp_usage(state);
! 			if (client_sourcedir)
! 				break;
! 			if (server_destdir)
! 				break;
  			argp_usage(state);
  		case 2:
***************
*** 137,141 ****
  }
  
! static const struct argp argp = { options, parse_opt, args_doc, doc };
  
  
--- 142,149 ----
  }
  
! static const struct argp argp =
!         {
! 	        options, parse_opt, args_doc, doc
!         };
  
  
***************
*** 160,165 ****
  		server(server_destdir, STDIN_FILENO, STDOUT_FILENO);
  		exit(0);
! 	}
! 	else
  		if (client_sourcedir) {
  			instance_name = "ssh-client";
--- 168,172 ----
  		server(server_destdir, STDIN_FILENO, STDOUT_FILENO);
  		exit(0);
! 	} else
  		if (client_sourcedir) {
  			instance_name = "ssh-client";



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