Add namespace to getopt functions

This enables static linking. Otherwise, these functions conflict with the standard getopt functions.
lh3 · Mar 19, 2018 · 5a5a116 · 5a5a116
1 parent b81d455
commit 5a5a116
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/getopt.c b/getopt.c
@@ -3,10 +3,15 @@
 #include <string.h>
 #include "getopt.h"
 
-char *optarg;
-int optind=1, opterr=1, optopt, __optpos, optreset=0;
+char *mm_optarg;
+int mm_optind=1, mm_opterr=1, mm_optopt, __optpos, mm_optreset=0;
 
 #define optpos __optpos
+#define optarg mm_optarg
+#define optind mm_optind
+#define opterr mm_opterr
+#define optopt mm_optopt
+#define optreset mm_optreset
 
 static void __getopt_msg(const char *a, const char *b, const char *c, size_t l)
 {
@@ -23,7 +28,7 @@ static void __getopt_msg(const char *a, const char *b, const char *c, size_t l)
 #endif
 }
 
-int getopt(int argc, char * const argv[], const char *optstring)
+int mm_getopt(int argc, char * const argv[], const char *optstring)
 {
 	int i, c, d;
 	int k, l;
@@ -173,7 +178,7 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
 			return '?';
 		}
 	}
-	return getopt(argc, argv, optstring);
+	return mm_getopt(argc, argv, optstring);
 }
 
 static int __getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
@@ -205,12 +210,12 @@ static int __getopt_long(int argc, char *const *argv, const char *optstring, con
 	return ret;
 }
 
-int getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx)
+int mm_getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx)
 {
 	return __getopt_long(argc, argv, optstring, longopts, idx, 0);
 }
 
-int getopt_long_only(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx)
+int mm_getopt_long_only(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx)
 {
 	return __getopt_long(argc, argv, optstring, longopts, idx, 1);
 }
diff --git a/getopt.h b/getopt.h
@@ -28,9 +28,9 @@
 extern "C" {
 #endif
 
-int getopt(int, char * const [], const char *);
-extern char *optarg;
-extern int optind, opterr, optopt, optreset;
+int mm_getopt(int, char * const [], const char *);
+extern char *mm_optarg;
+extern int mm_optind, mm_opterr, mm_optopt, mm_optreset;
 
 struct option {
 	const char *name;
@@ -39,8 +39,8 @@ struct option {
 	int val;
 };
 
-int getopt_long(int, char *const *, const char *, const struct option *, int *);
-int getopt_long_only(int, char *const *, const char *, const struct option *, int *);
+int mm_getopt_long(int, char *const *, const char *, const struct option *, int *);
+int mm_getopt_long_only(int, char *const *, const char *, const struct option *, int *);
 
 #define no_argument        0
 #define required_argument  1