| uipc_socket.c (18787) | uipc_socket.c (20030) |
|---|---|
| 1/* 2 * Copyright (c) 1982, 1986, 1988, 1990, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 | 1/* 2 * Copyright (c) 1982, 1986, 1988, 1990, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 |
| 34 * $Id: uipc_socket.c,v 1.19 1996/07/11 16:31:56 wollman Exp $ | 34 * $Id: uipc_socket.c,v 1.20 1996/10/07 04:32:26 pst Exp $ |
| 35 */ 36 37#include <sys/param.h> 38#include <sys/queue.h> 39#include <sys/systm.h> 40#include <sys/proc.h> 41#include <sys/file.h> 42#include <sys/malloc.h> --- 660 unchanged lines hidden (view full) --- 703 * it points to next record) when we drop priority; 704 * we must note any additions to the sockbuf when we 705 * block interrupts again. 706 */ 707 if (mp == 0) { 708 splx(s); 709 error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio); 710 s = splnet(); | 35 */ 36 37#include <sys/param.h> 38#include <sys/queue.h> 39#include <sys/systm.h> 40#include <sys/proc.h> 41#include <sys/file.h> 42#include <sys/malloc.h> --- 660 unchanged lines hidden (view full) --- 703 * it points to next record) when we drop priority; 704 * we must note any additions to the sockbuf when we 705 * block interrupts again. 706 */ 707 if (mp == 0) { 708 splx(s); 709 error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio); 710 s = splnet(); |
| 711 if (error) 712 goto release; |
|
| 711 } else 712 uio->uio_resid -= len; 713 if (len == m->m_len - moff) { 714 if (m->m_flags & M_EOR) 715 flags |= MSG_EOR; 716 if (flags & MSG_PEEK) { 717 m = m->m_next; 718 moff = 0; --- 352 unchanged lines hidden --- | 713 } else 714 uio->uio_resid -= len; 715 if (len == m->m_len - moff) { 716 if (m->m_flags & M_EOR) 717 flags |= MSG_EOR; 718 if (flags & MSG_PEEK) { 719 m = m->m_next; 720 moff = 0; --- 352 unchanged lines hidden --- |