リファクタリングによる修正

Author: tina227

bin/Makefile.in

@@ -79,7 +79,8 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_cobcrun_OBJECTS = cobcrun-cobcrun.$(OBJEXT)
 cobcrun_OBJECTS = $(am_cobcrun_OBJECTS)
-cobcrun_DEPENDENCIES = $(top_builddir)/libcob/libcob.la
+cobcrun_DEPENDENCIES = $(top_builddir)/libcob/libcob.la \
+	$(top_builddir)/lib/libsupport.a
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -236,7 +237,7 @@ bin_SCRIPTS = cob-config
 cobcrun_SOURCES = cobcrun.c
 AM_LDFLAGS = $(COB_EXPORT_DYN)
 cobcrun_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)
-cobcrun_LDADD = $(top_builddir)/libcob/libcob.la
+cobcrun_LDADD = $(top_builddir)/libcob/libcob.la $(top_builddir)/lib/libsupport.a
 all: all-am
 
 .SUFFIXES:

cobc/cobc.c

@@ -406,25 +406,25 @@ cb_text_list_add (struct cb_text_list *list, const char *text)
 #ifdef _WIN32
 #define strndup(x,y) _strndup(x,y)
 char *
-_strndup(char *src, int size)
+_strndup (char *src, int size)
 {
 	char *dup;
 	int srclen;
 
 	if (src == NULL) {
 		return NULL;
 	}
-	srclen = strlen(src);
+	srclen = strlen (src);
 	if (size > srclen) {
 		size = srclen;
 	}
-	dup = malloc(size + 1);
+	dup = malloc (size + 1);
 	if (dup == NULL) {
 		return NULL;
 	}
 
-	memset(dup, 0, size + 1);
-	memcpy(dup, src, size);
+	memset (dup, 0, size + 1);
+	memcpy (dup, src, size);
 	return dup;
 }
 #endif
