Skip to content

Fix/file control #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 5, 2023
Merged

Fix/file control #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b79e6b4
Fix CobolFile.java
kio-watanabe Dec 27, 2022
15ce388
Fix CobolFile.java
kio-watanabe Dec 27, 2022
e17adb9
Fix file-control.at
kio-watanabe Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions libcobj/src/jp/osscons/opensourcecobol/libcobj/file/CobolFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,10 @@ public int open_(String filename, int mode, int sharing) throws IOException {
case COB_OPEN_I_O:
fp =
FileChannel.open(
Paths.get(filename), StandardOpenOption.READ, StandardOpenOption.WRITE);
Paths.get(filename),
StandardOpenOption.READ,
StandardOpenOption.WRITE,
StandardOpenOption.CREATE);
break;
case COB_OPEN_EXTEND:
fp =
Expand Down Expand Up @@ -1021,7 +1024,7 @@ public void read(AbstractCobolField key, AbstractCobolField fnstatus, int read_o
read_opts &= ~COB_READ_LOCK;
}

if (this.organization == COB_ORG_INDEXED /* && bdb_env != null*/) {
if (this.organization == COB_ORG_INDEXED /* && bdb_env != null */) {
if (this.open_mode != COB_OPEN_I_O || (this.lock_mode & COB_LOCK_EXCLUSIVE) != 0) {
read_opts &= ~COB_READ_LOCK;
} else if ((this.lock_mode & COB_LOCK_AUTOMATIC) != 0
Expand Down
28 changes: 14 additions & 14 deletions tests/jp-compat.src/file-control.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([export OC_IO_CREATES=yes && ${COBCRUN} prog], [0], [00
AT_CHECK([export OC_IO_CREATES=yes && ${RUN_MODULE} prog], [0], [00
])

AT_CLEANUP
Expand Down Expand Up @@ -55,7 +55,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([export OC_IO_CREATES=yes && ${COBCRUN} prog], [0], [00
AT_CHECK([export OC_IO_CREATES=yes && ${RUN_MODULE} prog], [0], [00
])

AT_CLEANUP
Expand Down Expand Up @@ -88,7 +88,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([export OC_IO_CREATES=yes && ${COBCRUN} prog], [0], [00
AT_CHECK([export OC_IO_CREATES=yes && ${RUN_MODULE} prog], [0], [00
])

AT_CLEANUP
Expand Down Expand Up @@ -121,7 +121,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([export OC_IO_CREATES=yes && ${COBCRUN} prog], [0], [00
AT_CHECK([export OC_IO_CREATES=yes && ${RUN_MODULE} prog], [0], [00
])

AT_CLEANUP
Expand Down Expand Up @@ -152,7 +152,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([export OC_EXTEND_CREATES=yes && ${COBCRUN} prog], [0], [00
AT_CHECK([export OC_EXTEND_CREATES=yes && ${RUN_MODULE} prog], [0], [00
])

AT_CLEANUP
Expand Down Expand Up @@ -183,7 +183,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([export OC_EXTEND_CREATES=yes && ${COBCRUN} prog], [0], [00
AT_CHECK([export OC_EXTEND_CREATES=yes && ${RUN_MODULE} prog], [0], [00
])

AT_CLEANUP
Expand Down Expand Up @@ -216,7 +216,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([export OC_EXTEND_CREATES=yes && ${COBCRUN} prog], [0], [00
AT_CHECK([export OC_EXTEND_CREATES=yes && ${RUN_MODULE} prog], [0], [00
])

AT_CLEANUP
Expand Down Expand Up @@ -249,7 +249,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([export OC_EXTEND_CREATES=yes && ${COBCRUN} prog], [0], [00
AT_CHECK([export OC_EXTEND_CREATES=yes && ${RUN_MODULE} prog], [0], [00
])

AT_CLEANUP
Expand Down Expand Up @@ -281,7 +281,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([${COBCRUN} prog], [0], [00
AT_CHECK([${RUN_MODULE} prog], [0], [00
])

AT_CLEANUP
Expand Down Expand Up @@ -313,7 +313,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([${COBCRUN} prog], [0], [00
AT_CHECK([${RUN_MODULE} prog], [0], [00
])

AT_CLEANUP
Expand Down Expand Up @@ -347,7 +347,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([${COBCRUN} prog], [0], [00
AT_CHECK([${RUN_MODULE} prog], [0], [00
])

AT_CLEANUP
Expand Down Expand Up @@ -383,7 +383,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([${COBCRUN} prog], [0], [00
AT_CHECK([${RUN_MODULE} prog], [0], [00
])

AT_CLEANUP
Expand Down Expand Up @@ -419,7 +419,7 @@ AT_DATA([prog.cob], [
])

AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([${COBCRUN} prog], [0], [91
AT_CHECK([${RUN_MODULE} prog], [0], [91
])

AT_CLEANUP
Expand Down Expand Up @@ -449,7 +449,7 @@ AT_DATA([prog.cob], [

AT_CHECK([echo 000011112222 >TEST-FILE])
AT_CHECK([${COMPILE_MODULE} -o prog prog.cob])
AT_CHECK([COB_IO_ASSUME_REWRITE=Y ${COBCRUN} prog])
AT_CHECK([COB_IO_ASSUME_REWRITE=Y ${RUN_MODULE} prog])
AT_CHECK([test `cat TEST-FILE` = '0000AAAA2222'])

AT_CLEANUP
Expand Down