generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-10-21 23:56:57 +02:00
Code Issues Projects Releases Wiki Activity

Map getopt to bsd_getopt if we are using the overlay

Browse Source 
This will ensure the code can safely and correctly use optreset
transparently.
This commit is contained in:
Guillem Jover
2011-05-25 07:38:36 +02:00
parent 17a9a8472e
commit 9d04217174
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/bsd/getopt.h
View File

@@ -39,6 +39,11 @@
__BEGIN_DECLS __BEGIN_DECLS
extern int optreset; extern int optreset;
#ifdef LIBBSD_OVERLAY
#undef getopt
#define getopt(argc, argv, optstr) bsd_getopt(argc, argv, optstr)
#endif
int bsd_getopt (int, char **, char *); int bsd_getopt (int, char **, char *);
__END_DECLS __END_DECLS

6
src/bsd_getopt.c
View File

@@ -36,5 +36,9 @@ bsd_getopt(int argc, char **argv, char *shortopts)
optind = 0; optind = 0;
} }
return getopt(argc, argv, shortopts); /*
* Make sure we are using the system getopt() and not a possible
* overlay macro.
*/
return (getopt)(argc, argv, shortopts);
} }