summaryrefslogtreecommitdiff
path: root/libc/debian/patches/libc-add-flock.patch
blob: 9260f17c42908704093f4261dbd77787bcc4696b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
Index: b/usr/src/lib/libc/port/sys/flock.c
===================================================================
--- /dev/null
+++ b/usr/src/lib/libc/port/sys/flock.c
@@ -0,0 +1,82 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
+/*
+ * Portions of this source code were derived from Berkeley 4.3 BSD
+ * under license from the Regents of the University of California.
+ */
+
+/*LINTLIBRARY*/
+
+#include <sys/types.h>
+#include <sys/file.h>
+#include <sys/fcntl.h>
+#include <errno.h>
+
+int
+flock(int fd, int operation)
+{
+	struct flock	fl;
+	int	cmd;
+	int	ret;
+
+	/* initialize the flock struct to set lock on entire file */
+	fl.l_whence = 0;
+	fl.l_start = 0;
+	fl.l_len = 0;
+	fl.l_type = 0;
+
+	/* In non-blocking lock, use F_SETLK for cmd, F_SETLKW otherwise */
+	if (operation & LOCK_NB) {
+		cmd = F_SETLK;
+		operation &= ~LOCK_NB;	/* turn off this bit */
+	} else
+		cmd = F_SETLKW;
+
+	switch (operation) {
+	case LOCK_UN:
+		fl.l_type |= F_UNLCK;
+		break;
+	case LOCK_SH:
+		fl.l_type |= F_RDLCK;
+		break;
+	case LOCK_EX:
+		fl.l_type |= F_WRLCK;
+		break;
+	default:
+		errno = EINVAL;
+		return (-1);
+	}
+
+	ret = fcntl(fd, cmd, &fl);
+
+	if (ret == -1 && errno == EACCES)
+		errno = EWOULDBLOCK;
+
+	return (ret);
+}
Index: b/usr/src/lib/libc/amd64/Makefile
===================================================================
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -193,6 +193,7 @@ COMSYSOBJS=			\
 	fchdir.o		\
 	fchroot.o		\
 	fdsync.o		\
+	flock.o		\
 	fpathconf.o		\
 	fstatfs.o		\
 	fstatvfs.o		\
Index: b/usr/src/lib/libc/i386/Makefile.com
===================================================================
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -217,6 +217,7 @@ COMSYSOBJS=			\
 	fchdir.o		\
 	fchroot.o		\
 	fdsync.o		\
+	flock.o		\
 	fpathconf.o		\
 	fstatfs.o		\
 	fstatvfs.o		\
Index: b/usr/src/lib/libc/port/mapfile-vers
===================================================================
--- a/usr/src/lib/libc/port/mapfile-vers
+++ b/usr/src/lib/libc/port/mapfile-vers
@@ -274,6 +274,7 @@ SYMBOL_VERSION DYSON_1 {
         error_message_count;
         error_one_per_line;
         error_print_progname;
+        flock;
         mempcpy;
         program_invocation_name;
         program_invocation_short_name;