bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-06-18 06:46:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed flock() on AIX, Solaris

Browse source
This commit is contained in:
Gerhard Rieger 2025-01-11 18:48:58 +01:00
parent 2439276651
commit 3f4b171523
2 changed files with 5 additions and 0 deletions

3
CHANGES
View file

@ -76,6 +76,9 @@ Porting:
Fixes for old Scientific/RHEL Fixes for old Scientific/RHEL
Socat failed to build on platforms without flock() function (AIX,
Solaris) due to a missing guard.
Testing: Testing:
test.sh produces file results.txt with columns of test numbers, names, test.sh produces file results.txt with columns of test numbers, names,
and results. and results.

2
xioopts.c
View file

@ -3837,6 +3837,7 @@ int applyopt_sockopt_generic(
#endif /* _WITH_SOCKET */ #endif /* _WITH_SOCKET */
#if HAVE_FLOCK
int applyopt_flock( int applyopt_flock(
int fd, int fd,
struct opt *opt) struct opt *opt)
@ -3848,6 +3849,7 @@ int applyopt_flock(
} }
return 0; return 0;
} }
#endif /* defined(HAVE_FLOCK) */
/* Applies an option that needs handling specific to its OPT_* setting. /* Applies an option that needs handling specific to its OPT_* setting.
Does not overwrite the option instance with ODESC_DONE or ODESC_ERROR, Does not overwrite the option instance with ODESC_DONE or ODESC_ERROR,