svn commit: r184966 - in user/dfr/gssapi/7: . bin/chio bin/cp bin/sh contrib contrib/bind9 contrib/gcc contrib/gdb contrib/gdtoa contrib/ntp contrib/sendmail contrib/tcsh contrib/telnet contrib/top...

Doug Rabson dfr at FreeBSD.org
Fri Nov 14 02:59:39 PST 2008 

Author: dfr
Date: Fri Nov 14 10:59:36 2008
New Revision: 184966
URL: http://svn.freebsd.org/changeset/base/184966

Log:
  MF7: 184624-184965

Added:
  user/dfr/gssapi/7/contrib/traceroute/as.c
     - copied unchanged from r184965, stable/7/contrib/traceroute/as.c
  user/dfr/gssapi/7/contrib/traceroute/as.h
     - copied unchanged from r184965, stable/7/contrib/traceroute/as.h
Modified:
  user/dfr/gssapi/7/   (props changed)
  user/dfr/gssapi/7/Makefile.inc1   (props changed)
  user/dfr/gssapi/7/UPDATING   (props changed)
  user/dfr/gssapi/7/bin/chio/   (props changed)
  user/dfr/gssapi/7/bin/chio/chio.c
  user/dfr/gssapi/7/bin/cp/   (props changed)
  user/dfr/gssapi/7/bin/sh/   (props changed)
  user/dfr/gssapi/7/contrib/   (props changed)
  user/dfr/gssapi/7/contrib/bind9/   (props changed)
  user/dfr/gssapi/7/contrib/gcc/   (props changed)
  user/dfr/gssapi/7/contrib/gdb/   (props changed)
  user/dfr/gssapi/7/contrib/gdtoa/   (props changed)
  user/dfr/gssapi/7/contrib/ntp/   (props changed)
  user/dfr/gssapi/7/contrib/sendmail/   (props changed)
  user/dfr/gssapi/7/contrib/tcsh/   (props changed)
  user/dfr/gssapi/7/contrib/telnet/   (props changed)
  user/dfr/gssapi/7/contrib/top/   (props changed)
  user/dfr/gssapi/7/contrib/traceroute/   (props changed)
  user/dfr/gssapi/7/contrib/traceroute/traceroute.8
  user/dfr/gssapi/7/contrib/traceroute/traceroute.c
  user/dfr/gssapi/7/crypto/openssh/   (props changed)
  user/dfr/gssapi/7/etc/   (props changed)
  user/dfr/gssapi/7/etc/defaults/   (props changed)
  user/dfr/gssapi/7/etc/rc.d/   (props changed)
  user/dfr/gssapi/7/games/fortune/   (props changed)
  user/dfr/gssapi/7/games/fortune/fortune/   (props changed)
  user/dfr/gssapi/7/gnu/usr.bin/cvs/   (props changed)
  user/dfr/gssapi/7/gnu/usr.bin/gdb/kgdb/   (props changed)
  user/dfr/gssapi/7/gnu/usr.bin/groff/tmac/mdoc.local   (props changed)
  user/dfr/gssapi/7/include/   (props changed)
  user/dfr/gssapi/7/include/time.h
  user/dfr/gssapi/7/include/unistd.h
  user/dfr/gssapi/7/lib/   (props changed)
  user/dfr/gssapi/7/lib/csu/   (props changed)
  user/dfr/gssapi/7/lib/libarchive/   (props changed)
  user/dfr/gssapi/7/lib/libbluetooth/   (props changed)
  user/dfr/gssapi/7/lib/libc/   (props changed)
  user/dfr/gssapi/7/lib/libc/amd64/SYS.h
  user/dfr/gssapi/7/lib/libc/amd64/gen/_setjmp.S
  user/dfr/gssapi/7/lib/libc/amd64/gen/fabs.S
  user/dfr/gssapi/7/lib/libc/amd64/gen/modf.S
  user/dfr/gssapi/7/lib/libc/amd64/gen/rfork_thread.S
  user/dfr/gssapi/7/lib/libc/amd64/gen/setjmp.S
  user/dfr/gssapi/7/lib/libc/amd64/gen/sigsetjmp.S
  user/dfr/gssapi/7/lib/libc/amd64/stdlib/div.S
  user/dfr/gssapi/7/lib/libc/amd64/stdlib/ldiv.S
  user/dfr/gssapi/7/lib/libc/amd64/stdlib/lldiv.S
  user/dfr/gssapi/7/lib/libc/amd64/string/bcmp.S
  user/dfr/gssapi/7/lib/libc/amd64/string/bcopy.S
  user/dfr/gssapi/7/lib/libc/amd64/string/bzero.S
  user/dfr/gssapi/7/lib/libc/amd64/string/memcmp.S
  user/dfr/gssapi/7/lib/libc/amd64/string/memset.S
  user/dfr/gssapi/7/lib/libc/amd64/string/strcat.S
  user/dfr/gssapi/7/lib/libc/amd64/string/strcmp.S
  user/dfr/gssapi/7/lib/libc/amd64/string/strcpy.S
  user/dfr/gssapi/7/lib/libc/amd64/sys/brk.S
  user/dfr/gssapi/7/lib/libc/amd64/sys/exect.S
  user/dfr/gssapi/7/lib/libc/amd64/sys/getcontext.S
  user/dfr/gssapi/7/lib/libc/amd64/sys/pipe.S
  user/dfr/gssapi/7/lib/libc/amd64/sys/ptrace.S
  user/dfr/gssapi/7/lib/libc/amd64/sys/reboot.S
  user/dfr/gssapi/7/lib/libc/amd64/sys/sbrk.S
  user/dfr/gssapi/7/lib/libc/amd64/sys/setlogin.S
  user/dfr/gssapi/7/lib/libc/amd64/sys/vfork.S
  user/dfr/gssapi/7/lib/libc/i386/SYS.h
  user/dfr/gssapi/7/lib/libc/i386/gen/_ctx_start.S
  user/dfr/gssapi/7/lib/libc/i386/gen/_setjmp.S
  user/dfr/gssapi/7/lib/libc/i386/gen/fabs.S
  user/dfr/gssapi/7/lib/libc/i386/gen/modf.S
  user/dfr/gssapi/7/lib/libc/i386/gen/rfork_thread.S
  user/dfr/gssapi/7/lib/libc/i386/gen/setjmp.S
  user/dfr/gssapi/7/lib/libc/i386/gen/sigsetjmp.S
  user/dfr/gssapi/7/lib/libc/i386/stdlib/abs.S
  user/dfr/gssapi/7/lib/libc/i386/stdlib/div.S
  user/dfr/gssapi/7/lib/libc/i386/stdlib/labs.S
  user/dfr/gssapi/7/lib/libc/i386/stdlib/ldiv.S
  user/dfr/gssapi/7/lib/libc/i386/string/bcmp.S
  user/dfr/gssapi/7/lib/libc/i386/string/bcopy.S
  user/dfr/gssapi/7/lib/libc/i386/string/bzero.S
  user/dfr/gssapi/7/lib/libc/i386/string/ffs.S
  user/dfr/gssapi/7/lib/libc/i386/string/index.S
  user/dfr/gssapi/7/lib/libc/i386/string/memchr.S
  user/dfr/gssapi/7/lib/libc/i386/string/memcmp.S
  user/dfr/gssapi/7/lib/libc/i386/string/memset.S
  user/dfr/gssapi/7/lib/libc/i386/string/rindex.S
  user/dfr/gssapi/7/lib/libc/i386/string/strcat.S
  user/dfr/gssapi/7/lib/libc/i386/string/strchr.S
  user/dfr/gssapi/7/lib/libc/i386/string/strcmp.S
  user/dfr/gssapi/7/lib/libc/i386/string/strcpy.S
  user/dfr/gssapi/7/lib/libc/i386/string/strlen.S
  user/dfr/gssapi/7/lib/libc/i386/string/strncmp.S
  user/dfr/gssapi/7/lib/libc/i386/string/strrchr.S
  user/dfr/gssapi/7/lib/libc/i386/string/swab.S
  user/dfr/gssapi/7/lib/libc/i386/string/wcschr.S
  user/dfr/gssapi/7/lib/libc/i386/string/wcscmp.S
  user/dfr/gssapi/7/lib/libc/i386/string/wcslen.S
  user/dfr/gssapi/7/lib/libc/i386/string/wmemchr.S
  user/dfr/gssapi/7/lib/libc/i386/sys/Ovfork.S
  user/dfr/gssapi/7/lib/libc/i386/sys/brk.S
  user/dfr/gssapi/7/lib/libc/i386/sys/exect.S
  user/dfr/gssapi/7/lib/libc/i386/sys/getcontext.S
  user/dfr/gssapi/7/lib/libc/i386/sys/pipe.S
  user/dfr/gssapi/7/lib/libc/i386/sys/ptrace.S
  user/dfr/gssapi/7/lib/libc/i386/sys/reboot.S
  user/dfr/gssapi/7/lib/libc/i386/sys/sbrk.S
  user/dfr/gssapi/7/lib/libc/i386/sys/setlogin.S
  user/dfr/gssapi/7/lib/libc/i386/sys/syscall.S
  user/dfr/gssapi/7/lib/libc/stdlib/malloc.3
  user/dfr/gssapi/7/lib/libc/stdlib/malloc.c
  user/dfr/gssapi/7/lib/libc_r/   (props changed)
  user/dfr/gssapi/7/lib/libcam/   (props changed)
  user/dfr/gssapi/7/lib/libcam/camlib.c
  user/dfr/gssapi/7/lib/libdisk/   (props changed)
  user/dfr/gssapi/7/lib/libfetch/   (props changed)
  user/dfr/gssapi/7/lib/libftpio/   (props changed)
  user/dfr/gssapi/7/lib/libgeom/   (props changed)
  user/dfr/gssapi/7/lib/libgssapi/   (props changed)
  user/dfr/gssapi/7/lib/libkse/   (props changed)
  user/dfr/gssapi/7/lib/libkvm/   (props changed)
  user/dfr/gssapi/7/lib/libthr/   (props changed)
  user/dfr/gssapi/7/lib/libutil/   (props changed)
  user/dfr/gssapi/7/libexec/rpc.rstatd/   (props changed)
  user/dfr/gssapi/7/libexec/rtld-elf/   (props changed)
  user/dfr/gssapi/7/libexec/rtld-elf/rtld.c
  user/dfr/gssapi/7/release/   (props changed)
  user/dfr/gssapi/7/release/Makefile
  user/dfr/gssapi/7/release/scripts/src-install.sh   (props changed)
  user/dfr/gssapi/7/rescue/   (props changed)
  user/dfr/gssapi/7/sbin/   (props changed)
  user/dfr/gssapi/7/sbin/atacontrol/   (props changed)
  user/dfr/gssapi/7/sbin/ddb/   (props changed)
  user/dfr/gssapi/7/sbin/devfs/   (props changed)
  user/dfr/gssapi/7/sbin/dhclient/   (props changed)
  user/dfr/gssapi/7/sbin/fdisk/   (props changed)
  user/dfr/gssapi/7/sbin/fsck_ffs/   (props changed)
  user/dfr/gssapi/7/sbin/geom/   (props changed)
  user/dfr/gssapi/7/sbin/geom/class/part/   (props changed)
  user/dfr/gssapi/7/sbin/geom/misc/   (props changed)
  user/dfr/gssapi/7/sbin/ifconfig/   (props changed)
  user/dfr/gssapi/7/sbin/init/   (props changed)
  user/dfr/gssapi/7/sbin/ipfw/   (props changed)
  user/dfr/gssapi/7/sbin/md5/   (props changed)
  user/dfr/gssapi/7/sbin/mdconfig/   (props changed)
  user/dfr/gssapi/7/sbin/mksnap_ffs/   (props changed)
  user/dfr/gssapi/7/sbin/mount/   (props changed)
  user/dfr/gssapi/7/sbin/mount_nfs/   (props changed)
  user/dfr/gssapi/7/sbin/natd/   (props changed)
  user/dfr/gssapi/7/sbin/ping6/   (props changed)
  user/dfr/gssapi/7/sbin/sconfig/   (props changed)
  user/dfr/gssapi/7/secure/lib/libssh/   (props changed)
  user/dfr/gssapi/7/secure/libexec/sftp-server/   (props changed)
  user/dfr/gssapi/7/secure/usr.bin/ssh/   (props changed)
  user/dfr/gssapi/7/secure/usr.sbin/sshd/   (props changed)
  user/dfr/gssapi/7/share/colldef/   (props changed)
  user/dfr/gssapi/7/share/examples/   (props changed)
  user/dfr/gssapi/7/share/man/man3/   (props changed)
  user/dfr/gssapi/7/share/man/man4/   (props changed)
  user/dfr/gssapi/7/share/man/man5/   (props changed)
  user/dfr/gssapi/7/share/man/man7/   (props changed)
  user/dfr/gssapi/7/share/man/man9/   (props changed)
  user/dfr/gssapi/7/share/mk/   (props changed)
  user/dfr/gssapi/7/share/sendmail/   (props changed)
  user/dfr/gssapi/7/share/syscons/   (props changed)
  user/dfr/gssapi/7/share/syscons/keymaps/   (props changed)
  user/dfr/gssapi/7/share/timedef/   (props changed)
  user/dfr/gssapi/7/share/zoneinfo/   (props changed)
  user/dfr/gssapi/7/sys/   (props changed)
  user/dfr/gssapi/7/sys/compat/freebsd32/freebsd32_misc.c
  user/dfr/gssapi/7/sys/compat/linux/linux_emul.c
  user/dfr/gssapi/7/sys/dev/bce/if_bce.c
  user/dfr/gssapi/7/sys/dev/bce/if_bcefw.h
  user/dfr/gssapi/7/sys/dev/bce/if_bcereg.h
  user/dfr/gssapi/7/sys/dev/et/if_et.c
  user/dfr/gssapi/7/sys/dev/mii/atphy.c
  user/dfr/gssapi/7/sys/kern/kern_proc.c
  user/dfr/gssapi/7/sys/kern/kern_time.c
  user/dfr/gssapi/7/sys/kern/subr_smp.c
  user/dfr/gssapi/7/sys/kern/vfs_subr.c
  user/dfr/gssapi/7/sys/modules/cxgb/   (props changed)
  user/dfr/gssapi/7/sys/net/if_atmsubr.c
  user/dfr/gssapi/7/sys/net/if_fwsubr.c
  user/dfr/gssapi/7/sys/net/if_iso88025subr.c
  user/dfr/gssapi/7/sys/net/route.c
  user/dfr/gssapi/7/sys/net/route.h
  user/dfr/gssapi/7/sys/netinet/if_ether.c
  user/dfr/gssapi/7/sys/netinet/in_rmx.c
  user/dfr/gssapi/7/sys/netinet/in_var.h
  user/dfr/gssapi/7/sys/netinet/tcp_input.c
  user/dfr/gssapi/7/sys/netinet/tcp_sack.c
  user/dfr/gssapi/7/sys/netinet/tcp_syncache.c
  user/dfr/gssapi/7/sys/sys/time.h
  user/dfr/gssapi/7/sys/sys/user.h
  user/dfr/gssapi/7/tools/regression/atm/   (props changed)
  user/dfr/gssapi/7/tools/regression/file/flock/   (props changed)
  user/dfr/gssapi/7/tools/tools/crypto/   (props changed)
  user/dfr/gssapi/7/tools/tools/editing/   (props changed)
  user/dfr/gssapi/7/tools/tools/nanobsd/   (props changed)
  user/dfr/gssapi/7/usr.bin/   (props changed)
  user/dfr/gssapi/7/usr.bin/calendar/   (props changed)
  user/dfr/gssapi/7/usr.bin/cksum/   (props changed)
  user/dfr/gssapi/7/usr.bin/comm/   (props changed)
  user/dfr/gssapi/7/usr.bin/cpuset/   (props changed)
  user/dfr/gssapi/7/usr.bin/fetch/   (props changed)
  user/dfr/gssapi/7/usr.bin/gzip/   (props changed)
  user/dfr/gssapi/7/usr.bin/ipcrm/   (props changed)
  user/dfr/gssapi/7/usr.bin/ipcs/   (props changed)
  user/dfr/gssapi/7/usr.bin/kdump/   (props changed)
  user/dfr/gssapi/7/usr.bin/ktrace/   (props changed)
  user/dfr/gssapi/7/usr.bin/ldd/   (props changed)
  user/dfr/gssapi/7/usr.bin/lockf/   (props changed)
  user/dfr/gssapi/7/usr.bin/logger/   (props changed)
  user/dfr/gssapi/7/usr.bin/make/   (props changed)
  user/dfr/gssapi/7/usr.bin/netstat/   (props changed)
  user/dfr/gssapi/7/usr.bin/procstat/   (props changed)
  user/dfr/gssapi/7/usr.bin/rpcgen/   (props changed)
  user/dfr/gssapi/7/usr.bin/sed/   (props changed)
  user/dfr/gssapi/7/usr.bin/shar/   (props changed)
  user/dfr/gssapi/7/usr.bin/su/   (props changed)
  user/dfr/gssapi/7/usr.bin/tar/   (props changed)
  user/dfr/gssapi/7/usr.bin/top/   (props changed)
  user/dfr/gssapi/7/usr.bin/truncate/   (props changed)
  user/dfr/gssapi/7/usr.bin/truss/   (props changed)
  user/dfr/gssapi/7/usr.bin/units/   (props changed)
  user/dfr/gssapi/7/usr.bin/vmstat/   (props changed)
  user/dfr/gssapi/7/usr.bin/whereis/   (props changed)
  user/dfr/gssapi/7/usr.bin/window/   (props changed)
  user/dfr/gssapi/7/usr.sbin/   (props changed)
  user/dfr/gssapi/7/usr.sbin/adduser/   (props changed)
  user/dfr/gssapi/7/usr.sbin/bsnmpd/modules/snmp_pf/   (props changed)
  user/dfr/gssapi/7/usr.sbin/cdcontrol/   (props changed)
  user/dfr/gssapi/7/usr.sbin/config/   (props changed)
  user/dfr/gssapi/7/usr.sbin/cron/   (props changed)
  user/dfr/gssapi/7/usr.sbin/cron/cron/   (props changed)
  user/dfr/gssapi/7/usr.sbin/extattr/   (props changed)
  user/dfr/gssapi/7/usr.sbin/freebsd-update/   (props changed)
  user/dfr/gssapi/7/usr.sbin/iostat/   (props changed)
  user/dfr/gssapi/7/usr.sbin/mountd/   (props changed)
  user/dfr/gssapi/7/usr.sbin/ndiscvt/   (props changed)
  user/dfr/gssapi/7/usr.sbin/newsyslog/newsyslog.conf.5   (props changed)
  user/dfr/gssapi/7/usr.sbin/nscd/   (props changed)
  user/dfr/gssapi/7/usr.sbin/ntp/   (props changed)
  user/dfr/gssapi/7/usr.sbin/pkg_install/   (props changed)
  user/dfr/gssapi/7/usr.sbin/pmcstat/   (props changed)
  user/dfr/gssapi/7/usr.sbin/portsnap/   (props changed)
  user/dfr/gssapi/7/usr.sbin/portsnap/portsnap/portsnap.8
  user/dfr/gssapi/7/usr.sbin/powerd/   (props changed)
  user/dfr/gssapi/7/usr.sbin/pw/   (props changed)
  user/dfr/gssapi/7/usr.sbin/rpc.lockd/   (props changed)
  user/dfr/gssapi/7/usr.sbin/rpc.statd/   (props changed)
  user/dfr/gssapi/7/usr.sbin/setfib/   (props changed)
  user/dfr/gssapi/7/usr.sbin/sysinstall/   (props changed)
  user/dfr/gssapi/7/usr.sbin/sysinstall/dist.c
  user/dfr/gssapi/7/usr.sbin/syslogd/   (props changed)
  user/dfr/gssapi/7/usr.sbin/traceroute/   (props changed)
  user/dfr/gssapi/7/usr.sbin/traceroute/Makefile
  user/dfr/gssapi/7/usr.sbin/tzsetup/   (props changed)
  user/dfr/gssapi/7/usr.sbin/wpa/wpa_supplicant/   (props changed)

