Merge pull request #102 from opensourcecobol/develop

v1.0.11

Author: yutaro-sakamoto

.github/workflows/cicd.yml

@@ -90,7 +90,7 @@ jobs:
       - name: Run NIST test
         run: |
           export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
-          cd tests/cobol85/
+          cd tests/cobol85
           make test
 
           #- name: Run tests "i18n_utf8"

.github/workflows/codeql.yml

@@ -0,0 +1,89 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "develop" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "develop" ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp', 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    # - name: Autobuild
+    #   uses: github/codeql-action/autobuild@v2
+
+    - name: Install dependencies on Ubuntu 22.04
+      run: |
+        sudo apt-get update -y
+        sudo apt-get install -y default-jdk build-essential bison flex gettext texinfo automake autoconf
+      
+    - name: Install opensource COBOL 4J
+      run: |
+        mkdir ~/.java_lib
+        curl -L -o ~/.java_lib/sqlite.jar https://github.com/xerial/sqlite-jdbc/releases/download/3.36.0.3/sqlite-jdbc-3.36.0.3.jar
+        export CLASSPATH=":$HOME/.java_lib/sqlite.jar"
+        ./configure --prefix=/usr/
+        make
+        sudo make install
+        export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

ChangeLog

@@ -1,3 +1,7 @@
+2023-05-31  OSS Consortium <ws-opensource-cobol-contact@osscons.jp>
+
+	* opensource COBOL 4J v1.0.11 released.
+
 2023-04-28  OSS Consortium <ws-opensource-cobol-contact@osscons.jp>
 
 	* opensource COBOL 4J v1.0.10 released.

NEWS

@@ -2,6 +2,18 @@ NEWS - user visible changes				-*- outline -*-
 
 -----------------------------------------------------------------------
 
+* opensource COBOL 4J 1.0.11
+
+** New Features
+  (1) Add -j and -java-source-dir options to control the file paths where Java files are generated
+  (2) Add -o and -class-file-dir options to control the file paths where class files are generated
+
+** Bug fixes
+  (1) Fix a bug related to RELATIVE files
+  (2) Fix a minor bug
+
+-----------------------------------------------------------------------
+
 * opensource COBOL 4J 1.0.10
 
 ** Bug fixes

cobj/cobj.c

@@ -229,7 +229,8 @@ static pid_t cob_process_id = 0;
 static int strip_output = 0;
 static int gflag_set = 0;
 
-static char *output_name;
+static char *output_name = NULL;
+static char *java_source_dir = NULL;
 
 static const char *cob_tmpdir; /* /tmp */
 
@@ -248,7 +249,7 @@ static cob_sighandler_t intsig = NULL;
 static cob_sighandler_t qutsig = NULL;
 #endif
 
