Skip to content

Commit 036ae68

Browse files
authored
use the getopt from the system (#4260)
* remove getopt.[ch] * update getopg.h path to system
1 parent 4918937 commit 036ae68

File tree

25 files changed

+21
-1267
lines changed

25 files changed

+21
-1267
lines changed

batch_job/src/vine_factory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ See the file COPYING for details.
2525
#include "link_auth.h"
2626
#include "list.h"
2727
#include "get_line.h"
28-
#include "getopt.h"
28+
#include <getopt.h>
2929
#include "path.h"
3030
#include "buffer.h"
3131
#include "rmsummary.h"

batch_job/src/work_queue_factory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ See the file COPYING for details.
2525
#include "link_auth.h"
2626
#include "list.h"
2727
#include "get_line.h"
28-
#include "getopt.h"
28+
#include <getopt.h>
2929
#include "path.h"
3030
#include "buffer.h"
3131
#include "rmsummary.h"

configure

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -825,21 +825,6 @@ fi
825825
report_detection curl "${curl_avail}" "${config_curl_path}" "${curl_path}"
826826

827827

828-
if [ $BUILD_SYS = DARWIN ]
829-
then
830-
if [ -d "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include" ]
831-
then
832-
ccflags_append_define CCTOOLS_OSX_GETOPT_FROM_SDK
833-
else
834-
# The version of getopt.h packaged in cctools appears to cause a SIGBUS on Darwin.
835-
# Mac OS X Command Line Tools need to be installed to obtain a getopt.h that works.
836-
echo "*** Sorry, I can't proceed without Mac OS X Command Line Tools."
837-
echo "*** Please refer to the installation instructions."
838-
exit 1
839-
fi
840-
fi
841-
842-
843828
### version requirements for swig:
844829
# at least version 1.3.29 for python 2.4--2.7
845830
# at least version 2.0.4 for python 3.0--

deltadb/src/catalog_server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ See the file COPYING for details.
1111
#include "datagram.h"
1212
#include "link.h"
1313
#include "debug.h"
14-
#include "getopt.h"
14+
#include <getopt.h>
1515
#include "nvpair.h"
1616
#include "nvpair_jx.h"
1717
#include "deltadb.h"

deltadb/src/deltadb_query_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <stdarg.h>
1010
#include <ctype.h>
1111

12-
#include "getopt.h"
12+
#include <getopt.h>
1313
#include "cctools.h"
1414
#include "jx_parse.h"
1515
#include "jx_print.h"

devel/confuga/src/confuga_adm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ See the file COPYING for details.
99
#include "catch.h"
1010
#include "cctools.h"
1111
#include "debug.h"
12-
#include "getopt.h"
12+
#include <getopt.h>
1313
#include "random.h"
1414

1515
#include <errno.h>

dttools/src/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ SOURCES = \
5050
full_io.c \
5151
get_canonical_path.c \
5252
get_line.c \
53-
getopt.c \
5453
getopt_aux.c \
5554
gpu_info.c \
5655
hash_cache.c \
@@ -147,7 +146,6 @@ HEADERS_PUBLIC = \
147146
fast_popen.h \
148147
file_link_recursive.h \
149148
full_io.h \
150-
getopt.h \
151149
getopt_aux.h \
152150
hash_table.h \
153151
histogram.h \

dttools/src/auth_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ See the file COPYING for details.
77

88
#include "auth.h"
99
#include "link.h"
10-
#include "getopt.h"
10+
#include <getopt.h>
1111
#include "debug.h"
1212
#include "domain_name_cache.h"
1313
#include "auth_all.h"

dttools/src/catalog_update.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ See the file COPYING for details.
1515
#include "stringtools.h"
1616
#include "username.h"
1717
#include "uptime.h"
18-
#include "getopt.h"
18+
#include <getopt.h>
1919
#include "cctools.h"
2020

2121
#include <stdlib.h>

dttools/src/disk_allocator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ See the file COPYING for details.
1010
#include <inttypes.h>
1111
#include <unistd.h>
1212
#include <string.h>
13-
#include "getopt.h"
13+
#include <getopt.h>
1414
#include "disk_alloc.h"
1515
#include "stringtools.h"
1616
#include "cctools.h"

0 commit comments

Comments
 (0)