diff options
Diffstat (limited to 'os2')
| -rw-r--r-- | os2/Changes | 6 | ||||
| -rw-r--r-- | os2/Makefile.SHs | 1 | ||||
| -rw-r--r-- | os2/diff.configure | 37 | ||||
| -rw-r--r-- | os2/os2.c | 113 | ||||
| -rw-r--r-- | os2/os2ish.h | 2 |
5 files changed, 157 insertions, 2 deletions
diff --git a/os2/Changes b/os2/Changes index 9678ea66e1..c69fb73205 100644 --- a/os2/Changes +++ b/os2/Changes @@ -144,6 +144,12 @@ after 5.003_27: returns immediately, thus Perl cannot wait for completion of started programs. +after 5.004_01: + flock emulation added (disable by setting env PERL_USE_FLOCK=0), + thanks to Rocco Caputo; + RSX bug with missing waitpid circomvented; + -S bug with full path with \ corrected. + before 5.004_02: -S switch to perl enables a search with additional extensions .cmd, .btm, .bat, .pl as well. This means that if you have diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs index 6b07e72dba..32af9ccffe 100644 --- a/os2/Makefile.SHs +++ b/os2/Makefile.SHs @@ -54,6 +54,7 @@ perl5.def: perl.linkexp echo ' "dlerror"' >>$@ echo ' "my_tmpfile"' >>$@ echo ' "my_tmpnam"' >>$@ + echo ' "my_flock"' >>$@ !NO!SUBS! if [ ! -z "$myttyname" ] ; then diff --git a/os2/diff.configure b/os2/diff.configure index 6d108c7d0d..a649869d2a 100644 --- a/os2/diff.configure +++ b/os2/diff.configure @@ -51,7 +51,16 @@ case "$libs" in '') ;; *) for thislib in $libs; do -@@ -4136,6 +4144,10 @@ +@@ -3968,6 +3976,8 @@ + : + elif try=`./loc $thislib X $libpth`; $test -f "$try"; then + : ++ elif try=`./loc $thislib$lib_ext X $libpth`; $test -f "$try"; then ++ : + elif try=`./loc Slib$thislib$lib_ext X $xlibpth`; $test -f "$try"; then + : + else +@@ -4152,6 +4162,10 @@ eval $xscan;\ $contains '^fprintf$' libc.list >/dev/null 2>&1; then eval $xrun @@ -194,7 +203,31 @@ dflt=`./try` case "$dflt" in [1-4][1-4][1-4][1-4]|12345678|87654321) -@@ -8692,7 +8714,7 @@ +@@ -8707,18 +8731,18 @@ + $cc $ccflags -c bar1.c >/dev/null 2>&1 + $cc $ccflags -c bar2.c >/dev/null 2>&1 + $cc $ccflags -c foo.c >/dev/null 2>&1 +-ar rc bar$lib_ext bar2.o bar1.o >/dev/null 2>&1 ++$ar rc bar$lib_ext bar2.o bar1.o >/dev/null 2>&1 + if $cc $ccflags $ldflags -o foobar foo.o bar$lib_ext $libs > /dev/null 2>&1 && + ./foobar >/dev/null 2>&1; then +- echo "ar appears to generate random libraries itself." ++ echo "$ar appears to generate random libraries itself." + orderlib=false + ranlib=":" +-elif ar ts bar$lib_ext >/dev/null 2>&1 && ++elif $ar ts bar$lib_ext >/dev/null 2>&1 && + $cc $ccflags $ldflags -o foobar foo.o bar$lib_ext $libs > /dev/null 2>&1 && + ./foobar >/dev/null 2>&1; then +- echo "a table of contents needs to be added with 'ar ts'." ++ echo "a table of contents needs to be added with '$ar ts'." + orderlib=false +- ranlib="ar ts" ++ ranlib="$ar ts" + else + case "$ranlib" in + :) ranlib='';; +@@ -8790,7 +8814,7 @@ '') $echo $n ".$c" if $cc $ccflags \ $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \ @@ -1196,3 +1196,116 @@ my_tmpfile () return fopen(my_tmpnam(NULL), "w+b"); /* Race condition, but grants TMP. */ } + +#undef flock + +/* This code was contributed by Rocco Caputo. */ +int +my_flock(int handle, int op) +{ + FILELOCK rNull, rFull; + ULONG timeout, handle_type, flag_word; + APIRET rc; + int blocking, shared; + static int use_my = -1; + + if (use_my == -1) { + char *s = getenv("USE_PERL_FLOCK"); + if (s) + use_my = atoi(s); + else + use_my = 1; + } + if (!(_emx_env & 0x200) || !use_my) + return flock(handle, op); /* Delegate to EMX. */ + + // is this a file? + if ((DosQueryHType(handle, &handle_type, &flag_word) != 0) || + (handle_type & 0xFF)) + { + errno = EBADF; + return -1; + } + // set lock/unlock ranges + rNull.lOffset = rNull.lRange = rFull.lOffset = 0; + rFull.lRange = 0x7FFFFFFF; + // set timeout for blocking + timeout = ((blocking = !(op & LOCK_NB))) ? 100 : 1; + // shared or exclusive? + shared = (op & LOCK_SH) ? 1 : 0; + // do not block the unlock + if (op & (LOCK_UN | LOCK_SH | LOCK_EX)) { + rc = DosSetFileLocks(handle, &rFull, &rNull, timeout, shared); + switch (rc) { + case 0: + errno = 0; + return 0; + case ERROR_INVALID_HANDLE: + errno = EBADF; + return -1; + case ERROR_SHARING_BUFFER_EXCEEDED: + errno = ENOLCK; + return -1; + case ERROR_LOCK_VIOLATION: + break; // not an error + case ERROR_INVALID_PARAMETER: + case ERROR_ATOMIC_LOCK_NOT_SUPPORTED: + case ERROR_READ_LOCKS_NOT_SUPPORTED: + errno = EINVAL; + return -1; + case ERROR_INTERRUPT: + errno = EINTR; + return -1; + default: + errno = EINVAL; + return -1; + } + } + // lock may block + if (op & (LOCK_SH | LOCK_EX)) { + // for blocking operations + for (;;) { + rc = + DosSetFileLocks( + handle, + &rNull, + &rFull, + timeout, + shared + ); + switch (rc) { + case 0: + errno = 0; + return 0; + case ERROR_INVALID_HANDLE: + errno = EBADF; + return -1; + case ERROR_SHARING_BUFFER_EXCEEDED: + errno = ENOLCK; + return -1; + case ERROR_LOCK_VIOLATION: + if (!blocking) { + errno = EWOULDBLOCK; + return -1; + } + break; + case ERROR_INVALID_PARAMETER: + case ERROR_ATOMIC_LOCK_NOT_SUPPORTED: + case ERROR_READ_LOCKS_NOT_SUPPORTED: + errno = EINVAL; + return -1; + case ERROR_INTERRUPT: + errno = EINTR; + return -1; + default: + errno = EINVAL; + return -1; + } + // give away timeslice + DosSleep(1); + } + } + + errno = 0; + return 0; +} diff --git a/os2/os2ish.h b/os2/os2ish.h index a1b6db9d68..b62e3d04d4 100644 --- a/os2/os2ish.h +++ b/os2/os2ish.h @@ -15,6 +15,7 @@ #define HAS_KILL #define HAS_WAIT #define HAS_DLERROR +#define HAS_WAITPID_RUNTIME (_emx_env & 0x200) /* USEMYBINMODE * This symbol, if defined, indicates that the program should @@ -125,6 +126,7 @@ char *my_tmpnam (char *); #define fwrite1 fwrite #define my_getenv(var) getenv(var) +#define flock my_flock void *emx_calloc (size_t, size_t); void emx_free (void *); |