Add patch to fix getopt usage

2015-04-17 08:41:58 -06:00 · 2015-04-17 08:41:58 -06:00 · ff62a3090c
commit ff62a3090c
parent 2bc49957d5
2 changed files with 356 additions and 0 deletions
--- a/libdap-getopt.patch
+++ b/libdap-getopt.patch
@ -0,0 +1,352 @@
+diff -up libdap-3.14.0/DODSFilter.cc.getopt libdap-3.14.0/DODSFilter.cc
+--- libdap-3.14.0/DODSFilter.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/DODSFilter.cc	2015-04-17 08:31:53.957194018 -0600
+@@ -262,7 +262,7 @@ DODSFilter::process_options(int argc, ch
+     int option_char;
+     GetOpt getopt (argc, argv, "ce: v: d: f: r: l: o: u: t: ");
+ 
+-    while ((option_char = getopt()) != EOF) {
+    while ((option_char = getopt()) != -1) {
+         switch (option_char) {
+         case 'c': d_comp = true; break;
+         case 'e': set_ce(getopt.optarg); break;
+diff -up libdap-3.14.0/getdap4.cc.getopt libdap-3.14.0/getdap4.cc
+--- libdap-3.14.0/getdap4.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/getdap4.cc	2015-04-17 08:31:54.065195941 -0600
+@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
+     _setmode(_fileno(stdout), _O_BINARY);
+ #endif
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             get_dmr = true;
+diff -up libdap-3.14.0/getdap.cc.getopt libdap-3.14.0/getdap.cc
+--- libdap-3.14.0/getdap.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/getdap.cc	2015-04-17 08:31:54.089196369 -0600
+@@ -159,7 +159,7 @@ int main(int argc, char *argv[])
+     _setmode(_fileno(stdout), _O_BINARY);
+ #endif
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             get_dds = true;
+diff -up libdap-3.14.0/tests/das-test.cc.getopt libdap-3.14.0/tests/das-test.cc
+--- libdap-3.14.0/tests/das-test.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/tests/das-test.cc	2015-04-17 08:31:53.998194748 -0600
+@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
+     bool code_test = false;
+     bool deref_alias = false;
+     bool as_xml = false;
+-    while ((option_char = getopt ()) != EOF)
+    while ((option_char = getopt ()) != -1)
+ 	switch (option_char)
+ 	  {
+ 	    case 'p':
+diff -up libdap-3.14.0/tests/dds-test.cc.getopt libdap-3.14.0/tests/dds-test.cc
+--- libdap-3.14.0/tests/dds-test.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/tests/dds-test.cc	2015-04-17 08:31:53.995194695 -0600
+@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) {
+     string name = "";
+     // process options
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             ddsdebug = 1;
+diff -up libdap-3.14.0/tests/dmr-test.cc.getopt libdap-3.14.0/tests/dmr-test.cc
+--- libdap-3.14.0/tests/dmr-test.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/tests/dmr-test.cc	2015-04-17 08:31:53.990194606 -0600
+@@ -301,7 +301,7 @@ main(int argc, char *argv[])
+ 
+     // process options
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'p':
+             parse = true;
+diff -up libdap-3.14.0/tests/expr-test.cc.getopt libdap-3.14.0/tests/expr-test.cc
+--- libdap-3.14.0/tests/expr-test.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/tests/expr-test.cc	2015-04-17 08:31:54.001194802 -0600
+@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
+ 
+     // process options
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'b':
+             series_values = true;
+diff -up libdap-3.14.0/unit-tests/AttrTableTest.cc.getopt libdap-3.14.0/unit-tests/AttrTableTest.cc
+--- libdap-3.14.0/unit-tests/AttrTableTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/AttrTableTest.cc	2015-04-17 08:31:54.122196956 -0600
+@@ -417,9 +417,9 @@ int
+ main(int argc, char *argv[])
+ {
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+    int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+             case 'd':
+                 debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/chunked_iostream_test.cc.getopt libdap-3.14.0/unit-tests/chunked_iostream_test.cc
+--- libdap-3.14.0/unit-tests/chunked_iostream_test.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/chunked_iostream_test.cc	2015-04-17 08:31:54.133197152 -0600
+@@ -530,9 +530,9 @@ int
+ main(int argc, char *argv[])
+ {
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+    int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+             case 'd':
+                 debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/D4AsyncDocTest.cc.getopt libdap-3.14.0/unit-tests/D4AsyncDocTest.cc
+--- libdap-3.14.0/unit-tests/D4AsyncDocTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/D4AsyncDocTest.cc	2015-04-17 08:31:54.144197348 -0600
+@@ -304,8 +304,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
+    int option_char;
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/D4DimensionsTest.cc.getopt libdap-3.14.0/unit-tests/D4DimensionsTest.cc
+--- libdap-3.14.0/unit-tests/D4DimensionsTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/D4DimensionsTest.cc	2015-04-17 08:31:54.109196725 -0600
+@@ -226,9 +226,9 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+    int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/D4EnumTest.cc.getopt libdap-3.14.0/unit-tests/D4EnumTest.cc
+--- libdap-3.14.0/unit-tests/D4EnumTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/D4EnumTest.cc	2015-04-17 08:31:54.149197437 -0600
+@@ -222,8 +222,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
+    int option_char;
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/D4GroupTest.cc.getopt libdap-3.14.0/unit-tests/D4GroupTest.cc
+--- libdap-3.14.0/unit-tests/D4GroupTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/D4GroupTest.cc	2015-04-17 08:31:54.111196760 -0600
+@@ -348,9 +348,9 @@ int
+ main(int argc, char *argv[])
+ {
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+    int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+             case 'd':
+                 debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/D4MarshallerTest.cc.getopt libdap-3.14.0/unit-tests/D4MarshallerTest.cc
+--- libdap-3.14.0/unit-tests/D4MarshallerTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/D4MarshallerTest.cc	2015-04-17 08:31:54.150197455 -0600
+@@ -350,9 +350,9 @@ int main(int argc, char*argv[]) {
+     runner.setOutputter(CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cerr));
+ 
+     GetOpt getopt(argc, argv, "dw");
+-    char option_char;
+    int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = true;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/D4ParserSax2Test.cc.getopt libdap-3.14.0/unit-tests/D4ParserSax2Test.cc
+--- libdap-3.14.0/unit-tests/D4ParserSax2Test.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/D4ParserSax2Test.cc	2015-04-17 08:31:54.147197401 -0600
+@@ -344,9 +344,9 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "dp");
+-    char option_char;
+    int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/D4UnMarshallerTest.cc.getopt libdap-3.14.0/unit-tests/D4UnMarshallerTest.cc
+--- libdap-3.14.0/unit-tests/D4UnMarshallerTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/D4UnMarshallerTest.cc	2015-04-17 08:31:54.142197312 -0600
+@@ -330,9 +330,9 @@ int main(int argc, char*argv[]) {
+     runner.setOutputter(CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cerr));
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+    int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = true;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/DDSTest.cc.getopt libdap-3.14.0/unit-tests/DDSTest.cc
+--- libdap-3.14.0/unit-tests/DDSTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/DDSTest.cc	2015-04-17 08:31:54.139197259 -0600
+@@ -483,7 +483,7 @@ int main(int argc, char*argv[]) {
+     GetOpt getopt(argc, argv, "d");
+     int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/DDXParserTest.cc.getopt libdap-3.14.0/unit-tests/DDXParserTest.cc
+--- libdap-3.14.0/unit-tests/DDXParserTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/DDXParserTest.cc	2015-04-17 08:31:54.107196689 -0600
+@@ -700,7 +700,7 @@ int main(int argc, char*argv[]) {
+ 
+     GetOpt getopt(argc, argv, "d");
+     int option_char;
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+ 	switch (option_char) {
+ 	  case 'd':
+ 	    debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/DMRTest.cc.getopt libdap-3.14.0/unit-tests/DMRTest.cc
+--- libdap-3.14.0/unit-tests/DMRTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/DMRTest.cc	2015-04-17 08:31:54.136197205 -0600
+@@ -293,9 +293,9 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+    int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/HTTPCacheTest.cc.getopt libdap-3.14.0/unit-tests/HTTPCacheTest.cc
+--- libdap-3.14.0/unit-tests/HTTPCacheTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/HTTPCacheTest.cc	2015-04-17 08:31:54.114196814 -0600
+@@ -901,9 +901,9 @@ int main(int argc, char*argv[])
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+    int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+             case 'd':
+                 debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/HTTPConnectTest.cc.getopt libdap-3.14.0/unit-tests/HTTPConnectTest.cc
+--- libdap-3.14.0/unit-tests/HTTPConnectTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/HTTPConnectTest.cc	2015-04-17 08:31:54.117196867 -0600
+@@ -735,9 +735,9 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+    int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/RCReaderTest.cc.getopt libdap-3.14.0/unit-tests/RCReaderTest.cc
+--- libdap-3.14.0/unit-tests/RCReaderTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/RCReaderTest.cc	2015-04-17 08:31:54.135197188 -0600
+@@ -374,9 +374,9 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+    int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+             case 'd':
+                 debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/SequenceTest.cc.getopt libdap-3.14.0/unit-tests/SequenceTest.cc
+--- libdap-3.14.0/unit-tests/SequenceTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/SequenceTest.cc	2015-04-17 08:31:54.131197116 -0600
+@@ -423,7 +423,7 @@ int main(int argc, char*argv[]) {
+ 
+     GetOpt getopt(argc, argv, "d");
+     int option_char;
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/ServerFunctionsListUnitTest.cc.getopt libdap-3.14.0/unit-tests/ServerFunctionsListUnitTest.cc
+--- libdap-3.14.0/unit-tests/ServerFunctionsListUnitTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/ServerFunctionsListUnitTest.cc	2015-04-17 08:31:54.108196707 -0600
+@@ -184,7 +184,7 @@ int main(int argc, char*argv[]) {
+ 
+     GetOpt getopt(argc, argv, "d");
+     int option_char;
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/unit-tests/SignalHandlerTest.cc.getopt libdap-3.14.0/unit-tests/SignalHandlerTest.cc
+--- libdap-3.14.0/unit-tests/SignalHandlerTest.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/unit-tests/SignalHandlerTest.cc	2015-04-17 08:31:54.142197312 -0600
+@@ -133,9 +133,9 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+    int option_char;
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up libdap-3.14.0/VCPP/sample/getdap.cc.getopt libdap-3.14.0/VCPP/sample/getdap.cc
+--- libdap-3.14.0/VCPP/sample/getdap.cc.getopt	2015-02-12 20:16:20.000000000 -0700
+++ libdap-3.14.0/VCPP/sample/getdap.cc	2015-04-17 08:31:53.964194143 -0600
+@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
+     _setmode(_fileno(stdout), _O_BINARY);
+ #endif
+ 
+-    while ((option_char = getopt()) != EOF)
+    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             get_dds = true;
--- a/libdap.spec
+++ b/libdap.spec
@ -11,6 +11,8 @@ Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
 Patch0:  libdap-offline.patch
 # Fix flex types
 Patch1:  libdap-flex.patch
+# Fix getopt()
+Patch2:  libdap-getopt.patch

 # For autoreconf
 BuildRequires: libtool
@ -68,6 +70,7 @@ Documentation of the libdap library.
 %setup -q
 %patch0 -p1 -b .offline
 %patch1 -p1 -b .flex
+%patch2 -p1 -b .getopt
 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@ -141,6 +144,7 @@ make check
 * Thu Apr 16 2015 Orion Poplawski <orion@cora.nwra.com> - 3.14.0-1
 - Update to 3.14.0
 - Add patch to fix flex compilation
+- Add patch to fix getopt usage
 - Update offline patch for new test

 * Mon Feb 23 2015 Orion Poplawski <orion@cora.nwra.com> - 3.13.3-1