ENH: Removed redundant copies of getopt.c and getopt.h.

Now reusing the ones in codec/compat.

diff --git a/mj2/CMakeLists.txt b/mj2/CMakeLists.txt
index c1fa4bf31457438493c11f3e5107f7d26b40ea00..97968a74310d5c1b4cfb295430535499f8ac05dd 100644 (file)
--- a/mj2/CMakeLists.txt
+++ b/mj2/CMakeLists.txt
@@ -13,8 +13,10 @@ ENDIF(NOT BUILD_SHARED_LIBS)
 
 ADD_EXECUTABLE(frames_to_mj2
   frames_to_mj2.c
-  compat/getopt.c 
-  mj2_convert.c mj2.c )
+  ${PROJECT_SOURCE_DIR}/codec/compat/getopt.c
+  mj2_convert.c
+  mj2.c
+  )
 TARGET_LINK_LIBRARIES(frames_to_mj2 ${OPJ_PREFIX}openjpeg)
 IF(UNIX)
   TARGET_LINK_LIBRARIES(frames_to_mj2 m)
@@ -22,7 +24,10 @@ ENDIF(UNIX)
 
 ADD_EXECUTABLE(mj2_to_frames
     mj2_to_frames.c
-    compat/getopt.c mj2_convert.c mj2.c )
+    ${PROJECT_SOURCE_DIR}/codec/compat/getopt.c
+    mj2_convert.c
+    mj2.c
+    )
 TARGET_LINK_LIBRARIES(mj2_to_frames ${OPJ_PREFIX}openjpeg)
 IF(UNIX)
   TARGET_LINK_LIBRARIES(mj2_to_frames m)

diff --git a/mj2/compat/getopt.c b/mj2/compat/getopt.c
deleted file mode 100644 (file)
index 5673f31..0000000
--- a/mj2/compat/getopt.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*\r
- * Copyright (c) 1987, 1993, 1994\r
- *     The Regents of the University of California.  All rights reserved.\r
- *\r
- * Redistribution and use in source and binary forms, with or without\r
- * modification, are permitted provided that the following conditions\r
- * are met:\r
- * 1. Redistributions of source code must retain the above copyright\r
- *    notice, this list of conditions and the following disclaimer.\r
- * 2. Redistributions in binary form must reproduce the above copyright\r
- *    notice, this list of conditions and the following disclaimer in the\r
- *    documentation and/or other materials provided with the distribution.\r
- * 3. All advertising materials mentioning features or use of this software\r
- *    must display the following acknowledgement:\r
- *     This product includes software developed by the University of\r
- *     California, Berkeley and its contributors.\r
- * 4. Neither the name of the University nor the names of its contributors\r
- *    may be used to endorse or promote products derived from this software\r
- *    without specific prior written permission.\r
- *\r
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\r
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\r
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\r
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\r
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\r
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\r
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\r
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\r
- * SUCH DAMAGE.\r
- */\r
-\r
-/* last review : october 29th, 2002 */\r
-\r
-#if defined(LIBC_SCCS) && !defined(lint)\r
-static char sccsid[] = "@(#)getopt.c   8.3 (Berkeley) 4/27/95";\r
-#endif                         /* LIBC_SCCS and not lint */\r
-\r
-#include <stdio.h>\r
-#include <stdlib.h>\r
-#include <string.h>\r
-\r
-int opterr = 1,                        /* if error message should be printed */\r
-  optind = 1,                  /* index into parent argv vector */\r
-  optopt,                      /* character checked for validity */\r
-  optreset;                    /* reset getopt */\r
-char *optarg;                  /* argument associated with option */\r
-\r
-#define        BADCH   (int)'?'\r
-#define        BADARG  (int)':'\r
-#define        EMSG    ""\r
-\r
-/*\r
- * getopt --\r
- *     Parse argc/argv argument vector.\r
- */\r
-int getopt(nargc, nargv, ostr)\r
-int nargc;\r
-char *const *nargv;\r
-const char *ostr;\r
-{\r
-#  define __progname nargv[0]\r
-  static char *place = EMSG;   /* option letter processing */\r
-  char *oli;                   /* option letter list index */\r
-\r
-  if (optreset || !*place) {   /* update scanning pointer */\r
-    optreset = 0;\r
-    if (optind >= nargc || *(place = nargv[optind]) != '-') {\r
-      place = EMSG;\r
-      return (-1);\r
-    }\r
-    if (place[1] && *++place == '-') { /* found "--" */\r
-      ++optind;\r
-      place = EMSG;\r
-      return (-1);\r
-    }\r
-  }                            /* option letter okay? */\r
-  if ((optopt = (int) *place++) == (int) ':' ||\r
-      !(oli = strchr(ostr, optopt))) {\r
-    /*\r
-     * if the user didn't specify '-' as an option,\r
-     * assume it means -1.\r
-     */\r
-    if (optopt == (int) '-')\r
-      return (-1);\r
-    if (!*place)\r
-      ++optind;\r
-    if (opterr && *ostr != ':')\r
-      (void) fprintf(stderr,\r
-                    "%s: illegal option -- %c\n", __progname, optopt);\r
-    return (BADCH);\r
-  }\r
-  if (*++oli != ':') {         /* don't need argument */\r
-    optarg = NULL;\r
-    if (!*place)\r
-      ++optind;\r
-  } else {                     /* need an argument */\r
-    if (*place)                        /* no white space */\r
-      optarg = place;\r
-    else if (nargc <= ++optind) {      /* no arg */\r
-      place = EMSG;\r
-      if (*ostr == ':')\r
-       return (BADARG);\r
-      if (opterr)\r
-       (void) fprintf(stderr,\r
-                      "%s: option requires an argument -- %c\n",\r
-                      __progname, optopt);\r
-      return (BADCH);\r
-    } else                     /* white space */\r
-      optarg = nargv[optind];\r
-    place = EMSG;\r
-    ++optind;\r
-  }\r
-  return (optopt);             /* dump back option letter */\r
-}\r

diff --git a/mj2/compat/getopt.h b/mj2/compat/getopt.h
deleted file mode 100644 (file)
index 23299d1..0000000
--- a/mj2/compat/getopt.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* last review : october 29th, 2002 */\r
-\r
-#ifndef _GETOPT_H_\r
-#define _GETOPT_H_\r
-\r
-extern int opterr;\r
-extern int optind;\r
-extern int optopt;\r
-extern int optreset;\r
-extern char *optarg;\r
-\r
-extern int getopt(int nargc, char *const *nargv, const char *ostr);\r
-\r
-#endif                         /* _GETOPT_H_ */\r

diff --git a/mj2/frames_to_mj2.c b/mj2/frames_to_mj2.c
index 671ec8e5696bad61d335a71b4eaf50a96206c73f..9a5ba64005a053e5e4be98886a806820982e2d83 100644 (file)
--- a/mj2/frames_to_mj2.c
+++ b/mj2/frames_to_mj2.c
@@ -36,7 +36,7 @@
 #include "cio.h"
 #include "mj2.h"
 #include "mj2_convert.h"
-#include "compat/getopt.h"
+#include "getopt.h"
 
 /**
 Size of memory first allocated for MOOV box