Merge pull request #1184 from jan-cerny/move_getopt

Move fallback implementation of getopt to utils

Author: matusmarhefka

compat/CMakeLists.txt

@@ -9,10 +9,6 @@ if(NOT HAVE_STRPTIME)
 	list(APPEND COMPAT_SOURCES "strptime.c")
 endif()
 
-if(NOT HAVE_GETOPT_H)
-	list(APPEND COMPAT_SOURCES "getopt.c")
-endif()
-
 # dev_to_tty is used in the process and process58 probes that are UNIX only
 if(NOT HAVE_DEV_TO_TTY AND UNIX)
 	list(APPEND COMPAT_SOURCES "dev_to_tty.c")

compat/compat.h

@@ -57,32 +57,6 @@ typedef SSIZE_T ssize_t;
 
 #endif
 
-#ifndef HAVE_GETOPT_H
-
-#define __getopt_argv_const const
-#define no_argument		0
-#define required_argument	1
-#define optional_argument	2
-
-OSCAP_API extern char *optarg;
-OSCAP_API extern int optind;
-OSCAP_API extern int opterr;
-OSCAP_API extern int optopt;
-
-struct option
-{
-	const char *name;
-	int has_arg;
-	int *flag;
-	int val;
-};
-
-OSCAP_API int getopt_long(int ___argc, char *__getopt_argv_const *___argv,
-	const char *__shortopts,
-	const struct option *__longopts, int *__longind);
-
-#endif
-
 #if !defined(HAVE_DEV_TO_TTY) && !defined(OS_WINDOWS)
 #include <sys/types.h>
 #define ABBREV_DEV  1     /* remove /dev/         */

utils/CMakeLists.txt

@@ -1,5 +1,8 @@
 if(ENABLE_OSCAP_UTIL)
 	file(GLOB UTILS_SOURCES "*.c")
+	if(HAVE_GETOPT_H)
+		list(REMOVE_ITEM UTILS_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/getopt.c")
+	endif()
 	add_executable(oscap ${UTILS_SOURCES})
 	target_link_libraries(oscap openscap)
 	if(WIN32)

compat/getopt.c renamed to utils/getopt.c

@@ -25,11 +25,13 @@
 #include <config.h>
 #endif
 
+#ifndef HAVE_GETOPT_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "compat.h"
+#include "oscap-tool.h"
 
 
 #ifdef _LIBC
@@ -770,4 +772,6 @@ getopt_long(int argc, char *__getopt_argv_const *argv, const char *options,
 {
 	return _getopt_internal(argc, (char **)argv, options, long_options,
 		opt_index, 0, 0);
-}
+}
+
+#endif

utils/oscap-tool.h

@@ -199,3 +199,28 @@ extern struct oscap_module OSCAP_CVRF_MODULE;
 extern struct oscap_module OSCAP_CPE_MODULE;
 extern struct oscap_module OSCAP_INFO_MODULE;
 
+#ifndef HAVE_GETOPT_H
+
+#define __getopt_argv_const const
+#define no_argument		0
+#define required_argument	1
+#define optional_argument	2
+
+extern char *optarg;
+extern int optind;
+extern int opterr;
+extern int optopt;
+
+struct option
+{
+	const char *name;
+	int has_arg;
+	int *flag;
+	int val;
+};
+
+getopt_long(int ___argc, char *__getopt_argv_const *___argv,
+	const char *__shortopts,
+	const struct option *__longopts, int *__longind);
+
+#endif