|
Line 0
Link Here
|
|
|
1 |
--- scripts/radsqlrelay Sat Nov 4 12:58:14 2006 |
| 2 |
+++ scripts/radsqlrelay Wed Jan 23 00:54:27 2008 |
| 3 |
@@ -43,14 +43,13 @@ |
| 4 |
} |
| 5 |
|
| 6 |
# /!\ OS-dependent structure |
| 7 |
-# Linux struct flock |
| 8 |
-# short l_type; |
| 9 |
-# short l_whence; |
| 10 |
+# FreeBSD struct flock |
| 11 |
# off_t l_start; |
| 12 |
# off_t l_len; |
| 13 |
# pid_t l_pid; |
| 14 |
-# c2ph says: typedef='s2 l2 i', sizeof=16 |
| 15 |
-my $FLOCK_STRUCT = 's2l2i'; |
| 16 |
+# short l_type; |
| 17 |
+# short l_whence; |
| 18 |
+my $FLOCK_STRUCT = 'q2is2'; |
| 19 |
|
| 20 |
sub setlock($;$$) |
| 21 |
{ |
| 22 |
@@ -58,8 +57,8 @@ |
| 23 |
$start = 0 unless defined $start; |
| 24 |
$len = 0 unless defined $len; |
| 25 |
|
| 26 |
- #type whence start till pid |
| 27 |
- my $packed = pack($FLOCK_STRUCT, F_WRLCK, SEEK_SET, $start, $len, 0); |
| 28 |
+ #start till pid type whence |
| 29 |
+ my $packed = pack($FLOCK_STRUCT, $start, $len, 0, F_WRLCK, SEEK_SET); |
| 30 |
if (fcntl($fh, F_SETLKW, $packed)) { return 1 } |
| 31 |
else { return 0 } |
| 32 |
} |