[Mt-daapd-cvs] mt-daapd/src wavstreamer.c,1.4,1.5

[Ron P. <rp...@us...>]

Update of /cvsroot/mt-daapd/mt-daapd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4637

Modified Files:
	wavstreamer.c 
Log Message:
make wavstreamer take a -l of 0, also remove long opts

Index: wavstreamer.c
===================================================================
RCS file: /cvsroot/mt-daapd/mt-daapd/src/wavstreamer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wavstreamer.c	29 May 2005 23:48:53 -0000	1.4
--- wavstreamer.c	14 Oct 2005 05:42:26 -0000	1.5
***************
*** 35,44 ****
  #include <unistd.h>
  
- #ifdef HAVE_GETOPT_H
- #include <getopt.h>
- #endif
- 
  char *av0;
  
  struct option longopts[] =
      { { "help",    0, NULL, 'h' },
--- 35,42 ----
  #include <unistd.h>
  
  char *av0;
  
+ #if 0 
+ /* need better longopt detection in configure.in */
  struct option longopts[] =
      { { "help",    0, NULL, 'h' },
***************
*** 47,50 ****
--- 45,49 ----
        { "offset",  1, NULL, '0' },
        { NULL,      0, NULL,  0  } };
+ #endif
  
  #define GET_WAV_INT32(p) ((((unsigned long)((p)[3])) << 24) |   \
***************
*** 234,240 ****
  	    "--samples and --length are mutually exclusive.\n");
  
! #ifndef HAVE_GETOPT_H
      fprintf(stderr,
! 	    "\n\nLong options are not availabl eon this system.\n");
  #endif
  
--- 233,239 ----
  	    "--samples and --length are mutually exclusive.\n");
  
! #if 1
      fprintf(stderr,
! 	    "\n\nLong options are not available on this system.\n");
  #endif
  
***************
*** 260,264 ****
  	av0 = argv[0];
  
! #ifdef HAVE_GETOPT_H
      while ((c = getopt_long(argc, argv, "+hl:o:s:", longopts, NULL)) != EOF) {
  #else
--- 259,263 ----
  	av0 = argv[0];
  
! #if 0
      while ((c = getopt_long(argc, argv, "+hl:o:s:", longopts, NULL)) != EOF) {
  #else
***************
*** 289,296 ****
--- 288,297 ----
  	    }
  
+ 	    /*
  	    if ((sec == 0) && (us == 0)) {
  		fprintf(stderr, "%s: Invalid -l argument (zero is not acceptable).\n", av0);
  		exit(-1);
  	    }
+ 	    */
  
  	    if (samples != 0) {