diff options
Diffstat (limited to 'lib/libc/sys')
| -rw-r--r-- | lib/libc/sys/__error.c | 4 | ||||
| -rw-r--r-- | lib/libc/sys/ftruncate.c | 17 | ||||
| -rw-r--r-- | lib/libc/sys/lseek.c | 18 |
3 files changed, 7 insertions, 32 deletions
diff --git a/lib/libc/sys/__error.c b/lib/libc/sys/__error.c index 9b0c25f..8c14b0f 100644 --- a/lib/libc/sys/__error.c +++ b/lib/libc/sys/__error.c @@ -29,6 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $FreeBSD$ */ #include <sys/cdefs.h> @@ -41,7 +42,8 @@ extern int errno; */ #pragma weak __error=__error_unthreaded -int * __error_unthreaded() +int * +__error_unthreaded() { return(&errno); } diff --git a/lib/libc/sys/ftruncate.c b/lib/libc/sys/ftruncate.c index 9d7d5fb..da81b43 100644 --- a/lib/libc/sys/ftruncate.c +++ b/lib/libc/sys/ftruncate.c @@ -29,6 +29,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) @@ -38,10 +40,6 @@ static char sccsid[] = "@(#)ftruncate.c 8.1 (Berkeley) 6/17/93"; #include <sys/types.h> #include <sys/syscall.h> #include <unistd.h> -#ifdef _THREAD_SAFE -#include <pthread.h> -#include "pthread_private.h" -#endif /* * This function provides 64-bit offset padding that @@ -53,16 +51,5 @@ ftruncate(fd, length) off_t length; { -#ifdef _THREAD_SAFE - int retval; - if (_FD_LOCK(fd, FD_RDWR, NULL) != 0) { - retval = -1; - } else { - retval = __syscall((quad_t)SYS_ftruncate, fd, 0, length); - _FD_UNLOCK(fd, FD_RDWR); - } - return(retval); -#else return(__syscall((quad_t)SYS_ftruncate, fd, 0, length)); -#endif } diff --git a/lib/libc/sys/lseek.c b/lib/libc/sys/lseek.c index 284885f..230940c 100644 --- a/lib/libc/sys/lseek.c +++ b/lib/libc/sys/lseek.c @@ -29,6 +29,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) @@ -38,10 +40,6 @@ static char sccsid[] = "@(#)lseek.c 8.1 (Berkeley) 6/17/93"; #include <sys/types.h> #include <sys/syscall.h> #include <unistd.h> -#ifdef _THREAD_SAFE -#include <pthread.h> -#include "pthread_private.h" -#endif /* * This function provides 64-bit offset padding that @@ -53,17 +51,5 @@ lseek(fd, offset, whence) off_t offset; int whence; { -#ifdef _THREAD_SAFE - off_t offs; - if (_FD_LOCK(fd, FD_RDWR, NULL) != 0) { - offs = -1; - } else { - offs = __syscall((quad_t) SYS_lseek,fd, 0, offset, whence); - _FD_UNLOCK(fd, FD_RDWR); - } - return(offs); - -#else return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); -#endif } |
