Update of /home/cvsd/slony1/slony1-engine/src/slon
In directory main.slony.info:/tmp/cvs-serv19988/slon

Modified Files:
	slon.c 
Log Message:
Don't use long options for --help/--version (sorry Drew), but make sure
-h and -v are generated by slon -h option.


Index: slon.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/slon.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** slon.c	20 Jul 2007 17:33:29 -0000	1.75
--- slon.c	20 Jul 2007 19:59:54 -0000	1.76
***************
*** 96,101 ****
  	fprintf(stderr, "Options:\n");
  
!     fprintf(stderr, "    -h, --help            print usage message and exit\n")
!     fprintf(stedrr, "    -v, --version         print version and exit\n");
  	fprintf(stderr, "    -d <debuglevel>       verbosity of logging (1..4)\n");
  	fprintf(stderr, "    -s <milliseconds>     SYNC check interval (default 10000)\n");
--- 96,101 ----
  	fprintf(stderr, "Options:\n");
  
! 	fprintf(stderr, "    -h                    print usage message and exit\n");
! 	fprintf(stderr, "    -v                    print version and exit\n");
  	fprintf(stderr, "    -d <debuglevel>       verbosity of logging (1..4)\n");
  	fprintf(stderr, "    -s <milliseconds>     SYNC check interval (default 10000)\n");
***************
*** 137,144 ****
  	extern char *optarg;
  
-     static struct option longopts[] = {
-         { "help",       no_argument,    NULL,   "h"},
-         { "version",    no_argument,    NULL,   "v"}
-     };
  
  #ifdef WIN32
--- 137,140 ----
***************
*** 173,177 ****
  	InitializeConfOptions();
  
! 	while ((c = getopt_long(argc, argv, "f:a:d:s:t:g:c:p:o:q:r:l:x:hv?", longopts, NULL)) != -1)
  	{
  		switch (c)
--- 169,173 ----
  	InitializeConfOptions();
  
! 	while ((c = getopt(argc, argv, "f:a:d:s:t:g:c:p:o:q:r:l:x:hv?")) != EOF)
  	{
  		switch (c)