@@ -817,7 +817,7 @@ cobc_sig_handler (int sig)
 static void
 cobc_print_version (void)
 {
-	puts ("opensource COBOL 1.3.2J");
+	puts ("opensource COBOL 1.4J");
 	puts ("OSS Consortium's patched version of OpenCOBOL1.1(Feb.06 2009)");
 #ifdef	I18N_UTF8
 	puts ("[unicode/utf-8 support]");
@@ -2267,13 +2267,13 @@ main (int argc, char *argv[])
 		putenv (p);
 	} else {
 #ifdef _WIN32
-		char *tmpdir = cobc_malloc(COB_SMALL_BUFF * sizeof(char));
-		if ((GetTempPathA(COB_SMALL_BUFF, tmpdir)) == 0) {
-			strcpy(tmpdir, "c:\\oscobol\\tmp");
+		char *tmpdir = cobc_malloc (COB_SMALL_BUFF * sizeof(char));
+		if ((GetTempPathA (COB_SMALL_BUFF, tmpdir)) == 0) {
+			strcpy (tmpdir, "c:\\oscobol\\tmp");
 		}
 		cob_tmpdir = tmpdir;
-		sprintf(buff, "TMPDIR=%s", cob_tmpdir);
-		putenv(buff);
+		sprintf (buff, "TMPDIR=%s", cob_tmpdir);
+		putenv (buff);
 #else
 		cob_tmpdir = "/tmp";
 		putenv ((char *)"TMPDIR=/tmp");

cobc/codegen.c

@@ -1816,7 +1816,7 @@ output_initialize_one (struct cb_initialize *p, cb_tree x)
 		value = CB_VALUE (f->values);
 
 		/* NATIONAL also needs no editing but mbchar conversion. */
-                if(CB_TREE_CATEGORY (x) == CB_CATEGORY_NATIONAL){
+                if (CB_TREE_CATEGORY (x) == CB_CATEGORY_NATIONAL) {
 			output_prefix ();
 			output ("cob_move(");
                         output_param (value, 1);
@@ -1825,7 +1825,7 @@ output_initialize_one (struct cb_initialize *p, cb_tree x)
                         output (");\n");
                         return;
                 }
-                if(CB_TREE_CATEGORY (x) == CB_CATEGORY_NATIONAL_EDITED){
+                if (CB_TREE_CATEGORY (x) == CB_CATEGORY_NATIONAL_EDITED) {
                         tmpx = cb_build_reference (f->name);
                         CB_REFERENCE (tmpx)->value = cb_ref (tmpx);
                         CB_TREE_CATEGORY (tmpx);
@@ -3032,8 +3032,8 @@ output_sort_proc (struct cb_sort_proc *p)
 	}
 	label_cache = l;
 	output_line ("frame_ptr->return_address = %d;", l->call_num);
-	output_prefix();
-	output("if (unlikely(*(int*)(");
+	output_prefix ();
+	output ("if (unlikely(*(int*)(");
 	output_param (p->sort_return, 0);
 	output (") != 0))\n");
 	output_prefix ();

cobc/pplex.c

@@ -422,7 +422,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='OpenCOBOL'
-PACKAGE_TARNAME='opensource-cobol-1.3.2J'
+PACKAGE_TARNAME='opensource-cobol-1.4J'
 PACKAGE_VERSION='1.1'
 PACKAGE_STRING='OpenCOBOL 1.1'
 PACKAGE_BUGREPORT='open-cobol-list@lists.sourceforge.net'
@@ -1858,7 +1858,7 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='opensource-cobol-1.3.2J'
+ PACKAGE='opensource-cobol-1.4J'
  VERSION='1.1'
 
 
@@ -24797,7 +24797,7 @@ _ACEOF
 
 		MYOLDLIBS="$LIBS"
 		export MYOCLIBS
-		for MYOCLIBS in db db-4.5 db-4.4 db-4.3 db-4.2 db-4.1
+		for MYOCLIBS in db db4 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1
 		do
 			LIBS="$MYOLDLIBS -l$MYOCLIBS"
 			if test "$cross_compiling" = yes; then
@@ -25863,6 +25863,147 @@ if test $ac_cv_lib_db_4_dbopen = yes; then
   USE_DB="yes" LIBCOB_LIBS="$LIBCOB_LIBS -ldb-4"
 fi
 
+fi
+
+		fi
+
+		if test "$USE_DB" != "yes"
+		then
+		echo "$as_me:$LINENO: checking for __db_open in -ldb4" >&5
+echo $ECHO_N "checking for __db_open in -ldb4... $ECHO_C" >&6
+if test "${ac_cv_lib_db4___db_open+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldb4  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char __db_open ();
+int
+main ()
+{
+__db_open ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_db4___db_open=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_db4___db_open=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_db4___db_open" >&5
+echo "${ECHO_T}$ac_cv_lib_db4___db_open" >&6
+if test $ac_cv_lib_db4___db_open = yes; then
+  USE_DB="yes" LIBCOB_LIBS="$LIBCOB_LIBS -ldb4"
+else
+  echo "$as_me:$LINENO: checking for dbopen in -ldb4" >&5
+echo $ECHO_N "checking for dbopen in -ldb4... $ECHO_C" >&6
+if test "${ac_cv_lib_db4_dbopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldb4  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dbopen ();
+int
+main ()
+{
+dbopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_db4_dbopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_db4_dbopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_db4_dbopen" >&5
+echo "${ECHO_T}$ac_cv_lib_db4_dbopen" >&6
+if test $ac_cv_lib_db4_dbopen = yes; then
+  USE_DB="yes" LIBCOB_LIBS="$LIBCOB_LIBS -ldb4"
+fi
+
 fi
 
 		fi

configure

@@ -23,7 +23,7 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT([OpenCOBOL],[1.1],[open-cobol-list@lists.sourceforge.net],[opensource-cobol-1.3.2J])
+AC_INIT([OpenCOBOL],[1.1],[open-cobol-list@lists.sourceforge.net],[opensource-cobol-1.4J])
 AC_CONFIG_SRCDIR([libcob.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])

configure.ac

@@ -732,7 +732,7 @@ sort_compare (const void *data1, const void *data2)
 		f2.data = (unsigned char *)data2 + sort_keys[i].offset;
 		if (COB_FIELD_IS_NUMERIC(&f1)) {
 			cmp = cob_numeric_cmp (&f1, &f2);
-		}else if (COB_FIELD_IS_NATIONAL(&f1)) {
+		} else if (COB_FIELD_IS_NATIONAL(&f1)) {
 			cmp = national_cmps (f1.data, f2.data, f1.size, sort_collate);
 		} else {
 			cmp = alnum_cmps (f1.data, f2.data, f1.size, sort_collate);