| linux_ioctl.c (208486) | linux_ioctl.c (212425) |
|---|---|
| 1/*- 2 * Copyright (c) 1994-1995 S�ren Schmidt 3 * 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 --- 15 unchanged lines hidden (view full) --- 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 */ 28 29#include "opt_compat.h" 30 31#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1994-1995 S�ren Schmidt 3 * 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 --- 15 unchanged lines hidden (view full) --- 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 */ 28 29#include "opt_compat.h" 30 31#include <sys/cdefs.h> |
| 32__FBSDID("$FreeBSD: head/sys/compat/linux/linux_ioctl.c 208486 2010-05-24 07:04:00Z wkoszek $"); | 32__FBSDID("$FreeBSD: head/sys/compat/linux/linux_ioctl.c 212425 2010-09-10 16:42:16Z mdf $"); |
| 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/sysproto.h> 37#include <sys/cdio.h> 38#include <sys/dvdio.h> 39#include <sys/conf.h> 40#include <sys/disk.h> --- 2174 unchanged lines hidden (view full) --- 2215 ifr.ifr_addr.sa_family = LINUX_AF_INET; 2216 memcpy(ifr.ifr_addr.sa_data, sa->sa_data, 2217 sizeof(ifr.ifr_addr.sa_data)); 2218 sbuf_bcat(sb, &ifr, sizeof(ifr)); 2219 max_len += sizeof(ifr); 2220 addrs++; 2221 } 2222 | 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/sysproto.h> 37#include <sys/cdio.h> 38#include <sys/dvdio.h> 39#include <sys/conf.h> 40#include <sys/disk.h> --- 2174 unchanged lines hidden (view full) --- 2215 ifr.ifr_addr.sa_family = LINUX_AF_INET; 2216 memcpy(ifr.ifr_addr.sa_data, sa->sa_data, 2217 sizeof(ifr.ifr_addr.sa_data)); 2218 sbuf_bcat(sb, &ifr, sizeof(ifr)); 2219 max_len += sizeof(ifr); 2220 addrs++; 2221 } 2222 |
| 2223 if (!sbuf_overflowed(sb)) | 2223 if (sbuf_error(sb) == 0) |
| 2224 valid_len = sbuf_len(sb); 2225 } 2226 if (addrs == 0) { 2227 bzero((caddr_t)&ifr.ifr_addr, sizeof(ifr.ifr_addr)); 2228 sbuf_bcat(sb, &ifr, sizeof(ifr)); 2229 max_len += sizeof(ifr); 2230 | 2224 valid_len = sbuf_len(sb); 2225 } 2226 if (addrs == 0) { 2227 bzero((caddr_t)&ifr.ifr_addr, sizeof(ifr.ifr_addr)); 2228 sbuf_bcat(sb, &ifr, sizeof(ifr)); 2229 max_len += sizeof(ifr); 2230 |
| 2231 if (!sbuf_overflowed(sb)) | 2231 if (sbuf_error(sb) == 0) |
| 2232 valid_len = sbuf_len(sb); 2233 } 2234 } 2235 IFNET_RUNLOCK(); 2236 2237 if (valid_len != max_len && !full) { 2238 sbuf_delete(sb); 2239 goto again; --- 977 unchanged lines hidden --- | 2232 valid_len = sbuf_len(sb); 2233 } 2234 } 2235 IFNET_RUNLOCK(); 2236 2237 if (valid_len != max_len && !full) { 2238 sbuf_delete(sb); 2239 goto again; --- 977 unchanged lines hidden --- |