[Debburn-changes] r622 - in cdrkit/trunk: genisoimage wodim

[Eduard Bloch]

Author: blade
Date: 2006-12-14 23:12:40 +0100 (Thu, 14 Dec 2006)
New Revision: 622

Modified:
   cdrkit/trunk/genisoimage/CMakeLists.txt
   cdrkit/trunk/genisoimage/genisoimage.c
   cdrkit/trunk/genisoimage/genisoimage.h
   cdrkit/trunk/wodim/scsi_scan.c
Log:
Use external getopt declarations only if using external getopt. And use only local ones otherwise. And removed a nasty debug message.

Modified: cdrkit/trunk/genisoimage/CMakeLists.txt
===================================================================
--- cdrkit/trunk/genisoimage/CMakeLists.txt	2006-12-14 10:56:01 UTC (rev 621)
+++ cdrkit/trunk/genisoimage/CMakeLists.txt	2006-12-14 22:12:40 UTC (rev 622)
@@ -32,7 +32,7 @@
 SET(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
 CHECK_FUNCTION_EXISTS("getopt_long" HAVE_GETOPT_LONG)
 IF(NOT HAVE_GETOPT_LONG)
-LIST ( APPEND MKISOFS_MOST_SRCS  getopt.c getopt1.c )
+    LIST ( APPEND MKISOFS_MOST_SRCS  getopt.c getopt1.c )
 ENDIF(NOT HAVE_GETOPT_LONG)
  
 

Modified: cdrkit/trunk/genisoimage/genisoimage.c
===================================================================
--- cdrkit/trunk/genisoimage/genisoimage.c	2006-12-14 10:56:01 UTC (rev 621)
+++ cdrkit/trunk/genisoimage/genisoimage.c	2006-12-14 22:12:40 UTC (rev 622)
@@ -62,7 +62,13 @@
 #include <io.h>					/* for setmode() prototype */
 #endif
 
-#include "getopt.h"	/* Always include local (nonstandard) getopt.h */
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
+#include "getopt.h"
+extern int      optind;
+extern char     *optarg;
+#endif
 
 #ifdef VMS
 #include "vms.h"

Modified: cdrkit/trunk/genisoimage/genisoimage.h
===================================================================
--- cdrkit/trunk/genisoimage/genisoimage.h	2006-12-14 10:56:01 UTC (rev 621)
+++ cdrkit/trunk/genisoimage/genisoimage.h	2006-12-14 22:12:40 UTC (rev 622)
@@ -77,13 +77,6 @@
 #endif
 #endif
 
-#ifndef __SVR4
-extern int	optind;
-extern char	*optarg;
-
-/* extern int getopt (int __argc, char **__argv, char *__optstring); */
-#endif
-
 #include "iso9660.h"
 #include "defaults.h"
 #include <unls.h>

Modified: cdrkit/trunk/wodim/scsi_scan.c
===================================================================
--- cdrkit/trunk/wodim/scsi_scan.c	2006-12-14 10:56:01 UTC (rev 621)
+++ cdrkit/trunk/wodim/scsi_scan.c	2006-12-14 22:12:40 UTC (rev 622)
@@ -65,7 +65,6 @@
 	fprintf(f, "'%.8s' ", ip->vendor_info);
 	fprintf(f, "'%.16s' ", ip->prod_ident);
 	fprintf(f, "'%.4s' ", ip->prod_revision);
-	fprintf(stderr, "wtf, ganze vendor_info: %s\n", ip->vendor_info);
 	if (ip->add_len < 31) {
 		fprintf(f, "NON CCS ");
 	}