svn commit: r281990 - in projects/ifnet: . bin/sh contrib/netbsd-tests/lib/libpthread contrib/tcpdump lib/libc/gen lib/libc/include lib/libc/locale lib/libc/net lib/libc/regex lib/libc/stdio lib/li...
Gleb Smirnoff
glebius at FreeBSD.org
Sat Apr 25 22:05:59 UTC 2015
Author: glebius
Date: Sat Apr 25 22:05:48 2015
New Revision: 281990
URL: https://svnweb.freebsd.org/changeset/base/281990
Log:
Merge head r257698 through r281987.
Added:
projects/ifnet/sys/arm/conf/AML8726
- copied unchanged from r281987, head/sys/arm/conf/AML8726
projects/ifnet/sys/arm/freescale/imx/files.imx5
- copied unchanged from r281987, head/sys/arm/freescale/imx/files.imx5
projects/ifnet/sys/libkern/zlib.c
- copied unchanged from r281987, head/sys/libkern/zlib.c
projects/ifnet/sys/sys/zlib.h
- copied unchanged from r281987, head/sys/sys/zlib.h
projects/ifnet/sys/sys/zutil.h
- copied unchanged from r281987, head/sys/sys/zutil.h
projects/ifnet/sys/x86/x86/cpu_machdep.c
- copied unchanged from r281987, head/sys/x86/x86/cpu_machdep.c
projects/ifnet/sys/x86/x86/mp_x86.c
- copied unchanged from r281987, head/sys/x86/x86/mp_x86.c
Deleted:
projects/ifnet/sys/arm/amlogic/aml8726/files.smp
projects/ifnet/sys/arm/amlogic/aml8726/std.odroidc1
projects/ifnet/sys/arm/amlogic/aml8726/std.vsatv102-m6
projects/ifnet/sys/arm/freescale/imx/files.imx51
projects/ifnet/sys/arm/freescale/imx/files.imx53
projects/ifnet/sys/net/zlib.c
projects/ifnet/sys/net/zlib.h
projects/ifnet/sys/net/zutil.h
Modified:
projects/ifnet/Makefile.inc1
projects/ifnet/bin/sh/jobs.c
projects/ifnet/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c
projects/ifnet/contrib/tcpdump/interface.h
projects/ifnet/contrib/tcpdump/netdissect.h
projects/ifnet/contrib/tcpdump/print-ip.c
projects/ifnet/contrib/tcpdump/print-pfsync.c
projects/ifnet/lib/libc/gen/_once_stub.c
projects/ifnet/lib/libc/include/compat.h
projects/ifnet/lib/libc/locale/duplocale.3
projects/ifnet/lib/libc/locale/freelocale.3
projects/ifnet/lib/libc/locale/newlocale.3
projects/ifnet/lib/libc/locale/none.c
projects/ifnet/lib/libc/locale/querylocale.3
projects/ifnet/lib/libc/locale/uselocale.3
projects/ifnet/lib/libc/net/sctp_recvmsg.3
projects/ifnet/lib/libc/regex/regcomp.c
projects/ifnet/lib/libc/stdio/flags.c
projects/ifnet/lib/libc/stdio/open_memstream.3
projects/ifnet/lib/libc/stdio/open_memstream.c
projects/ifnet/lib/libc/stdio/open_wmemstream.c
projects/ifnet/lib/libc/sys/closefrom.2
projects/ifnet/lib/libc/sys/procctl.2
projects/ifnet/lib/libc/tests/db/Makefile
projects/ifnet/lib/libgeom/geom_xml2tree.c
projects/ifnet/lib/libmd/mdXhl.c
projects/ifnet/lib/libstand/Makefile
projects/ifnet/lib/libthr/thread/thr_clean.c
projects/ifnet/libexec/rtld-elf/rtld.c
projects/ifnet/release/arm64/make-memstick.sh
projects/ifnet/release/scripts/mk-vmimage.sh
projects/ifnet/release/tools/vmimage.subr
projects/ifnet/sbin/camcontrol/camcontrol.8
projects/ifnet/sbin/growfs/Makefile
projects/ifnet/sbin/growfs/growfs.c
projects/ifnet/share/man/man4/ada.4
projects/ifnet/share/man/man4/smb.4
projects/ifnet/share/man/man4/urtwn.4
projects/ifnet/share/man/man9/BUS_BIND_INTR.9
projects/ifnet/share/man/man9/BUS_CHILD_DELETED.9
projects/ifnet/share/man/man9/BUS_CHILD_DETACHED.9
projects/ifnet/share/man/man9/BUS_DESCRIBE_INTR.9
projects/ifnet/share/man/man9/BUS_NEW_PASS.9
projects/ifnet/share/man/man9/Makefile
projects/ifnet/share/man/man9/VOP_ADVISE.9
projects/ifnet/share/man/man9/VOP_ALLOCATE.9
projects/ifnet/share/man/man9/bus_adjust_resource.9
projects/ifnet/share/man/man9/bus_generic_new_pass.9
projects/ifnet/share/man/man9/bus_set_pass.9
projects/ifnet/share/man/man9/getenv.9
projects/ifnet/share/man/man9/panic.9
projects/ifnet/share/man/man9/refcount.9
projects/ifnet/share/man/man9/sglist.9
projects/ifnet/share/man/man9/shm_map.9
projects/ifnet/share/mk/src.opts.mk
projects/ifnet/sys/amd64/amd64/machdep.c
projects/ifnet/sys/amd64/amd64/mp_machdep.c
projects/ifnet/sys/amd64/include/md_var.h
projects/ifnet/sys/amd64/include/smp.h
projects/ifnet/sys/amd64/include/vm.h
projects/ifnet/sys/amd64/vmm/amd/svm.c
projects/ifnet/sys/amd64/vmm/vmm_instruction_emul.c
projects/ifnet/sys/arm/amlogic/aml8726/files.aml8726
projects/ifnet/sys/arm/amlogic/aml8726/std.aml8726
projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
projects/ifnet/sys/arm/conf/EFIKA_MX
projects/ifnet/sys/arm/conf/IMX53
projects/ifnet/sys/arm/conf/IMX6
projects/ifnet/sys/arm/conf/ODROIDC1
projects/ifnet/sys/arm/conf/RPI2
projects/ifnet/sys/arm/conf/VSATV102
projects/ifnet/sys/arm/freescale/imx/std.imx51
projects/ifnet/sys/arm/freescale/imx/std.imx53
projects/ifnet/sys/arm64/arm64/pmap.c
projects/ifnet/sys/arm64/arm64/stack_machdep.c
projects/ifnet/sys/boot/fdt/dts/arm/bcm2836.dtsi
projects/ifnet/sys/boot/fdt/dts/arm/rpi2.dts
projects/ifnet/sys/boot/i386/common/edd.h
projects/ifnet/sys/boot/libstand32/Makefile
projects/ifnet/sys/boot/userboot/libstand/Makefile
projects/ifnet/sys/cam/scsi/scsi_da.c
projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/ifnet/sys/cddl/dev/dtrace/amd64/dtrace_asm.S
projects/ifnet/sys/cddl/dev/dtrace/arm/dtrace_asm.S
projects/ifnet/sys/cddl/dev/dtrace/dtrace_hacks.c
projects/ifnet/sys/cddl/dev/dtrace/i386/dtrace_asm.S
projects/ifnet/sys/cddl/dev/dtrace/mips/dtrace_asm.S
projects/ifnet/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S
projects/ifnet/sys/cddl/dev/profile/profile.c
projects/ifnet/sys/compat/linux/linux_getcwd.c
projects/ifnet/sys/compat/linux/linux_misc.h
projects/ifnet/sys/conf/NOTES
projects/ifnet/sys/conf/files
projects/ifnet/sys/conf/files.amd64
projects/ifnet/sys/conf/files.i386
projects/ifnet/sys/conf/files.pc98
projects/ifnet/sys/conf/options
projects/ifnet/sys/conf/options.arm
projects/ifnet/sys/dev/bxe/bxe.h
projects/ifnet/sys/dev/e1000/if_igb.c
projects/ifnet/sys/dev/ichsmb/ichsmb_pci.c
projects/ifnet/sys/dev/iicbus/iic.c
projects/ifnet/sys/dev/iicbus/iic.h
projects/ifnet/sys/dev/iicbus/iicbus_if.m
projects/ifnet/sys/dev/iicbus/iiconf.c
projects/ifnet/sys/dev/ipmi/ipmi.c
projects/ifnet/sys/dev/ipmi/ipmi_kcs.c
projects/ifnet/sys/dev/ipmi/ipmi_smic.c
projects/ifnet/sys/dev/ipmi/ipmivars.h
projects/ifnet/sys/dev/mii/brgphy.c
projects/ifnet/sys/dev/mxge/if_mxge.c
projects/ifnet/sys/dev/pccbb/pccbb_pci.c
projects/ifnet/sys/dev/pci/pci.c
projects/ifnet/sys/dev/pci/pci_pci.c
projects/ifnet/sys/dev/pci/pci_subr.c
projects/ifnet/sys/dev/pci/pcib_private.h
projects/ifnet/sys/dev/pci/pcivar.h
projects/ifnet/sys/dev/smbus/smb.c
projects/ifnet/sys/dev/smbus/smb.h
projects/ifnet/sys/dev/smbus/smbconf.h
projects/ifnet/sys/dev/smbus/smbus.c
projects/ifnet/sys/dev/smbus/smbus.h
projects/ifnet/sys/dev/smbus/smbus_if.m
projects/ifnet/sys/dev/usb/controller/dwc_otg.c
projects/ifnet/sys/dev/usb/wlan/if_urtwn.c
projects/ifnet/sys/dev/vt/vt_core.c
projects/ifnet/sys/fs/nfs/nfsport.h
projects/ifnet/sys/fs/nfsclient/nfs_clvfsops.c
projects/ifnet/sys/fs/nfsserver/nfs_nfsdkrpc.c
projects/ifnet/sys/geom/uncompress/g_uncompress.c
projects/ifnet/sys/geom/uzip/g_uzip.c
projects/ifnet/sys/i386/i386/machdep.c
projects/ifnet/sys/i386/i386/mp_machdep.c
projects/ifnet/sys/i386/include/md_var.h
projects/ifnet/sys/i386/include/smp.h
projects/ifnet/sys/i386/include/vm.h
projects/ifnet/sys/i386/xen/mp_machdep.c
projects/ifnet/sys/kern/kern_exec.c
projects/ifnet/sys/kern/kern_gzio.c
projects/ifnet/sys/kern/kern_physio.c
projects/ifnet/sys/kern/kern_shutdown.c
projects/ifnet/sys/kern/link_elf.c
projects/ifnet/sys/kern/link_elf_obj.c
projects/ifnet/sys/kern/uipc_shm.c
projects/ifnet/sys/kern/vfs_aio.c
projects/ifnet/sys/kern/vfs_bio.c
projects/ifnet/sys/kern/vfs_cache.c
projects/ifnet/sys/kern/vfs_vnops.c
projects/ifnet/sys/modules/oce/Makefile
projects/ifnet/sys/modules/zlib/Makefile
projects/ifnet/sys/net/if_media.c
projects/ifnet/sys/net/netisr.c
projects/ifnet/sys/netgraph/ng_deflate.c
projects/ifnet/sys/netinet/ip_carp.c
projects/ifnet/sys/netinet/tcp_subr.c
projects/ifnet/sys/opencrypto/cryptodeflate.c
projects/ifnet/sys/opencrypto/deflate.h
projects/ifnet/sys/sparc64/pci/apb.c
projects/ifnet/sys/sys/cdefs.h
projects/ifnet/sys/sys/fcntl.h
projects/ifnet/sys/sys/mbuf.h
projects/ifnet/sys/sys/param.h
projects/ifnet/sys/sys/procctl.h
projects/ifnet/sys/sys/syscallsubr.h
projects/ifnet/sys/sys/systm.h
projects/ifnet/sys/sys/vnode.h
projects/ifnet/sys/ufs/ffs/ffs_alloc.c
projects/ifnet/sys/ufs/ffs/ffs_vfsops.c
projects/ifnet/sys/ufs/ufs/inode.h
projects/ifnet/sys/vm/sg_pager.c
projects/ifnet/sys/vm/uma_int.h
projects/ifnet/sys/x86/acpica/srat.c
projects/ifnet/sys/x86/include/mca.h
projects/ifnet/sys/x86/pci/qpi.c
projects/ifnet/sys/x86/x86/mca.c
projects/ifnet/tools/regression/file/closefrom/closefrom.c
projects/ifnet/tools/regression/lib/libc/stdio/test-open_memstream.c
projects/ifnet/tools/regression/lib/libc/stdio/test-open_wmemstream.c
projects/ifnet/tools/regression/netinet/arphold/arphold.c
projects/ifnet/tools/tools/tscdrift/tscdrift.c
projects/ifnet/usr.bin/kdump/kdump.c
projects/ifnet/usr.bin/nfsstat/Makefile
projects/ifnet/usr.bin/nfsstat/nfsstat.1
projects/ifnet/usr.bin/nfsstat/nfsstat.c
projects/ifnet/usr.bin/perror/perror.1
projects/ifnet/usr.bin/perror/perror.c
projects/ifnet/usr.bin/procstat/procstat_rusage.c
projects/ifnet/usr.bin/protect/protect.1
projects/ifnet/usr.bin/protect/protect.c
projects/ifnet/usr.bin/whois/whois.c
projects/ifnet/usr.sbin/bhyve/ioapic.c
projects/ifnet/usr.sbin/bhyve/ioapic.h
projects/ifnet/usr.sbin/bhyve/pci_emul.c
projects/ifnet/usr.sbin/bhyve/pci_irq.c
projects/ifnet/usr.sbin/bhyve/pci_irq.h
projects/ifnet/usr.sbin/bhyve/pm.c
projects/ifnet/usr.sbin/etcupdate/etcupdate.8
projects/ifnet/usr.sbin/etcupdate/etcupdate.sh
projects/ifnet/usr.sbin/etcupdate/tests/always_test.sh
projects/ifnet/usr.sbin/etcupdate/tests/conflicts_test.sh
projects/ifnet/usr.sbin/etcupdate/tests/fbsdid_test.sh
projects/ifnet/usr.sbin/etcupdate/tests/ignore_test.sh
projects/ifnet/usr.sbin/etcupdate/tests/preworld_test.sh
projects/ifnet/usr.sbin/etcupdate/tests/tests_test.sh
projects/ifnet/usr.sbin/etcupdate/tests/tzsetup_test.sh
projects/ifnet/usr.sbin/iovctl/iovctl.conf.5
projects/ifnet/usr.sbin/jail/jail.8
projects/ifnet/usr.sbin/pciconf/err.c
projects/ifnet/usr.sbin/smbmsg/smbmsg.c
Directory Properties:
projects/ifnet/ (props changed)
projects/ifnet/contrib/tcpdump/ (props changed)
projects/ifnet/lib/libc/ (props changed)
projects/ifnet/sbin/ (props changed)
projects/ifnet/share/ (props changed)
projects/ifnet/share/man/man4/ (props changed)
projects/ifnet/sys/ (props changed)
projects/ifnet/sys/amd64/vmm/ (props changed)
projects/ifnet/sys/boot/ (props changed)
projects/ifnet/sys/cddl/contrib/opensolaris/ (props changed)
projects/ifnet/sys/conf/ (props changed)
projects/ifnet/sys/x86/include/acpica_machdep.h (props changed)
projects/ifnet/usr.bin/procstat/ (props changed)
projects/ifnet/usr.sbin/bhyve/ (props changed)
projects/ifnet/usr.sbin/jail/ (props changed)
Modified: projects/ifnet/Makefile.inc1
==============================================================================
--- projects/ifnet/Makefile.inc1 Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/Makefile.inc1 Sat Apr 25 22:05:48 2015 (r281990)
@@ -1357,13 +1357,7 @@ _kerberos5_bootstrap_tools= \
kerberos5/tools/slc \
usr.bin/compile_et
-${_bt}-kerberos5/lib/libroken: ${_bt}-kerberos5/tools/make-roken
-${_bt}-kerberos5/tools/asn1_compile: \
- ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
-${_bt}-kerberos5/tools/slc: \
- ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
-${_bt}-usr.bin/compile_et: \
- ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
+.ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
.endif
bootstrap-tools: .PHONY
Modified: projects/ifnet/bin/sh/jobs.c
==============================================================================
--- projects/ifnet/bin/sh/jobs.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/bin/sh/jobs.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -1057,7 +1057,7 @@ waitforjob(struct job *jp, int *origstat
CLEAR_PENDING_INT;
}
#if JOBS
- else if (rootshell && iflag && propagate_int &&
+ else if (rootshell && propagate_int &&
WIFSIGNALED(status) && WTERMSIG(status) == SIGINT)
kill(getpid(), SIGINT);
#endif
Modified: projects/ifnet/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c
==============================================================================
--- projects/ifnet/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -28,6 +28,9 @@
#include <sys/cdefs.h>
__RCSID("$NetBSD");
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#endif
#include <pthread.h>
#include <ucontext.h>
#include <stdio.h>
Modified: projects/ifnet/contrib/tcpdump/interface.h
==============================================================================
--- projects/ifnet/contrib/tcpdump/interface.h Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/contrib/tcpdump/interface.h Sat Apr 25 22:05:48 2015 (r281990)
@@ -148,8 +148,6 @@ extern uint16_t create_osi_cksum(const u
#include <pcap.h>
-extern void pfsync_ip_print(const u_char *, u_int);
-
extern char *q922_string(const u_char *);
extern char *smb_errstr(int, int);
extern const char *nt_errstr(uint32_t);
Modified: projects/ifnet/contrib/tcpdump/netdissect.h
==============================================================================
--- projects/ifnet/contrib/tcpdump/netdissect.h Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/contrib/tcpdump/netdissect.h Sat Apr 25 22:05:48 2015 (r281990)
@@ -540,6 +540,8 @@ extern void timed_print(netdissect_optio
extern void m3ua_print(netdissect_options *, const u_char *, const u_int);
extern void aoe_print(netdissect_options *, const u_char *, const u_int);
+extern void pfsync_ip_print(netdissect_options *, const u_char *, u_int);
+
/* stuff that has not yet been rototiled */
#if 0
Modified: projects/ifnet/contrib/tcpdump/print-ip.c
==============================================================================
--- projects/ifnet/contrib/tcpdump/print-ip.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/contrib/tcpdump/print-ip.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -487,7 +487,7 @@ again:
#if defined(HAVE_NET_PFVAR_H)
case IPPROTO_PFSYNC:
- pfsync_ip_print(ipds->cp, ipds->len);
+ pfsync_ip_print(ndo, ipds->cp, ipds->len);
break;
#endif
Modified: projects/ifnet/contrib/tcpdump/print-pfsync.c
==============================================================================
--- projects/ifnet/contrib/tcpdump/print-pfsync.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/contrib/tcpdump/print-pfsync.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -47,10 +47,12 @@
#include "interface.h"
#include "addrtoname.h"
-static void pfsync_print(struct pfsync_header *, const u_char *, u_int);
-static void print_src_dst(const struct pfsync_state_peer *,
+static void pfsync_print(netdissect_options *, struct pfsync_header *,
+ const u_char *, u_int);
+static void print_src_dst(netdissect_options *,
+ const struct pfsync_state_peer *,
const struct pfsync_state_peer *, uint8_t);
-static void print_state(struct pfsync_state *);
+static void print_state(netdissect_options *, struct pfsync_state *);
#ifdef notyet
void
@@ -62,7 +64,7 @@ pfsync_if_print(u_char *user, const stru
ts_print(&h->ts);
if (caplen < PFSYNC_HDRLEN) {
- printf("[|pfsync]");
+ ND_PRINT((ndo, "[|pfsync]"));
goto out;
}
@@ -73,36 +75,36 @@ out:
if (xflag) {
default_print((const u_char *)p, caplen);
}
- putchar('\n');
+ safeputchar(ndo, '\n');
}
#endif /* notyet */
void
-pfsync_ip_print(const u_char *bp, u_int len)
+pfsync_ip_print(netdissect_options *ndo , const u_char *bp, u_int len)
{
struct pfsync_header *hdr = (struct pfsync_header *)bp;
if (len < PFSYNC_HDRLEN)
- printf("[|pfsync]");
+ ND_PRINT((ndo, "[|pfsync]"));
else
- pfsync_print(hdr, bp + sizeof(struct pfsync_header),
+ pfsync_print(ndo, hdr, bp + sizeof(struct pfsync_header),
len - sizeof(struct pfsync_header));
}
struct pfsync_actions {
const char *name;
size_t len;
- void (*print)(const void *);
+ void (*print)(netdissect_options *, const void *);
};
-static void pfsync_print_clr(const void *);
-static void pfsync_print_state(const void *);
-static void pfsync_print_ins_ack(const void *);
-static void pfsync_print_upd_c(const void *);
-static void pfsync_print_upd_req(const void *);
-static void pfsync_print_del_c(const void *);
-static void pfsync_print_bus(const void *);
-static void pfsync_print_tdb(const void *);
+static void pfsync_print_clr(netdissect_options *, const void *);
+static void pfsync_print_state(netdissect_options *, const void *);
+static void pfsync_print_ins_ack(netdissect_options *, const void *);
+static void pfsync_print_upd_c(netdissect_options *, const void *);
+static void pfsync_print_upd_req(netdissect_options *, const void *);
+static void pfsync_print_del_c(netdissect_options *, const void *);
+static void pfsync_print_bus(netdissect_options *, const void *);
+static void pfsync_print_tdb(netdissect_options *, const void *);
struct pfsync_actions actions[] = {
{ "clear all", sizeof(struct pfsync_clr), pfsync_print_clr },
@@ -125,7 +127,8 @@ struct pfsync_actions actions[] = {
};
static void
-pfsync_print(struct pfsync_header *hdr, const u_char *bp, u_int len)
+pfsync_print(netdissect_options *ndo, struct pfsync_header *hdr,
+ const u_char *bp, u_int len)
{
struct pfsync_subheader *subh;
int count, plen, i;
@@ -133,7 +136,7 @@ pfsync_print(struct pfsync_header *hdr,
plen = ntohs(hdr->len);
- printf("PFSYNCv%d len %d", hdr->version, plen);
+ ND_PRINT((ndo, "PFSYNCv%d len %d", hdr->version, plen));
if (hdr->version != PFSYNC_VERSION)
return;
@@ -150,19 +153,22 @@ pfsync_print(struct pfsync_header *hdr,
plen -= sizeof(*subh);
if (subh->action >= PFSYNC_ACT_MAX) {
- printf("\n act UNKNOWN id %d", subh->action);
+ ND_PRINT((ndo, "\n act UNKNOWN id %d",
+ subh->action));
return;
}
count = ntohs(subh->count);
- printf("\n %s count %d", actions[subh->action].name, count);
+ ND_PRINT((ndo, "\n %s count %d", actions[subh->action].name,
+ count));
alen = actions[subh->action].len;
if (subh->action == PFSYNC_ACT_EOF)
return;
if (actions[subh->action].print == NULL) {
- printf("\n unimplemented action %hhu", subh->action);
+ ND_PRINT((ndo, "\n unimplemented action %hhu",
+ subh->action));
return;
}
@@ -173,7 +179,7 @@ pfsync_print(struct pfsync_header *hdr,
}
if (vflag)
- actions[subh->action].print(bp);
+ actions[subh->action].print(ndo, bp);
bp += alen;
len -= alen;
@@ -182,78 +188,78 @@ pfsync_print(struct pfsync_header *hdr,
}
if (plen > 0) {
- printf("\n ...");
+ ND_PRINT((ndo, "\n ..."));
return;
}
if (plen < 0) {
- printf("\n invalid header length");
+ ND_PRINT((ndo, "\n invalid header length"));
return;
}
if (len > 0)
- printf("\n invalid packet length");
+ ND_PRINT((ndo, "\n invalid packet length"));
}
static void
-pfsync_print_clr(const void *bp)
+pfsync_print_clr(netdissect_options *ndo, const void *bp)
{
const struct pfsync_clr *clr = bp;
- printf("\n\tcreatorid: %08x", htonl(clr->creatorid));
+ ND_PRINT((ndo, "\n\tcreatorid: %08x", htonl(clr->creatorid)));
if (clr->ifname[0] != '\0')
- printf(" interface: %s", clr->ifname);
+ ND_PRINT((ndo, " interface: %s", clr->ifname));
}
static void
-pfsync_print_state(const void *bp)
+pfsync_print_state(netdissect_options *ndo, const void *bp)
{
struct pfsync_state *st = (struct pfsync_state *)bp;
- putchar('\n');
- print_state(st);
+ safeputchar(ndo, '\n');
+ print_state(ndo, st);
}
static void
-pfsync_print_ins_ack(const void *bp)
+pfsync_print_ins_ack(netdissect_options *ndo, const void *bp)
{
const struct pfsync_ins_ack *iack = bp;
- printf("\n\tid: %016jx creatorid: %08x", (uintmax_t )be64toh(iack->id),
- ntohl(iack->creatorid));
+ ND_PRINT((ndo, "\n\tid: %016jx creatorid: %08x",
+ (uintmax_t)be64toh(iack->id), ntohl(iack->creatorid)));
}
static void
-pfsync_print_upd_c(const void *bp)
+pfsync_print_upd_c(netdissect_options *ndo, const void *bp)
{
const struct pfsync_upd_c *u = bp;
- printf("\n\tid: %016jx creatorid: %08x", (uintmax_t )be64toh(u->id),
- ntohl(u->creatorid));
+ ND_PRINT((ndo, "\n\tid: %016jx creatorid: %08x",
+ (uintmax_t)be64toh(u->id), ntohl(u->creatorid)));
if (vflag > 2) {
- printf("\n\tTCP? :");
- print_src_dst(&u->src, &u->dst, IPPROTO_TCP);
+ ND_PRINT((ndo, "\n\tTCP? :"));
+ print_src_dst(ndo, &u->src, &u->dst, IPPROTO_TCP);
}
}
static void
-pfsync_print_upd_req(const void *bp)
+pfsync_print_upd_req(netdissect_options *ndo, const void *bp)
{
const struct pfsync_upd_req *ur = bp;
- printf("\n\tid: %016jx creatorid: %08x", (uintmax_t )be64toh(ur->id),
- ntohl(ur->creatorid));
+ ND_PRINT((ndo, "\n\tid: %016jx creatorid: %08x",
+ (uintmax_t)be64toh(ur->id), ntohl(ur->creatorid)));
}
static void
-pfsync_print_del_c(const void *bp)
+pfsync_print_del_c(netdissect_options *ndo, const void *bp)
{
const struct pfsync_del_c *d = bp;
- printf("\n\tid: %016jx creatorid: %08x", (uintmax_t )be64toh(d->id),
- ntohl(d->creatorid));
+ ND_PRINT((ndo, "\n\tid: %016jx creatorid: %08x",
+ (uintmax_t)be64toh(d->id), ntohl(d->creatorid)));
}
static void
-pfsync_print_bus(const void *bp)
+pfsync_print_bus(netdissect_options *ndo, const void *bp)
{
const struct pfsync_bus *b = bp;
uint32_t endtime;
@@ -278,95 +284,95 @@ pfsync_print_bus(const void *bp)
break;
}
- printf("\n\tcreatorid: %08x age: %.2u:%.2u:%.2u status: %s",
- htonl(b->creatorid), endtime, min, sec, status);
+ ND_PRINT((ndo, "\n\tcreatorid: %08x age: %.2u:%.2u:%.2u status: %s",
+ htonl(b->creatorid), endtime, min, sec, status));
}
static void
-pfsync_print_tdb(const void *bp)
+pfsync_print_tdb(netdissect_options *ndo, const void *bp)
{
const struct pfsync_tdb *t = bp;
- printf("\n\tspi: 0x%08x rpl: %ju cur_bytes: %ju",
+ ND_PRINT((ndo, "\n\tspi: 0x%08x rpl: %ju cur_bytes: %ju",
ntohl(t->spi), (uintmax_t )be64toh(t->rpl),
- (uintmax_t )be64toh(t->cur_bytes));
+ (uintmax_t )be64toh(t->cur_bytes)));
}
static void
-print_host(struct pf_addr *addr, uint16_t port, sa_family_t af,
- const char *proto)
+print_host(netdissect_options *ndo, struct pf_addr *addr, uint16_t port,
+ sa_family_t af, const char *proto)
{
char buf[48];
if (inet_ntop(af, addr, buf, sizeof(buf)) == NULL)
- printf("?");
+ ND_PRINT((ndo, "?"));
else
- printf("%s", buf);
+ ND_PRINT((ndo, "%s", buf));
if (port)
- printf(".%hu", ntohs(port));
+ ND_PRINT((ndo, ".%hu", ntohs(port)));
}
static void
-print_seq(const struct pfsync_state_peer *p)
+print_seq(netdissect_options *ndo, const struct pfsync_state_peer *p)
{
if (p->seqdiff)
- printf("[%u + %u](+%u)", ntohl(p->seqlo),
- ntohl(p->seqhi) - ntohl(p->seqlo), ntohl(p->seqdiff));
+ ND_PRINT((ndo, "[%u + %u](+%u)", ntohl(p->seqlo),
+ ntohl(p->seqhi) - ntohl(p->seqlo), ntohl(p->seqdiff)));
else
- printf("[%u + %u]", ntohl(p->seqlo),
- ntohl(p->seqhi) - ntohl(p->seqlo));
+ ND_PRINT((ndo, "[%u + %u]", ntohl(p->seqlo),
+ ntohl(p->seqhi) - ntohl(p->seqlo)));
}
static void
-print_src_dst(const struct pfsync_state_peer *src,
+print_src_dst(netdissect_options *ndo, const struct pfsync_state_peer *src,
const struct pfsync_state_peer *dst, uint8_t proto)
{
if (proto == IPPROTO_TCP) {
if (src->state <= TCPS_TIME_WAIT &&
dst->state <= TCPS_TIME_WAIT)
- printf(" %s:%s", tcpstates[src->state],
- tcpstates[dst->state]);
+ ND_PRINT((ndo, " %s:%s", tcpstates[src->state],
+ tcpstates[dst->state]));
else if (src->state == PF_TCPS_PROXY_SRC ||
dst->state == PF_TCPS_PROXY_SRC)
- printf(" PROXY:SRC");
+ ND_PRINT((ndo, " PROXY:SRC"));
else if (src->state == PF_TCPS_PROXY_DST ||
dst->state == PF_TCPS_PROXY_DST)
- printf(" PROXY:DST");
+ ND_PRINT((ndo, " PROXY:DST"));
else
- printf(" <BAD STATE LEVELS %u:%u>",
- src->state, dst->state);
+ ND_PRINT((ndo, " <BAD STATE LEVELS %u:%u>",
+ src->state, dst->state));
if (vflag > 1) {
- printf("\n\t");
- print_seq(src);
+ ND_PRINT((ndo, "\n\t"));
+ print_seq(ndo, src);
if (src->wscale && dst->wscale)
- printf(" wscale %u",
- src->wscale & PF_WSCALE_MASK);
- printf(" ");
- print_seq(dst);
+ ND_PRINT((ndo, " wscale %u",
+ src->wscale & PF_WSCALE_MASK));
+ ND_PRINT((ndo, " "));
+ print_seq(ndo, dst);
if (src->wscale && dst->wscale)
- printf(" wscale %u",
- dst->wscale & PF_WSCALE_MASK);
+ ND_PRINT((ndo, " wscale %u",
+ dst->wscale & PF_WSCALE_MASK));
}
} else if (proto == IPPROTO_UDP && src->state < PFUDPS_NSTATES &&
dst->state < PFUDPS_NSTATES) {
const char *states[] = PFUDPS_NAMES;
- printf(" %s:%s", states[src->state], states[dst->state]);
+ ND_PRINT((ndo, " %s:%s", states[src->state], states[dst->state]));
} else if (proto != IPPROTO_ICMP && src->state < PFOTHERS_NSTATES &&
dst->state < PFOTHERS_NSTATES) {
/* XXX ICMP doesn't really have state levels */
const char *states[] = PFOTHERS_NAMES;
- printf(" %s:%s", states[src->state], states[dst->state]);
+ ND_PRINT((ndo, " %s:%s", states[src->state], states[dst->state]));
} else {
- printf(" %u:%u", src->state, dst->state);
+ ND_PRINT((ndo, " %u:%u", src->state, dst->state));
}
}
static void
-print_state(struct pfsync_state *s)
+print_state(netdissect_options *ndo, struct pfsync_state *s)
{
struct pfsync_state_peer *src, *dst;
struct pfsync_state_key *sk, *nk;
@@ -387,29 +393,29 @@ print_state(struct pfsync_state *s)
if (s->proto == IPPROTO_ICMP || s->proto == IPPROTO_ICMPV6)
sk->port[1] = nk->port[1];
}
- printf("\t%s ", s->ifname);
- printf("proto %u ", s->proto);
+ ND_PRINT((ndo, "\t%s ", s->ifname));
+ ND_PRINT((ndo, "proto %u ", s->proto));
- print_host(&nk->addr[1], nk->port[1], s->af, NULL);
+ print_host(ndo, &nk->addr[1], nk->port[1], s->af, NULL);
if (PF_ANEQ(&nk->addr[1], &sk->addr[1], s->af) ||
nk->port[1] != sk->port[1]) {
- printf(" (");
- print_host(&sk->addr[1], sk->port[1], s->af, NULL);
- printf(")");
+ ND_PRINT((ndo, " ("));
+ print_host(ndo, &sk->addr[1], sk->port[1], s->af, NULL);
+ ND_PRINT((ndo, ")"));
}
if (s->direction == PF_OUT)
- printf(" -> ");
+ ND_PRINT((ndo, " -> "));
else
- printf(" <- ");
- print_host(&nk->addr[0], nk->port[0], s->af, NULL);
+ ND_PRINT((ndo, " <- "));
+ print_host(ndo, &nk->addr[0], nk->port[0], s->af, NULL);
if (PF_ANEQ(&nk->addr[0], &sk->addr[0], s->af) ||
nk->port[0] != sk->port[0]) {
- printf(" (");
- print_host(&sk->addr[0], sk->port[0], s->af, NULL);
- printf(")");
+ ND_PRINT((ndo, " ("));
+ print_host(ndo, &sk->addr[0], sk->port[0], s->af, NULL);
+ ND_PRINT((ndo, ")"));
}
- print_src_dst(src, dst, s->proto);
+ print_src_dst(ndo, src, dst, s->proto);
if (vflag > 1) {
uint64_t packets[2];
@@ -421,30 +427,30 @@ print_state(struct pfsync_state *s)
creation /= 60;
min = creation % 60;
creation /= 60;
- printf("\n\tage %.2u:%.2u:%.2u", creation, min, sec);
+ ND_PRINT((ndo, "\n\tage %.2u:%.2u:%.2u", creation, min, sec));
sec = expire % 60;
expire /= 60;
min = expire % 60;
expire /= 60;
- printf(", expires in %.2u:%.2u:%.2u", expire, min, sec);
+ ND_PRINT((ndo, ", expires in %.2u:%.2u:%.2u", expire, min, sec));
bcopy(s->packets[0], &packets[0], sizeof(uint64_t));
bcopy(s->packets[1], &packets[1], sizeof(uint64_t));
bcopy(s->bytes[0], &bytes[0], sizeof(uint64_t));
bcopy(s->bytes[1], &bytes[1], sizeof(uint64_t));
- printf(", %ju:%ju pkts, %ju:%ju bytes",
+ ND_PRINT((ndo, ", %ju:%ju pkts, %ju:%ju bytes",
be64toh(packets[0]), be64toh(packets[1]),
- be64toh(bytes[0]), be64toh(bytes[1]));
+ be64toh(bytes[0]), be64toh(bytes[1])));
if (s->anchor != ntohl(-1))
- printf(", anchor %u", ntohl(s->anchor));
+ ND_PRINT((ndo, ", anchor %u", ntohl(s->anchor)));
if (s->rule != ntohl(-1))
- printf(", rule %u", ntohl(s->rule));
+ ND_PRINT((ndo, ", rule %u", ntohl(s->rule)));
}
if (vflag > 1) {
uint64_t id;
bcopy(&s->id, &id, sizeof(uint64_t));
- printf("\n\tid: %016jx creatorid: %08x",
- (uintmax_t )be64toh(id), ntohl(s->creatorid));
+ ND_PRINT((ndo, "\n\tid: %016jx creatorid: %08x",
+ (uintmax_t )be64toh(id), ntohl(s->creatorid)));
}
}
Modified: projects/ifnet/lib/libc/gen/_once_stub.c
==============================================================================
--- projects/ifnet/lib/libc/gen/_once_stub.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/gen/_once_stub.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2009 Advanced Computing Technologies LLC
+ * Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb at FreeBSD.org>
* All rights reserved.
*
Modified: projects/ifnet/lib/libc/include/compat.h
==============================================================================
--- projects/ifnet/lib/libc/include/compat.h Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/include/compat.h Sat Apr 25 22:05:48 2015 (r281990)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2009 Advanced Computing Technologies LLC
+ * Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb at FreeBSD.org>
* All rights reserved.
*
Modified: projects/ifnet/lib/libc/locale/duplocale.3
==============================================================================
--- projects/ifnet/lib/libc/locale/duplocale.3 Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/locale/duplocale.3 Sat Apr 25 22:05:48 2015 (r281990)
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.In xlocale.h
+.In locale.h
.Ft locale_t
.Fn duplocale "locale_t locale"
.Sh DESCRIPTION
Modified: projects/ifnet/lib/libc/locale/freelocale.3
==============================================================================
--- projects/ifnet/lib/libc/locale/freelocale.3 Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/locale/freelocale.3 Sat Apr 25 22:05:48 2015 (r281990)
@@ -38,7 +38,7 @@ or
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.In xlocale.h
+.In locale.h
.Ft int
.Fn freelocale "locale_t locale"
.Sh DESCRIPTION
Modified: projects/ifnet/lib/libc/locale/newlocale.3
==============================================================================
--- projects/ifnet/lib/libc/locale/newlocale.3 Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/locale/newlocale.3 Sat Apr 25 22:05:48 2015 (r281990)
@@ -35,7 +35,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.In xlocale
+.In locale.h
.Ft locale_t
.Fn newlocale "int mask" "const char * locale" "locale_t base"
.Sh DESCRIPTION
Modified: projects/ifnet/lib/libc/locale/none.c
==============================================================================
--- projects/ifnet/lib/libc/locale/none.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/locale/none.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -209,7 +209,7 @@ struct xlocale_ctype __xlocale_global_ct
256 /* __mb_sb_limit */
};
-const struct xlocale_ctype __xlocale_C_ctype = {
+struct xlocale_ctype __xlocale_C_ctype = {
{{0}, "C"},
(_RuneLocale*)&_DefaultRuneLocale,
_none_mbrtowc,
Modified: projects/ifnet/lib/libc/locale/querylocale.3
==============================================================================
--- projects/ifnet/lib/libc/locale/querylocale.3 Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/locale/querylocale.3 Sat Apr 25 22:05:48 2015 (r281990)
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.In xlocale.h
+.In locale.h
.Ft const char *
.Fn querylocale "int mask" "locale_t locale"
.Sh DESCRIPTION
Modified: projects/ifnet/lib/libc/locale/uselocale.3
==============================================================================
--- projects/ifnet/lib/libc/locale/uselocale.3 Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/locale/uselocale.3 Sat Apr 25 22:05:48 2015 (r281990)
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.In xlocale.h
+.In locale.h
.Ft locale_t
.Fn uselocale "locale_t locale"
.Sh DESCRIPTION
Modified: projects/ifnet/lib/libc/net/sctp_recvmsg.3
==============================================================================
--- projects/ifnet/lib/libc/net/sctp_recvmsg.3 Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/net/sctp_recvmsg.3 Sat Apr 25 22:05:48 2015 (r281990)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 13, 2007
+.Dd April 23, 2015
.Dt SCTP_RECVMSG 3
.Os
.Sh NAME
@@ -98,13 +98,13 @@ receive buffer, then the
argument will
.Em not
have the
-.Dv MSG_EOF
+.Dv MSG_EOR
flag applied.
If the message is a complete message then
the
.Fa flags
argument will have
-.Dv MSG_EOF
+.Dv MSG_EOR
set.
Locally detected errors are
indicated by a return value of -1 with
Modified: projects/ifnet/lib/libc/regex/regcomp.c
==============================================================================
--- projects/ifnet/lib/libc/regex/regcomp.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/regex/regcomp.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -1726,13 +1726,13 @@ computematchjumps(struct parse *p, struc
if (p->error != 0)
return;
- pmatches = (int*) malloc(g->mlen * sizeof(unsigned int));
+ pmatches = (int*) malloc(g->mlen * sizeof(int));
if (pmatches == NULL) {
g->matchjump = NULL;
return;
}
- g->matchjump = (int*) malloc(g->mlen * sizeof(unsigned int));
+ g->matchjump = (int*) malloc(g->mlen * sizeof(int));
if (g->matchjump == NULL) { /* Not a fatal error */
free(pmatches);
return;
Modified: projects/ifnet/lib/libc/stdio/flags.c
==============================================================================
--- projects/ifnet/lib/libc/stdio/flags.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/stdio/flags.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -97,6 +97,10 @@ __sflags(const char *mode, int *optr)
/* set close-on-exec */
o |= O_CLOEXEC;
break;
+ case 'v':
+ /* verify */
+ o |= O_VERIFY;
+ break;
default:
known = 0;
break;
Modified: projects/ifnet/lib/libc/stdio/open_memstream.3
==============================================================================
--- projects/ifnet/lib/libc/stdio/open_memstream.3 Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/stdio/open_memstream.3 Sat Apr 25 22:05:48 2015 (r281990)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2013 Advanced Computing Technologies LLC
+.\" Copyright (c) 2013 Hudson River Trading LLC
.\" Written by: John H. Baldwin <jhb at FreeBSD.org>
.\" All rights reserved.
.\"
Modified: projects/ifnet/lib/libc/stdio/open_memstream.c
==============================================================================
--- projects/ifnet/lib/libc/stdio/open_memstream.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/stdio/open_memstream.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2013 Advanced Computing Technologies LLC
+ * Copyright (c) 2013 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb at FreeBSD.org>
* All rights reserved.
*
Modified: projects/ifnet/lib/libc/stdio/open_wmemstream.c
==============================================================================
--- projects/ifnet/lib/libc/stdio/open_wmemstream.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/stdio/open_wmemstream.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2013 Advanced Computing Technologies LLC
+ * Copyright (c) 2013 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb at FreeBSD.org>
* All rights reserved.
*
Modified: projects/ifnet/lib/libc/sys/closefrom.2
==============================================================================
--- projects/ifnet/lib/libc/sys/closefrom.2 Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/sys/closefrom.2 Sat Apr 25 22:05:48 2015 (r281990)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2009 Advanced Computing Technologies LLC
+.\" Copyright (c) 2009 Hudson River Trading LLC
.\" Written by: John H. Baldwin <jhb at FreeBSD.org>
.\" All rights reserved.
.\"
Modified: projects/ifnet/lib/libc/sys/procctl.2
==============================================================================
--- projects/ifnet/lib/libc/sys/procctl.2 Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/sys/procctl.2 Sat Apr 25 22:05:48 2015 (r281990)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2013 Advanced Computing Technologies LLC
+.\" Copyright (c) 2013 Hudson River Trading LLC
.\" Written by: John H. Baldwin <jhb at FreeBSD.org>
.\" All rights reserved.
.\"
Modified: projects/ifnet/lib/libc/tests/db/Makefile
==============================================================================
--- projects/ifnet/lib/libc/tests/db/Makefile Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libc/tests/db/Makefile Sat Apr 25 22:05:48 2015 (r281990)
@@ -11,6 +11,7 @@ FILESDIR= ${TESTSDIR}
FILES= README
NETBSD_ATF_TESTS_SH+= db_test
+ATF_TESTS_SH_SED_db_test= -e 's,/bin/csh,/bin/cat,g'
.include "../Makefile.netbsd-tests"
Modified: projects/ifnet/lib/libgeom/geom_xml2tree.c
==============================================================================
--- projects/ifnet/lib/libgeom/geom_xml2tree.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libgeom/geom_xml2tree.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -257,6 +257,7 @@ EndElement(void *userData, const char *n
if (!strcmp(name, "config")) {
mt->config = NULL;
+ free(p);
return;
}
Modified: projects/ifnet/lib/libmd/mdXhl.c
==============================================================================
--- projects/ifnet/lib/libmd/mdXhl.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libmd/mdXhl.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -74,7 +74,7 @@ MDXFileChunk(const char *filename, char
i = read(f, buffer, sizeof(buffer));
else
i = read(f, buffer, n);
- if (i < 0)
+ if (i <= 0)
break;
MDXUpdate(&ctx, buffer, i);
n -= i;
Modified: projects/ifnet/lib/libstand/Makefile
==============================================================================
--- projects/ifnet/lib/libstand/Makefile Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libstand/Makefile Sat Apr 25 22:05:48 2015 (r281990)
@@ -11,6 +11,9 @@ MK_SSP= no
.include <src.opts.mk>
+LIBSTAND_SRC= ${.CURDIR}
+LIBC_SRC= ${LIBSTAND_SRC}/../libc
+
LIB= stand
NO_PIC=
INCS= stand.h
@@ -19,7 +22,7 @@ MAN= libstand.3
WARNS?= 0
CFLAGS+= -ffreestanding -Wformat
-CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${LIBSTAND_SRC}
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
@@ -54,54 +57,54 @@ SRCS+= gzguts.h zutil.h __main.c assert.
# private (pruned) versions of libc string functions
SRCS+= strcasecmp.c
-.PATH: ${.CURDIR}/../libc/net
+.PATH: ${LIBC_SRC}/net
SRCS+= ntoh.c
# string functions from libc
-.PATH: ${.CURDIR}/../libc/string
+.PATH: ${LIBC_SRC}/string
SRCS+= bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \
memmove.c memset.c qdivrem.c strcat.c strchr.c strcmp.c strcpy.c \
strcspn.c strlen.c strncat.c strncmp.c strncpy.c strpbrk.c \
strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c
.if ${MACHINE_CPUARCH} == "arm"
-.PATH: ${.CURDIR}/../libc/arm/gen
+.PATH: ${LIBC_SRC}/arm/gen
# Compiler support functions
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/builtins/
+.PATH: ${LIBSTAND_SRC}/../../contrib/compiler-rt/lib/builtins/
# __clzsi2 and ctzsi2 for various builtin functions
SRCS+= clzsi2.c ctzsi2.c
# Divide and modulus functions called by the compiler
SRCS+= divmoddi4.c divmodsi4.c divdi3.c divsi3.c moddi3.c modsi3.c
SRCS+= udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/builtins/arm/
+.PATH: ${LIBSTAND_SRC}/../../contrib/compiler-rt/lib/builtins/arm/
SRCS+= aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
SRCS+= aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
.endif
.if ${MACHINE_CPUARCH} == "aarch64"
-.PATH: ${.CURDIR}/../libc/aarch64/gen
+.PATH: ${LIBC_SRC}/aarch64/gen
.endif
.if ${MACHINE_CPUARCH} == "powerpc"
-.PATH: ${.CURDIR}/../libc/quad
+.PATH: ${LIBC_SRC}/quad
SRCS+= ashldi3.c ashrdi3.c
SRCS+= syncicache.c
.endif
# uuid functions from libc
-.PATH: ${.CURDIR}/../libc/uuid
+.PATH: ${LIBC_SRC}/uuid
SRCS+= uuid_equal.c uuid_is_nil.c
# _setjmp/_longjmp
-.PATH: ${.CURDIR}/${MACHINE_CPUARCH}
+.PATH: ${LIBSTAND_SRC}/${MACHINE_CPUARCH}
SRCS+= _setjmp.S
# decompression functionality from libbz2
# NOTE: to actually test this functionality after libbz2 upgrade compile
# loader(8) with LOADER_BZIP2_SUPPORT defined
-.PATH: ${.CURDIR}/../../contrib/bzip2
+.PATH: ${LIBSTAND_SRC}/../../contrib/bzip2
CFLAGS+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS
SRCS+= libstand_bzlib_private.h
@@ -110,7 +113,8 @@ SRCS+= _${file}
CLEANFILES+= _${file}
_${file}: ${file}
- sed "s|bzlib_private\.h|libstand_bzlib_private.h|" ${.ALLSRC} > ${.TARGET}
+ sed "s|bzlib_private\.h|libstand_bzlib_private.h|" \
+ ${.ALLSRC} > ${.TARGET}
.endfor
CLEANFILES+= libstand_bzlib_private.h
@@ -119,8 +123,8 @@ libstand_bzlib_private.h: bzlib_private.
${.ALLSRC} > ${.TARGET}
# decompression functionality from libz
-.PATH: ${.CURDIR}/../libz
-CFLAGS+=-DHAVE_MEMCPY -I${.CURDIR}/../libz
+.PATH: ${LIBSTAND_SRC}/../libz
+CFLAGS+=-DHAVE_MEMCPY -I${LIBSTAND_SRC}/../libz
SRCS+= adler32.c crc32.c libstand_zutil.h libstand_gzguts.h
.for file in infback.c inffast.c inflate.c inftrees.c zutil.c
@@ -165,4 +169,3 @@ SRCS+= nandfs.c
.endif
.include <bsd.lib.mk>
-
Modified: projects/ifnet/lib/libthr/thread/thr_clean.c
==============================================================================
--- projects/ifnet/lib/libthr/thread/thr_clean.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/lib/libthr/thread/thr_clean.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -84,7 +84,7 @@ _pthread_cleanup_push(void (*routine) (v
curthread->unwind_disabled = 1;
#endif
if ((newbuf = (struct pthread_cleanup *)
- malloc(sizeof(struct _pthread_cleanup_info))) != NULL) {
+ malloc(sizeof(struct pthread_cleanup))) != NULL) {
newbuf->routine = routine;
newbuf->routine_arg = arg;
newbuf->onheap = 1;
Modified: projects/ifnet/libexec/rtld-elf/rtld.c
==============================================================================
--- projects/ifnet/libexec/rtld-elf/rtld.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/libexec/rtld-elf/rtld.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -2165,7 +2165,7 @@ load_object(const char *name, int fd_u,
* To avoid a race, we open the file and use fstat() rather than
* using stat().
*/
- if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1) {
+ if ((fd = open(path, O_RDONLY | O_CLOEXEC | O_VERIFY)) == -1) {
_rtld_error("Cannot open \"%s\"", path);
free(path);
return (NULL);
@@ -2855,7 +2855,7 @@ search_library_pathfds(const char *name,
dirfd = parse_libdir(fdstr);
if (dirfd < 0)
break;
- fd = __sys_openat(dirfd, name, O_RDONLY | O_CLOEXEC);
+ fd = __sys_openat(dirfd, name, O_RDONLY | O_CLOEXEC | O_VERIFY);
if (fd >= 0) {
*fdp = fd;
len = strlen(fdstr) + strlen(name) + 3;
Modified: projects/ifnet/release/arm64/make-memstick.sh
==============================================================================
--- projects/ifnet/release/arm64/make-memstick.sh Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/release/arm64/make-memstick.sh Sat Apr 25 22:05:48 2015 (r281990)
@@ -36,6 +36,6 @@ if [ $? -ne 0 ]; then
fi
rm ${1}/etc/fstab
-mkimg -s gpt -p efi:=${1}/boot/boot1.efifat -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2}
+mkimg -s gpt -p efi:=${1}/boot/boot1.efifat -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2}
rm ${2}.part
Modified: projects/ifnet/release/scripts/mk-vmimage.sh
==============================================================================
--- projects/ifnet/release/scripts/mk-vmimage.sh Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/release/scripts/mk-vmimage.sh Sat Apr 25 22:05:48 2015 (r281990)
@@ -93,6 +93,16 @@ main() {
. "${VMCONFIG}"
fi
+ case ${TARGET}:${TARGET_ARCH} in
+ arm64:aarch64)
+ ROOTLABEL="ufs"
+ NOSWAP=1
+ ;;
+ *)
+ ROOTLABEL="gpt"
+ ;;
+ esac
+
vm_create_base
vm_install_base
vm_extra_install_base
Modified: projects/ifnet/release/tools/vmimage.subr
==============================================================================
--- projects/ifnet/release/tools/vmimage.subr Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/release/tools/vmimage.subr Sat Apr 25 22:05:48 2015 (r281990)
@@ -14,11 +14,11 @@ write_partition_layout() {
SWAPOPT="-p freebsd-swap/swapfs::1G"
fi
- _OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR | tr -d '/usr/src')"
- if [ -d "${_OBJDIR}/${TARGET}.${TARGET_ARCH}" ]; then
- BOOTFILES="${_OBJDIR}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot"
+ _OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)"
+ if [ -d "${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then
+ BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot"
else
- BOOTFILES="${_OBJDIR}/usr/src/sys/boot"
+ BOOTFILES="/${_OBJDIR}/sys/boot"
fi
case "${TARGET}:${TARGET_ARCH}" in
@@ -30,10 +30,9 @@ write_partition_layout() {
-o ${VMIMAGE}
;;
arm64:aarch64)
- mkimg -s gpt \
- -p efi/efiboot:=${BOOTFILES}/efi/boot1/boot1.efifat \
- ${SWAPOPT} \
- -p freebsd-ufs/rootfs:=${VMBASE} \
+ mkimg -s mbr \
+ -p efi:=${BOOTFILES}/efi/boot1/boot1.efifat \
+ -p freebsd:=${VMBASE} \
-o ${VMIMAGE}
;;
powerpc:powerpc*)
@@ -77,7 +76,7 @@ vm_create_base() {
mkdir -p ${DESTDIR}
truncate -s ${VMSIZE} ${VMBASE}
mddev=$(mdconfig -f ${VMBASE})
- newfs /dev/${mddev}
+ newfs -L rootfs /dev/${mddev}
mount /dev/${mddev} ${DESTDIR}
return 0
@@ -97,7 +96,7 @@ vm_copy_base() {
truncate -s ${VMSIZE} ${VMBASE}.tmp
mkdir -p ${DESTDIR}/new
mdnew=$(mdconfig -f ${VMBASE}.tmp)
- newfs /dev/${mdnew}
+ newfs -L rootfs /dev/${mdnew}
mount /dev/${mdnew} ${DESTDIR}/new
tar -cf- -C ${DESTDIR}/old . | tar -xUf- -C ${DESTDIR}/new
@@ -123,7 +122,7 @@ vm_install_base() {
echo '# Custom /etc/fstab for FreeBSD VM images' \
> ${DESTDIR}/etc/fstab
- echo '/dev/gpt/rootfs / ufs rw 1 1' \
+ echo "/dev/${ROOTLABEL}/rootfs / ufs rw 1 1" \
>> ${DESTDIR}/etc/fstab
if [ -z "${NOSWAP}" ]; then
echo '/dev/gpt/swapfs none swap sw 0 0' \
Modified: projects/ifnet/sbin/camcontrol/camcontrol.8
==============================================================================
--- projects/ifnet/sbin/camcontrol/camcontrol.8 Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/sbin/camcontrol/camcontrol.8 Sat Apr 25 22:05:48 2015 (r281990)
@@ -575,7 +575,6 @@ Most drives support this format.
Print out the list in extended physical sector format.
The extended format allows for ranges of blocks to be printed.
.El
-.Pp
.It Fl G
Print out the grown defect list.
This is a list of bad blocks that have
Modified: projects/ifnet/sbin/growfs/Makefile
==============================================================================
--- projects/ifnet/sbin/growfs/Makefile Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/sbin/growfs/Makefile Sat Apr 25 22:05:48 2015 (r281990)
@@ -4,8 +4,6 @@
# $FreeBSD$
#
-#GFSDBG=
-
.include <src.opts.mk>
.PATH: ${.CURDIR}/../mount
@@ -16,7 +14,9 @@ MAN= growfs.8
CFLAGS+=-I${.CURDIR}/../mount
.if defined(GFSDBG)
-SRCS+= debug.c
+SRCS+= debug.c
+CFLAGS+= -DFS_DEBUG
+NO_WCAST_ALIGN= yes
.endif
LIBADD= util
Modified: projects/ifnet/sbin/growfs/growfs.c
==============================================================================
--- projects/ifnet/sbin/growfs/growfs.c Sat Apr 25 21:43:29 2015 (r281989)
+++ projects/ifnet/sbin/growfs/growfs.c Sat Apr 25 22:05:48 2015 (r281990)
@@ -161,7 +161,7 @@ growfs(int fsi, int fso, unsigned int Nf
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list