Modified: user/dfr/gssapi/7/bin/chio/chio.c
==============================================================================
--- user/dfr/gssapi/7/bin/chio/chio.c	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/bin/chio/chio.c	Fri Nov 14 10:59:36 2008	(r184966)
@@ -69,7 +69,7 @@ static	const char *bits_to_string(ces_st
 
 static	void find_element(char *, uint16_t *, uint16_t *);
 static	struct changer_element_status *get_element_status
-	   (unsigned int, unsigned int);
+	   (unsigned int, unsigned int, int);
 
 static	int do_move(const char *, int, char **);
 static	int do_exchange(const char *, int, char **);
@@ -969,7 +969,8 @@ do_return(const char *cname, int argc, c
 	++argv; --argc;
 
 	/* Get the status */
-	ces = get_element_status((unsigned int)type, (unsigned int)element);
+	ces = get_element_status((unsigned int)type, (unsigned int)element,
+	    CHET_VT == type);
 
 	if (NULL == ces)
 		errx(1, "%s: null element status pointer", cname);
@@ -1004,7 +1005,7 @@ usage:
  * should free() it when done.
  */
 static struct changer_element_status *
-get_element_status(unsigned int type, unsigned int element)
+get_element_status(unsigned int type, unsigned int element, int use_voltags)
 {
 	struct changer_element_status_request cesr;
 	struct changer_element_status *ces;
@@ -1020,7 +1021,8 @@ get_element_status(unsigned int type, un
 	cesr.cesr_element_type = (uint16_t)type;
 	cesr.cesr_element_base = (uint16_t)element;
 	cesr.cesr_element_count = 1;		/* Only this one element */
-	cesr.cesr_flags |= CESR_VOLTAGS;	/* Grab voltags as well */
+	if (use_voltags)
+		cesr.cesr_flags |= CESR_VOLTAGS; /* Grab voltags as well */
 	cesr.cesr_element_status = ces;
 
 	if (ioctl(changer_fd, CHIOGSTATUS, (char *)&cesr) == -1) {

Copied: user/dfr/gssapi/7/contrib/traceroute/as.c (from r184965, stable/7/contrib/traceroute/as.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/dfr/gssapi/7/contrib/traceroute/as.c	Fri Nov 14 10:59:36 2008	(r184966, copy of r184965, stable/7/contrib/traceroute/as.c)
@@ -0,0 +1,242 @@
+/* $FreeBSD$ */
+/*	$NetBSD: as.c,v 1.1 2001/11/04 23:14:36 atatat Exp $	*/
+
+/*
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Andrew Brown.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT 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.
+ */
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <err.h>
+#include <stdio.h>
+
+#include "as.h"
+
+#define DEFAULT_AS_SERVER "whois.radb.net"
+#undef AS_DEBUG_FILE
+
+struct aslookup {
+	FILE *as_f;
+#ifdef AS_DEBUG_FILE
+	FILE *as_debug;
+#endif /* AS_DEBUG_FILE */
+};
+
+void *
+as_setup(server)
+	char *server;
+{
+	struct aslookup *asn;
+	struct hostent *he = NULL;
+	struct servent *se;
+	struct sockaddr_in in;
+	FILE *f;
+	int s;
+
+	if (server == NULL)
+		server = DEFAULT_AS_SERVER;
+
+	(void)memset(&in, 0, sizeof(in));
+	in.sin_family = AF_INET;
+	in.sin_len = sizeof(in);
+	if ((se = getservbyname("whois", "tcp")) == NULL) {
+		warnx("warning: whois/tcp service not found");
+		in.sin_port = ntohs(43);
+	} else
+		in.sin_port = se->s_port;
+
+	if (inet_aton(server, &in.sin_addr) == 0 && 
+	    ((he = gethostbyname(server)) == NULL ||
+	    he->h_addr == NULL)) {
+		warnx("%s: %s", server, hstrerror(h_errno));
+		return (NULL);
+	}
+
+	if ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) {
+		warn("socket");
+		return (NULL);
+	}
+
+	do {
+		if (he != NULL) {
+			memcpy(&in.sin_addr, he->h_addr, he->h_length);
+			he->h_addr_list++;
+		}
+		if (connect(s, (struct sockaddr *)&in, sizeof(in)) == 0)
+			break;
+		if (he == NULL || he->h_addr == NULL) {
+			close(s);
+			s = -1;
+			break;
+		}
+	} while (1);
+
+	if (s == -1) {
+		warn("connect");
+		return (NULL);
+	}
+
+	f = fdopen(s, "r+");
+	(void)fprintf(f, "!!\n");
+	(void)fflush(f);
+
+	asn = malloc(sizeof(struct aslookup));
+	if (asn == NULL)
+		(void)fclose(f);
+	else
+		asn->as_f = f;
+
+#ifdef AS_DEBUG_FILE
+	asn->as_debug = fopen(AS_DEBUG_FILE, "w");
+	if (asn->as_debug) {
+		(void)fprintf(asn->as_debug, ">> !!\n");
+		(void)fflush(asn->as_debug);
+	}
+#endif /* AS_DEBUG_FILE */
+
+	return (asn);
+}
+
+int
+as_lookup(_asn, addr)
+	void *_asn;
+	struct in_addr *addr;
+{
+	struct aslookup *asn = _asn;
+	char buf[1024];
+	int as, rc, dlen;
+
+	as = rc = dlen = 0;
+	(void)fprintf(asn->as_f, "!r%s/32,l\n", inet_ntoa(*addr));
+	(void)fflush(asn->as_f);
+
+#ifdef AS_DEBUG_FILE
+	if (asn->as_debug) {
+		(void)fprintf(asn->as_debug, ">> !r%s/32,l\n",
+		     inet_ntoa(*addr));
+		(void)fflush(asn->as_debug);
+	}
+#endif /* AS_DEBUG_FILE */
+
+	while (fgets(buf, sizeof(buf), asn->as_f) != NULL) {
+		buf[sizeof(buf) - 1] = '\0';
+
+#ifdef AS_DEBUG_FILE
+		if (asn->as_debug) {
+			(void)fprintf(asn->as_debug, "<< %s", buf);
+			(void)fflush(asn->as_debug);
+		}
+#endif /* AS_DEBUG_FILE */
+
+		if (rc == 0) {
+			rc = buf[0];
+			switch (rc) {
+			    case 'A':
+				/* A - followed by # bytes of answer */
+				sscanf(buf, "A%d\n", &dlen);
+#ifdef AS_DEBUG_FILE
+				if (asn->as_debug) {
+					(void)fprintf(asn->as_debug,
+					     "dlen: %d\n", dlen);
+					(void)fflush(asn->as_debug);
+				}
+#endif /* AS_DEBUG_FILE */
+				break;
+			    case 'C':	
+			    case 'D':
+			    case 'E':
+			    case 'F':
+				/* C - no data returned */
+				/* D - key not found */
+				/* E - multiple copies of key */
+				/* F - some other error */
+				break;
+			}
+			if (rc == 'A')
+				/* skip to next input line */
+				continue;
+		}
+
+		if (dlen == 0)
+			/* out of data, next char read is end code */
+			rc = buf[0];
+		if (rc != 'A')
+			/* either an error off the bat, or a done code */
+			break;
+
+		/* data received, thank you */
+		dlen -= strlen(buf);
+
+		/* origin line is the interesting bit */
+		if (as == 0 && strncasecmp(buf, "origin:", 7) == 0) {
+			sscanf(buf + 7, " AS%d", &as);
+#ifdef AS_DEBUG_FILE
+			if (asn->as_debug) {
+				(void)fprintf(asn->as_debug, "as: %d\n", as);
+				(void)fflush(asn->as_debug);
+			}
+#endif /* AS_DEBUG_FILE */
+		}
+	}
+
+	return (as);
+}
+
+void
+as_shutdown(_asn)
+	void *_asn;
+{
+	struct aslookup *asn = _asn;
+
+	(void)fprintf(asn->as_f, "!q\n");
+	(void)fclose(asn->as_f);
+
+#ifdef AS_DEBUG_FILE
+	if (asn->as_debug) {
+		(void)fprintf(asn->as_debug, ">> !q\n");
+		(void)fclose(asn->as_debug);
+	}
+#endif /* AS_DEBUG_FILE */
+
+	free(asn);
+}

Copied: user/dfr/gssapi/7/contrib/traceroute/as.h (from r184965, stable/7/contrib/traceroute/as.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/dfr/gssapi/7/contrib/traceroute/as.h	Fri Nov 14 10:59:36 2008	(r184966, copy of r184965, stable/7/contrib/traceroute/as.h)
@@ -0,0 +1,42 @@
+/* $FreeBSD$ */
+/*	$NetBSD: as.h,v 1.1 2001/11/04 23:14:36 atatat Exp $	*/
+
+/*
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Andrew Brown.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT 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.
+ */
+
+void	*as_setup __P((char *));
+int	as_lookup __P((void *, struct in_addr *));
+void	as_shutdown __P((void *));

Modified: user/dfr/gssapi/7/contrib/traceroute/traceroute.8
==============================================================================
--- user/dfr/gssapi/7/contrib/traceroute/traceroute.8	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/contrib/traceroute/traceroute.8	Fri Nov 14 10:59:36 2008	(r184966)
@@ -16,7 +16,7 @@
 .\"	$Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $
 .\"	$FreeBSD$
 .\"
-.TH TRACEROUTE 8 "21 September 2000"
+.TH TRACEROUTE 8 "19 February 2008"
 .UC 6
 .SH NAME
 traceroute \- print the route packets take to network host
@@ -24,7 +24,7 @@ traceroute \- print the route packets ta
 .na
 .B traceroute
 [
-.B \-dDeFISnrvx
+.B \-adDeFISnrvx
 ] [
 .B \-f
 .I first_ttl
@@ -71,6 +71,9 @@ traceroute \- print the route packets ta
 .B \-w
 .I waittime
 ] [
+.B \-A
+.I as_server
+] [
 .B \-z
 .I pausemsecs
 ]
@@ -98,6 +101,13 @@ name.
 .PP
 Other options are:
 .TP
+.B \-a
+Turn on AS# lookups for each hop encountered.
+.TP
+.B -A
+Turn  on  AS#  lookups  and  use the given server instead of the
+default.
+.TP
 .B \-e
 Firewall evasion mode.
 Use fixed destination ports for UDP and TCP probes.
@@ -443,3 +453,7 @@ should listen for a RST from the destina
 router that's filtering packets), but this is not implemented yet.
 .PP
 Please send bug reports to traceroute at ee.lbl.gov.
+.PP
+The AS number capability reports information that may sometimes be
+inaccurate due to discrepancies between the contents of the
+routing database server and the current state of the Internet.

Modified: user/dfr/gssapi/7/contrib/traceroute/traceroute.c
==============================================================================
--- user/dfr/gssapi/7/contrib/traceroute/traceroute.c	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/contrib/traceroute/traceroute.c	Fri Nov 14 10:59:36 2008	(r184966)
@@ -263,6 +263,7 @@ static const char rcsid[] =
 
 #include "findsaddr.h"
 #include "ifaddrlist.h"
+#include "as.h"
 #include "traceroute.h"
 
 /* Maximum number of gateways (include room for one noop) */
@@ -350,6 +351,9 @@ int options;			/* socket options */
 int verbose;
 int waittime = 5;		/* time to wait for response (in seconds) */
 int nflag;			/* print addresses numerically */
+int as_path;			/* print as numbers for each hop */
+char *as_server = NULL;
+void *asn;
 #ifdef CANT_HACK_IPCKSUM
 int doipcksum = 0;		/* don't calculate ip checksums by default */
 #else
@@ -535,9 +539,17 @@ main(int argc, char **argv)
 		prog = argv[0];
 
 	opterr = 0;
-	while ((op = getopt(argc, argv, "edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF)
+	while ((op = getopt(argc, argv, "aA:edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF)
 		switch (op) {
-
+		case 'a':
+			as_path = 1;
+			break;
+			
+		case 'A':
+			as_path = 1;
+			as_server = optarg;
+			break;
+			    
 		case 'd':
 			options |= SO_DEBUG;
 			break;
@@ -913,6 +925,16 @@ main(int argc, char **argv)
 		exit (1);
 	}
 
+	if (as_path) {
+		asn = as_setup(as_server);
+		if (asn == NULL) {
+			Fprintf(stderr, "%s: as_setup failed, AS# lookups"
+			    " disabled\n", prog);
+			(void)fflush(stderr);
+			as_path = 0;
+		}
+	}
+	
 #if	defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
 	if (setpolicy(sndsock, "in bypass") < 0)
 		errx(1, "%s", ipsec_strerror());
@@ -1118,6 +1140,8 @@ main(int argc, char **argv)
 		    (unreachable > 0 && unreachable >= nprobes - 1))
 			break;
 	}
+	if (as_path)
+		as_shutdown(asn);
 	exit(0);
 }
 
@@ -1458,6 +1482,9 @@ print(register u_char *buf, register int
 	hlen = ip->ip_hl << 2;
 	cc -= hlen;
 
+	if (as_path)
+		Printf(" [AS%d]", as_lookup(asn, &from->sin_addr));
+
 	if (nflag)
 		Printf(" %s", inet_ntoa(from->sin_addr));
 	else
@@ -1764,8 +1791,8 @@ usage(void)
 
 	Fprintf(stderr, "Version %s\n", version);
 	Fprintf(stderr,
-	    "Usage: %s [-dDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n"
+	    "Usage: %s [-adDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n"
 	    "\t[-m max_ttl] [-p port] [-P proto] [-q nqueries] [-s src_addr]\n"
-	    "\t[-t tos] [-w waittime] [-z pausemsecs] host [packetlen]\n", prog);
+	    "\t[-t tos] [-w waittime] [-A as_server] [-z pausemsecs] host [packetlen]\n", prog);
 	exit(1);
 }

Modified: user/dfr/gssapi/7/include/time.h
==============================================================================
--- user/dfr/gssapi/7/include/time.h	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/include/time.h	Fri Nov 14 10:59:36 2008	(r184966)
@@ -108,6 +108,7 @@ typedef	__timer_t	timer_t;
 #define CLOCK_MONOTONIC_PRECISE	11	/* FreeBSD-specific. */
 #define CLOCK_MONOTONIC_FAST	12	/* FreeBSD-specific. */
 #define CLOCK_SECOND	13		/* FreeBSD-specific. */
+#define CLOCK_THREAD_CPUTIME_ID	14
 #endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */
 
 #if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112

Modified: user/dfr/gssapi/7/include/unistd.h
==============================================================================
--- user/dfr/gssapi/7/include/unistd.h	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/include/unistd.h	Fri Nov 14 10:59:36 2008	(r184966)
@@ -111,7 +111,7 @@ typedef	__useconds_t	useconds_t;
 #define	_POSIX_SPIN_LOCKS		200112L
 #define	_POSIX_THREAD_ATTR_STACKADDR	200112L
 #define	_POSIX_THREAD_ATTR_STACKSIZE	200112L
-#define	_POSIX_THREAD_CPUTIME		-1
+#define	_POSIX_THREAD_CPUTIME		200112L
 #define	_POSIX_THREAD_PRIO_INHERIT	200112L
 #define	_POSIX_THREAD_PRIO_PROTECT	200112L
 #define	_POSIX_THREAD_PRIORITY_SCHEDULING 200112L

Modified: user/dfr/gssapi/7/lib/libc/amd64/SYS.h
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/SYS.h	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/SYS.h	Fri Nov 14 10:59:36 2008	(r184966)
@@ -43,13 +43,15 @@
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret; \
-			2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx
+			2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx; \
+			END(__CONCAT(__sys_,x))
 
 #define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret ; \
-			2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx
+			2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx; \
+			END(__CONCAT(__sys_,x))
 #else
 #define	RSYSCALL(x)	ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(x);					\
@@ -57,13 +59,15 @@
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret; \
-			2: jmp HIDENAME(cerror)
+			2: jmp HIDENAME(cerror);			\
+			END(__CONCAT(__sys_,x))
 
 #define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret; \
-			2: jmp HIDENAME(cerror)
+			2: jmp HIDENAME(cerror);			\
+			END(__CONCAT(__sys_,x))
 #endif
 
 #define KERNCALL	movq %rcx, %r10; syscall

Modified: user/dfr/gssapi/7/lib/libc/amd64/gen/_setjmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/gen/_setjmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/gen/_setjmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -60,6 +60,7 @@ ENTRY(_setjmp)
 	fnstcw	64(%rax)		/* 8; fpu cw */
 	xorq	%rax,%rax
 	ret
+END(_setjmp)
 
 	.weak	CNAME(_longjmp)
 	.set	CNAME(_longjmp),CNAME(___longjmp)
@@ -81,3 +82,4 @@ ENTRY(___longjmp)
 	incq	%rax
 1:	movq	%rcx,0(%rsp)
 	ret
+END(___longjmp)

Modified: user/dfr/gssapi/7/lib/libc/amd64/gen/fabs.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/gen/fabs.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/gen/fabs.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -37,6 +37,7 @@ ENTRY(fabs)
 	movsd	signbit(%rip), %xmm0
 	andnpd  %xmm1, %xmm0
 	ret
+END(fabs)
 
 	.data
 signbit:

Modified: user/dfr/gssapi/7/lib/libc/amd64/gen/modf.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/gen/modf.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/gen/modf.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -86,3 +86,4 @@ ENTRY(modf)
 	movsd   -8(%rsp),%xmm0
 
 	ret
+END(modf)

Modified: user/dfr/gssapi/7/lib/libc/amd64/gen/rfork_thread.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/gen/rfork_thread.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/gen/rfork_thread.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -99,3 +99,4 @@ ENTRY(rfork_thread)
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(rfork_thread)

Modified: user/dfr/gssapi/7/lib/libc/amd64/gen/setjmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/gen/setjmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/gen/setjmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -69,6 +69,7 @@ ENTRY(setjmp)
 	fnstcw	64(%rcx)		/* 8; fpu cw */
 	xorq	%rax,%rax
 	ret
+END(setjmp)
 
 	.weak CNAME(longjmp)
 	.set CNAME(longjmp),CNAME(__longjmp)
@@ -99,3 +100,4 @@ ENTRY(__longjmp)
 	incq	%rax
 1:	movq	%rcx,0(%rsp)
 	ret
+END(__longjmp)

Modified: user/dfr/gssapi/7/lib/libc/amd64/gen/sigsetjmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/gen/sigsetjmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/gen/sigsetjmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -77,6 +77,7 @@ ENTRY(sigsetjmp)
 	fnstcw	64(%rcx)		/* 8; fpu cw */
 	xorq	%rax,%rax
 	ret
+END(sigsetjmp)
 
 	.weak CNAME(siglongjmp)
 	.set CNAME(siglongjmp),CNAME(__siglongjmp)
@@ -109,3 +110,4 @@ ENTRY(__siglongjmp)
 	incq	%rax
 1:	movq	%rcx,0(%rsp)
 	ret
+END(__siglongjmp)

Modified: user/dfr/gssapi/7/lib/libc/amd64/stdlib/div.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/stdlib/div.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/stdlib/div.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -15,3 +15,4 @@ ENTRY(div)
 	salq	$32,%rdx
 	orq	%rdx,%rax
 	ret
+END(div)

Modified: user/dfr/gssapi/7/lib/libc/amd64/stdlib/ldiv.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/stdlib/ldiv.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/stdlib/ldiv.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -13,3 +13,4 @@ ENTRY(ldiv)
 	cqto
 	idivq	%rsi
 	ret
+END(ldiv)

Modified: user/dfr/gssapi/7/lib/libc/amd64/stdlib/lldiv.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/stdlib/lldiv.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/stdlib/lldiv.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -13,3 +13,4 @@ ENTRY(lldiv)
 	cqto
 	idivq	%rsi
 	ret
+END(lldiv)

Modified: user/dfr/gssapi/7/lib/libc/amd64/string/bcmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/string/bcmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/string/bcmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -22,3 +22,4 @@ L1:
 	setne	%al
 	movsbl	%al,%eax
 	ret
+END(bcmp)

Modified: user/dfr/gssapi/7/lib/libc/amd64/string/bcopy.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/string/bcopy.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/string/bcopy.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -86,3 +86,12 @@ ENTRY(bcopy)
 	movsq
 	cld
 	ret
+#ifdef MEMCOPY
+END(memcpy)
+#else
+#ifdef MEMMOVE
+END(memmove)
+#else
+END(bcopy)
+#endif
+#endif

Modified: user/dfr/gssapi/7/lib/libc/amd64/string/bzero.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/string/bzero.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/string/bzero.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -41,3 +41,4 @@ L1:	movq	%rsi,%rcx		/* zero remainder by
 	stosb
 
 	ret
+END(bzero)

Modified: user/dfr/gssapi/7/lib/libc/amd64/string/memcmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/string/memcmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/string/memcmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -39,3 +39,4 @@ L6:	xorl	%eax,%eax		/* Perform unsigned 
 	movb	-1(%rsi),%dl
 	subl    %edx,%eax
 	ret
+END(memcmp)

Modified: user/dfr/gssapi/7/lib/libc/amd64/string/memset.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/string/memset.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/string/memset.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -58,3 +58,4 @@ L1:	rep
 	movq	%r11,%rax
 
 	ret
+END(memset)

Modified: user/dfr/gssapi/7/lib/libc/amd64/string/strcat.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/string/strcat.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/string/strcat.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -163,3 +163,4 @@ ENTRY(strcat)
 
 .Ldone:
 	ret
+END(strcat)

Modified: user/dfr/gssapi/7/lib/libc/amd64/string/strcmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/string/strcmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/string/strcmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -71,3 +71,4 @@ ENTRY(strcmp)
 	movzbq	%dl,%rdx
 	subq	%rdx,%rax
 	ret
+END(strcmp)

Modified: user/dfr/gssapi/7/lib/libc/amd64/string/strcpy.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/string/strcpy.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/string/strcpy.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -109,3 +109,4 @@ ENTRY(strcpy)
 
 .Ldone:
 	ret
+END(strcpy)

Modified: user/dfr/gssapi/7/lib/libc/amd64/sys/brk.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/sys/brk.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/sys/brk.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 ENTRY(_brk)
 	pushq	%rdi
 	jmp	ok
+END(_brk)
 
 ENTRY(brk)
 	pushq	%rdi
@@ -81,3 +82,4 @@ err:
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(brk)

Modified: user/dfr/gssapi/7/lib/libc/amd64/sys/exect.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/sys/exect.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/sys/exect.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -53,3 +53,4 @@ ENTRY(exect)
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(exect)

Modified: user/dfr/gssapi/7/lib/libc/amd64/sys/getcontext.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/sys/getcontext.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/sys/getcontext.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -52,3 +52,4 @@ ENTRY(__sys_getcontext)
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(__sys_getcontext)

Modified: user/dfr/gssapi/7/lib/libc/amd64/sys/pipe.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/sys/pipe.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/sys/pipe.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -57,3 +57,4 @@ ENTRY(__sys_pipe)
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(__sys_pipe)

Modified: user/dfr/gssapi/7/lib/libc/amd64/sys/ptrace.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/sys/ptrace.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/sys/ptrace.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -57,3 +57,4 @@ err:
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(ptrace)

Modified: user/dfr/gssapi/7/lib/libc/amd64/sys/reboot.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/sys/reboot.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/sys/reboot.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -54,3 +54,4 @@ ENTRY(__sys_reboot)
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(__sys_reboot)

Modified: user/dfr/gssapi/7/lib/libc/amd64/sys/sbrk.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/sys/sbrk.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/sys/sbrk.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -85,3 +85,4 @@ err:
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(sbrk)

Modified: user/dfr/gssapi/7/lib/libc/amd64/sys/setlogin.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/sys/setlogin.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/sys/setlogin.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -62,3 +62,4 @@ ENTRY(__sys_setlogin)
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(__sys_setlogin)

Modified: user/dfr/gssapi/7/lib/libc/amd64/sys/vfork.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/amd64/sys/vfork.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/amd64/sys/vfork.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -56,3 +56,4 @@ ENTRY(__sys_vfork)
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(__sys_vfork)

Modified: user/dfr/gssapi/7/lib/libc/i386/SYS.h
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/SYS.h	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/SYS.h	Fri Nov 14 10:59:36 2008	(r184966)
@@ -44,13 +44,14 @@
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%eax; KERNCALL; jb 2b
 
-#define	RSYSCALL(x)	SYSCALL(x); ret
+#define	RSYSCALL(x)	SYSCALL(x); ret; END(__CONCAT(__sys_,x))
 
 #define	PSEUDO(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \
 			ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			mov __CONCAT($SYS_,x),%eax; KERNCALL; jb 2b; ret
+			mov __CONCAT($SYS_,x),%eax; KERNCALL; jb 2b; ret; \
+			END(__CONCAT(__sys_,x))
 
 /* gas messes up offset -- although we don't currently need it, do for BCS */
 #define	LCALL(x,y)	.byte 0x9a ; .long y; .word x

Modified: user/dfr/gssapi/7/lib/libc/i386/gen/_ctx_start.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/gen/_ctx_start.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/gen/_ctx_start.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -49,3 +49,4 @@ ENTRY(_ctx_start)
 	call	PIC_PLT(_ctx_done)	/* should never return */
 	call	PIC_PLT(abort)		/* fubar */
 	ret
+END(_ctx_start)

Modified: user/dfr/gssapi/7/lib/libc/i386/gen/_setjmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/gen/_setjmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/gen/_setjmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -58,6 +58,7 @@ ENTRY(_setjmp)
 	fnstcw	24(%eax)
 	xorl	%eax,%eax
 	ret
+END(_setjmp)
 
 	.weak	CNAME(_longjmp)
 	.set	CNAME(_longjmp),CNAME(___longjmp)
@@ -77,3 +78,4 @@ ENTRY(___longjmp)
 	incl	%eax
 1:	movl	%ecx,0(%esp)
 	ret
+END(___longjmp)

Modified: user/dfr/gssapi/7/lib/libc/i386/gen/fabs.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/gen/fabs.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/gen/fabs.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -40,3 +40,4 @@ ENTRY(fabs)
 	fldl	4(%esp)
 	fabs
 	ret
+END(fabs)

Modified: user/dfr/gssapi/7/lib/libc/i386/gen/modf.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/gen/modf.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/gen/modf.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -82,3 +82,4 @@ ENTRY(modf)
 	fdivp	/* return +/- 0 for +/- Inf, NaN for NaN */
 	leave
 	ret
+END(modf)

Modified: user/dfr/gssapi/7/lib/libc/i386/gen/rfork_thread.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/gen/rfork_thread.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/gen/rfork_thread.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -115,3 +115,4 @@ ENTRY(rfork_thread)
 	popl	%ebp
 	PIC_PROLOGUE
 	jmp	PIC_PLT(HIDENAME(cerror))
+END(rfork_thread)

Modified: user/dfr/gssapi/7/lib/libc/i386/gen/setjmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/gen/setjmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/gen/setjmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -69,6 +69,7 @@ ENTRY(setjmp)
 	fnstcw	24(%ecx)
 	xorl	%eax,%eax
 	ret
+END(setjmp)
 
 	.weak CNAME(longjmp)
 	.set CNAME(longjmp),CNAME(__longjmp)
@@ -97,3 +98,4 @@ ENTRY(__longjmp)
 	incl	%eax
 1:	movl	%ecx,0(%esp)
 	ret
+END(__longjmp)

Modified: user/dfr/gssapi/7/lib/libc/i386/gen/sigsetjmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/gen/sigsetjmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/gen/sigsetjmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -78,10 +78,11 @@ ENTRY(sigsetjmp)
 	fnstcw	24(%ecx)
 	xorl	%eax,%eax
 	ret
+END(sigsetjmp)
 
 	.weak CNAME(siglongjmp);
-	.set CNAME(siglongjmp),CNAME(__siglongjmp);
-ENTRY(__siglongjmp);
+	.set CNAME(siglongjmp),CNAME(__siglongjmp)
+ENTRY(__siglongjmp)
 	movl	4(%esp),%edx
 	cmpl	$0,44(%edx)
 	jz	2f
@@ -108,3 +109,4 @@ ENTRY(__siglongjmp);
 	incl	%eax
 1:	movl	%ecx,0(%esp)
 	ret
+END(__siglongjmp)

Modified: user/dfr/gssapi/7/lib/libc/i386/stdlib/abs.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/stdlib/abs.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/stdlib/abs.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -44,3 +44,4 @@ ENTRY(abs)
 	jns	1f
 	negl	%eax
 1:	ret
+END(abs)

Modified: user/dfr/gssapi/7/lib/libc/i386/stdlib/div.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/stdlib/div.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/stdlib/div.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -36,3 +36,4 @@ ENTRY(div)
         movl    %eax,4(%esp)
         movl    %edx,8(%esp)
         ret
+END(div)

Modified: user/dfr/gssapi/7/lib/libc/i386/stdlib/labs.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/stdlib/labs.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/stdlib/labs.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -44,3 +44,4 @@ ENTRY(labs)
 	jns	1f
 	negl	%eax
 1:	ret
+END(labs)

Modified: user/dfr/gssapi/7/lib/libc/i386/stdlib/ldiv.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/stdlib/ldiv.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/stdlib/ldiv.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -39,3 +39,4 @@ ENTRY(ldiv)
         movl    %eax,4(%esp)
         movl    %edx,8(%esp)
         ret
+END(ldiv)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/bcmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/bcmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/bcmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -61,3 +61,4 @@ L1:
 	popl	%esi
 	popl	%edi
 	ret
+END(bcmp)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/bcopy.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/bcopy.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/bcopy.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -97,3 +97,12 @@ ENTRY(bcopy)
 	popl	%esi
 	cld
 	ret
+#ifdef MEMCOPY
+END(memcpy)
+#else
+#ifdef MEMMOVE
+END(memmove)
+#else
+END(bcopy)
+#endif
+#endif

Modified: user/dfr/gssapi/7/lib/libc/i386/string/bzero.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/bzero.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/bzero.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -79,3 +79,4 @@ L1:	rep
 	popl	%ebx
 	popl	%edi
 	ret
+END(bzero)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/ffs.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/ffs.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/ffs.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -51,3 +51,4 @@ ENTRY(ffs)
 	.align 2
 L1:	xorl	%eax,%eax		/* clear result */
 	ret
+END(ffs)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/index.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/index.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/index.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -61,3 +61,4 @@ L1:
 L2:
 	popl	%ebx
 	ret
+END(index)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/memchr.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/memchr.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/memchr.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -56,3 +56,4 @@ ENTRY(memchr)
 L1:	xorl	%eax,%eax
 	popl	%edi
 	ret
+END(memchr)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/memcmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/memcmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/memcmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -73,3 +73,4 @@ L6:	movzbl  -1(%edi),%eax		/* Perform un
 	popl	%esi
 	popl	%edi
 	ret
+END(memcmp)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/memset.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/memset.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/memset.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -87,3 +87,4 @@ L1:	rep
 	popl	%ebx
 	popl	%edi
 	ret
+END(memset)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/rindex.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/rindex.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/rindex.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -62,3 +62,4 @@ L2:	
 	jne	L1
 	popl	%ebx
 	ret
+END(rindex)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/strcat.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/strcat.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/strcat.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -98,3 +98,4 @@ L1:	movb	(%edx),%al		/* unroll loop, but
 L2:	popl	%eax			/* pop destination address */
 	popl	%edi			/* restore edi */
 	ret
+END(strcat)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/strchr.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/strchr.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/strchr.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -61,3 +61,4 @@ L1:
 L2:
 	popl	%ebx
 	ret
+END(strchr)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/strcmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/strcmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/strcmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -117,3 +117,4 @@ L3:     movzbl  (%eax),%eax             
 	movzbl  (%edx),%edx
 	subl	%edx,%eax
 	ret
+END(strcmp)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/strcpy.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/strcpy.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/strcpy.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -87,3 +87,4 @@ L1:	movb	(%edx),%al		/* unroll loop, but
 	jne	L1
 L2:	popl	%eax			/* pop dst address */
 	ret
+END(strcpy)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/strlen.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/strlen.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/strlen.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -51,3 +51,4 @@ ENTRY(strlen)
 	leal	-1(%ecx),%eax		/* and subtracting one */
 	popl	%edi
 	ret
+END(strlen)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/strncmp.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/strncmp.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/strncmp.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -164,3 +164,4 @@ L3:	movzbl	(%eax),%eax		/* unsigned comp
 L4:	xorl	%eax,%eax
 	popl	%ebx
 	ret
+END(strncmp)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/strrchr.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/strrchr.S	Fri Nov 14 09:58:16 2008	(r184965)
+++ user/dfr/gssapi/7/lib/libc/i386/string/strrchr.S	Fri Nov 14 10:59:36 2008	(r184966)
@@ -62,3 +62,4 @@ L2:	
 	jne	L1
 	popl	%ebx
 	ret
+END(strrchr)

Modified: user/dfr/gssapi/7/lib/libc/i386/string/swab.S
==============================================================================
--- user/dfr/gssapi/7/lib/libc/i386/string/swab.S	Fri Nov 14 09:58:16 2008	(r184965)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-user mailing list