-static const char short_options[] = "hVvECbmxgwo:t:I:L:l:D:";
+static const char short_options[] = "hVvECbmxgwo:j:t:I:L:l:D:";
 
 static const struct option long_options[] = {
     {"help", no_argument, NULL, 'h'},
@@ -264,6 +265,8 @@ static const struct option long_options[] = {
     {"std", required_argument, NULL, '$'},
     {"conf", required_argument, NULL, '&'},
     {"debug", no_argument, NULL, 'd'},
+    {"class-file-dir", optional_argument, NULL, 'o'},
+    {"java-source-dir", optional_argument, NULL, 'j'},
     {"ext", required_argument, NULL, 'e'},
     {"free", no_argument, &cb_source_format, CB_FORMAT_FREE},
     {"free_1col_aster", no_argument, &cb_source_format,
@@ -762,6 +765,8 @@ static void cobc_print_usage(void) {
   puts(_("  -free_1col_aster                  Use free(1col_aster) source "
          "format"));
   puts(_("  -g                                Enable Java compiler debug"));
+  puts(_("  -o <dir>, -class-file-dir=<dir>   Place class files into <dir>"));
+  puts(_("  -j <dir>, -java-source-dir=<dir>  Place Java files into <dir>"));
   puts(_("  -E                                Preprocess only; do not compile "
          "or link"));
   puts(_("  -C                                Translation only; convert COBOL "
@@ -916,10 +921,17 @@ static int process_command_line(const int argc, char *argv[]) {
       break;
 
     case 'o':
-      /* -o : Output file */
+      /* -o : the directory where class files are stored */
+      /* -class-file-dir : the directory where class files are stored */
       output_name = strdup(optarg);
       break;
 
+    case 'j':
+      /* -j : the directory where java files are stored */
+      /* -java-source-dir : the directory where java files are stored */
+      java_source_dir = strdup(optarg);
+      break;
+
     case 'g':
       /* -g : Generate C debug code */
       save_csrc = 1;
@@ -1593,7 +1605,8 @@ static int process_translate(struct filename *fn) {
   for (int i = 0; i < PROGRAM_ID_LIST_MAX_LEN; ++i) {
     program_id_list[i] = NULL;
   }
-  codegen(p, 0, program_id_list);
+  codegen(p, 0, program_id_list,
+          java_source_dir == NULL ? "./" : java_source_dir);
 
   return 0;
 }
@@ -1616,7 +1629,10 @@ static int process_compile(struct filename *fn) {
   }
 
   for (char **program_id = program_id_list; *program_id; ++program_id) {
-    sprintf(buff, "javac %s -encoding SJIS -d . %s.java", cob_java_flags,
+    char *java_source_dir_a = java_source_dir == NULL ? "./" : java_source_dir;
+    char *output_name_a = output_name == NULL ? "./" : output_name;
+    sprintf(buff, "javac %s -encoding SJIS -sourcepath %s -d %s %s/%s.java",
+            cob_java_flags, java_source_dir_a, output_name_a, java_source_dir_a,
             *program_id);
     ret = process(buff);
   }

cobj/codegen.c

@@ -5512,8 +5512,8 @@ void joutput_execution_entry_func() {
   joutput_line("}");
 }
 
-void codegen(struct cb_program *prog, const int nested,
-             char **program_id_list) {
+void codegen(struct cb_program *prog, const int nested, char **program_id_list,
+             char *java_source_dir) {
   int i;
   cb_tree l;
   struct field_list *k;
@@ -5545,8 +5545,8 @@ void codegen(struct cb_program *prog, const int nested,
 
   // modify 8/29 11:00
   joutput_target = yyout;
-  char java_file_name[64];
-  sprintf(java_file_name, "%s.java", prog->program_id);
+  char java_file_name[1024];
+  sprintf(java_file_name, "%s/%s.java", java_source_dir, prog->program_id);
   *program_id_list = (char *)prog->program_id;
   joutput_target = fopen(java_file_name, "w");
 
@@ -5834,7 +5834,7 @@ void codegen(struct cb_program *prog, const int nested,
     joutput_line("}");
     fclose(joutput_target);
     ++program_id_list;
-    codegen(prog->next_program, 1, program_id_list);
+    codegen(prog->next_program, 1, program_id_list, java_source_dir);
     return;
   }
 

cobj/tree.h

@@ -1568,7 +1568,7 @@ extern void cobc_tree_cast_error(cb_tree x, const char *filen,
 
 /* codegen.c */
 extern void codegen(struct cb_program *prog, const int nested,
-                    char **program_id_list);
+                    char **program_id_list, char *java_source_dir);
 
 /* scanner.l */
 extern void cb_set_in_procedure(void);

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for opensource COBOL 4J 1.0.10.
+# Generated by GNU Autoconf 2.71 for opensource COBOL 4J 1.0.11.
 #
 # Report bugs to <ws-opensource-cobol-contact@osscons.jp>.
 #
@@ -620,9 +620,9 @@ MAKEFLAGS=
 
 # Identity of this package.
 PACKAGE_NAME='opensource COBOL 4J'
-PACKAGE_TARNAME='opensource-cobol-4j-1.0.10'
-PACKAGE_VERSION='1.0.10'
-PACKAGE_STRING='opensource COBOL 4J 1.0.10'
+PACKAGE_TARNAME='opensource-cobol-4j-1.0.11'
+PACKAGE_VERSION='1.0.11'
+PACKAGE_STRING='opensource COBOL 4J 1.0.11'
 PACKAGE_BUGREPORT='ws-opensource-cobol-contact@osscons.jp'
 PACKAGE_URL=''
 
@@ -1414,7 +1414,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures opensource COBOL 4J 1.0.10 to adapt to many kinds of systems.
+\`configure' configures opensource COBOL 4J 1.0.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1464,7 +1464,7 @@ Fine tuning of the installation directories:
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
   --docdir=DIR            documentation root
-                          [DATAROOTDIR/doc/opensource-cobol-4j-1.0.10]
+                          [DATAROOTDIR/doc/opensource-cobol-4j-1.0.11]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1486,7 +1486,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opensource COBOL 4J 1.0.10:";;
+     short | recursive ) echo "Configuration of opensource COBOL 4J 1.0.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1617,7 +1617,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opensource COBOL 4J configure 1.0.10
+opensource COBOL 4J configure 1.0.11
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2105,7 +2105,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by opensource COBOL 4J $as_me 1.0.10, which was
+It was created by opensource COBOL 4J $as_me 1.0.11, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3403,8 +3403,8 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='opensource-cobol-4j-1.0.10'
- VERSION='1.0.10'
+ PACKAGE='opensource-cobol-4j-1.0.11'
+ VERSION='1.0.11'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -25367,7 +25367,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by opensource COBOL 4J $as_me 1.0.10, which was
+This file was extended by opensource COBOL 4J $as_me 1.0.11, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25435,7 +25435,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-opensource COBOL 4J config.status 1.0.10
+opensource COBOL 4J config.status 1.0.11
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -19,7 +19,7 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT([opensource COBOL 4J],[1.0.10],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-4j-1.0.10])
+AC_INIT([opensource COBOL 4J],[1.0.11],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-4j-1.0.11])
 AC_CONFIG_SRCDIR([libcob.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])

libcobj/src/jp/osscons/opensourcecobol/libcobj/data/AbstractCobolField.java

@@ -1454,6 +1454,7 @@ public void realPutSign(int sign) {
         } else if (sign < 0) {
           p.setByte(0, (byte) (b + 0x40));
         }
+        return;
       case CobolFieldAttribute.COB_TYPE_NUMERIC_PACKED:
         p = this.getDataStorage().getSubDataStorage(this.size - 1);
         if (sign < 0) {

libcobj/src/jp/osscons/opensourcecobol/libcobj/file/CobolRelativeFile.java

@@ -19,6 +19,7 @@
 package jp.osscons.opensourcecobol.libcobj.file;
 
 import java.io.*;
+import java.nio.ByteBuffer;
 import java.nio.channels.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -283,7 +284,7 @@ public int read_(AbstractCobolField key, int readOpts) {
         return COB_STATUS_23_KEY_NOT_EXISTS;
       }
 
-      if (this.record.getSize() == 0) {
+      if (ByteBuffer.wrap(size).getLong() == 0) {
         this.fp.seek(this.fp.getFilePointer() - size.length);
         return COB_STATUS_23_KEY_NOT_EXISTS;
       }

tests/Makefile.am

@@ -153,7 +153,8 @@ command_line_options_DEPENDENCIES = \
 	command-line-options.src/fserial-variable.at \
 	command-line-options.src/fshort-variable.at \
 	command-line-options.src/java-package.at \
-	command-line-options.src/edit-code-command.at
+	command-line-options.src/edit-code-command.at \
+	command-line-options.src/file-path.at
 
 misc_DEPENDENCIES = \
 	misc.src/signed-comp3.at \

tests/Makefile.in

@@ -694,7 +694,8 @@ command_line_options_DEPENDENCIES = \
 	command-line-options.src/fserial-variable.at \
 	command-line-options.src/fshort-variable.at \
 	command-line-options.src/java-package.at \
-	command-line-options.src/edit-code-command.at
+	command-line-options.src/edit-code-command.at \
+	command-line-options.src/file-path.at
 
 misc_DEPENDENCIES = \
 	misc.src/signed-comp3.at \