D15831.diff
No OneTemporary
Actions

Size

40 KB

Referenced Files

None

Subscribers

None

D15831.diff
View Options

	Index: head/lib/libc/gen/__xuname.c
	===================================================================
	--- head/lib/libc/gen/__xuname.c
	+++ head/lib/libc/gen/__xuname.c
	@@ -27,11 +27,10 @@
	* 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.
	+ *
	+ * From: @(#)uname.c 8.1 (Berkeley) 1/4/94
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-/static char sccsid[] = "From: @(#)uname.c 8.1 (Berkeley) 1/4/94";/
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	__FBSDID("$FreeBSD$");

	Index: head/lib/libc/gen/alarm.c
	===================================================================
	--- head/lib/libc/gen/alarm.c
	+++ head/lib/libc/gen/alarm.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)alarm.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)alarm.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	/*
	Index: head/lib/libc/gen/assert.c
	===================================================================
	--- head/lib/libc/gen/assert.c
	+++ head/lib/libc/gen/assert.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)assert.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)assert.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <assert.h>
	Index: head/lib/libc/gen/clock.c
	===================================================================
	--- head/lib/libc/gen/clock.c
	+++ head/lib/libc/gen/clock.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)clock.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)clock.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/closedir.c
	===================================================================
	--- head/lib/libc/gen/closedir.c
	+++ head/lib/libc/gen/closedir.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)closedir.c 8.1 (Berkeley) 6/10/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)closedir.c 8.1 (Berkeley) 6/10/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/confstr.c
	===================================================================
	--- head/lib/libc/gen/confstr.c
	+++ head/lib/libc/gen/confstr.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)confstr.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)confstr.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/crypt.c
	===================================================================
	--- head/lib/libc/gen/crypt.c
	+++ head/lib/libc/gen/crypt.c
	@@ -32,11 +32,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-/* from static char sccsid[] = "@(#)crypt.c 5.11 (Berkeley) 6/25/91"; */
	-#endif /* LIBC_SCCS and not lint */
	-
	#include <sys/cdefs.h>
	+__SCCSID("@(#)crypt.c 5.11 (Berkeley) 6/25/91");
	__FBSDID("$FreeBSD$");

	#include <stdio.h>
	Index: head/lib/libc/gen/daemon.c
	===================================================================
	--- head/lib/libc/gen/daemon.c
	+++ head/lib/libc/gen/daemon.c
	@@ -30,10 +30,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)daemon.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)daemon.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/devname.c
	===================================================================
	--- head/lib/libc/gen/devname.c
	+++ head/lib/libc/gen/devname.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)devname.c 8.2 (Berkeley) 4/29/95";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)devname.c 8.2 (Berkeley) 4/29/95");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/disklabel.c
	===================================================================
	--- head/lib/libc/gen/disklabel.c
	+++ head/lib/libc/gen/disklabel.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 5/3/95";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)disklabel.c 8.2 (Berkeley) 5/3/95");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/err.c
	===================================================================
	--- head/lib/libc/gen/err.c
	+++ head/lib/libc/gen/err.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)err.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/errlst.c
	===================================================================
	--- head/lib/libc/gen/errlst.c
	+++ head/lib/libc/gen/errlst.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)errlst.c 8.2 (Berkeley) 11/16/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)errlst.c 8.2 (Berkeley) 11/16/93");
	__FBSDID("$FreeBSD$");

	#include <stdio.h>
	Index: head/lib/libc/gen/exec.c
	===================================================================
	--- head/lib/libc/gen/exec.c
	+++ head/lib/libc/gen/exec.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)exec.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/fnmatch.c
	===================================================================
	--- head/lib/libc/gen/fnmatch.c
	+++ head/lib/libc/gen/fnmatch.c
	@@ -37,10 +37,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)fnmatch.c 8.2 (Berkeley) 4/16/94");
	__FBSDID("$FreeBSD$");

	/*
	Index: head/lib/libc/gen/fstab.c
	===================================================================
	--- head/lib/libc/gen/fstab.c
	+++ head/lib/libc/gen/fstab.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)fstab.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)fstab.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/fts-compat.c
	===================================================================
	--- head/lib/libc/gen/fts-compat.c
	+++ head/lib/libc/gen/fts-compat.c
	@@ -28,14 +28,9 @@
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.
	*
	- * $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
	+ * From: @(#)fts.c 8.6 (Berkeley) 8/14/94
	+ * From: $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
	*/
	-
	-#if 0
	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
	-#endif /* LIBC_SCCS and not lint */
	-#endif

	#include <sys/cdefs.h>
	__FBSDID("$FreeBSD$");
	Index: head/lib/libc/gen/fts-compat11.c
	===================================================================
	--- head/lib/libc/gen/fts-compat11.c
	+++ head/lib/libc/gen/fts-compat11.c
	@@ -26,14 +26,9 @@
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.
	*
	- * from: $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
	+ * From: @(#)fts.c 8.6 (Berkeley) 8/14/94
	+ * From: $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
	*/
	-
	-#if 0
	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
	-#endif /* LIBC_SCCS and not lint */
	-#endif

	#include <sys/cdefs.h>
	__FBSDID("$FreeBSD$");
	Index: head/lib/libc/gen/fts.c
	===================================================================
	--- head/lib/libc/gen/fts.c
	+++ head/lib/libc/gen/fts.c
	@@ -31,13 +31,8 @@
	* $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
	*/

	-#if 0
	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
	-#endif /* LIBC_SCCS and not lint */
	-#endif
	-
	#include <sys/cdefs.h>
	+__SCCSID("@(#)fts.c 8.6 (Berkeley) 8/14/94");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/ftw-compat11.c
	===================================================================
	--- head/lib/libc/gen/ftw-compat11.c
	+++ head/lib/libc/gen/ftw-compat11.c
	@@ -19,7 +19,7 @@
	* Agency (DARPA) and Air Force Research Laboratory, Air Force
	* Materiel Command, USAF, under agreement number F39502-99-1-0512.
	*
	- * from: $FreeBSD$
	+ * From: FreeBSD: head/lib/libc/gen/ftw.c 239151 2012-08-09 15:11:38Z jilles
	*/

	#include <sys/cdefs.h>
	Index: head/lib/libc/gen/getbootfile.c
	===================================================================
	--- head/lib/libc/gen/getbootfile.c
	+++ head/lib/libc/gen/getbootfile.c
	@@ -27,11 +27,10 @@
	* 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.
	+ *
	+ * From: @(#)gethostname.c 8.1 (Berkeley) 6/4/93
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "From: @(#)gethostname.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	__FBSDID("$FreeBSD$");

	Index: head/lib/libc/gen/getbsize.c
	===================================================================
	--- head/lib/libc/gen/getbsize.c
	+++ head/lib/libc/gen/getbsize.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)getbsize.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)getbsize.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <err.h>
	Index: head/lib/libc/gen/getcap.c
	===================================================================
	--- head/lib/libc/gen/getcap.c
	+++ head/lib/libc/gen/getcap.c
	@@ -32,10 +32,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)getcap.c 8.3 (Berkeley) 3/25/94");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/getcwd.c
	===================================================================
	--- head/lib/libc/gen/getcwd.c
	+++ head/lib/libc/gen/getcwd.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)getcwd.c 8.5 (Berkeley) 2/7/95";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)getcwd.c 8.5 (Berkeley) 2/7/95");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/getdomainname.c
	===================================================================
	--- head/lib/libc/gen/getdomainname.c
	+++ head/lib/libc/gen/getdomainname.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)gethostname.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)gethostname.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/getgrouplist.c
	===================================================================
	--- head/lib/libc/gen/getgrouplist.c
	+++ head/lib/libc/gen/getgrouplist.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94");
	__FBSDID("$FreeBSD$");

	/*
	Index: head/lib/libc/gen/gethostname.c
	===================================================================
	--- head/lib/libc/gen/gethostname.c
	+++ head/lib/libc/gen/gethostname.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)gethostname.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)gethostname.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/getloadavg.c
	===================================================================
	--- head/lib/libc/gen/getloadavg.c
	+++ head/lib/libc/gen/getloadavg.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)getloadavg.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)getloadavg.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/getlogin.c
	===================================================================
	--- head/lib/libc/gen/getlogin.c
	+++ head/lib/libc/gen/getlogin.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)getlogin.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)getlogin.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/getmntinfo-compat11.c
	===================================================================
	--- head/lib/libc/gen/getmntinfo-compat11.c
	+++ head/lib/libc/gen/getmntinfo-compat11.c
	@@ -25,11 +25,10 @@
	* 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.
	+ *
	+ * From: @(#)getmntinfo.c 8.1 (Berkeley) 6/4/93
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)getmntinfo.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	__FBSDID("$FreeBSD$");

	Index: head/lib/libc/gen/getmntinfo.c
	===================================================================
	--- head/lib/libc/gen/getmntinfo.c
	+++ head/lib/libc/gen/getmntinfo.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)getmntinfo.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)getmntinfo.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/getnetgrent.c
	===================================================================
	--- head/lib/libc/gen/getnetgrent.c
	+++ head/lib/libc/gen/getnetgrent.c
	@@ -32,10 +32,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/getosreldate.c
	===================================================================
	--- head/lib/libc/gen/getosreldate.c
	+++ head/lib/libc/gen/getosreldate.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)gethostid.c 8.1 (Berkeley) 6/2/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)gethostid.c 8.1 (Berkeley) 6/2/93");
	__FBSDID("$FreeBSD$");

	#include <sys/types.h>
	Index: head/lib/libc/gen/getpagesize.c
	===================================================================
	--- head/lib/libc/gen/getpagesize.c
	+++ head/lib/libc/gen/getpagesize.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)getpagesize.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)getpagesize.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/getttyent.c
	===================================================================
	--- head/lib/libc/gen/getttyent.c
	+++ head/lib/libc/gen/getttyent.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)getttyent.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/types.h>
	Index: head/lib/libc/gen/getusershell.c
	===================================================================
	--- head/lib/libc/gen/getusershell.c
	+++ head/lib/libc/gen/getusershell.c
	@@ -29,11 +29,9 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)getusershell.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	-/* $NetBSD: getusershell.c,v 1.17 1999/01/25 01:09:34 lukem Exp $ */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)getusershell.c 8.1 (Berkeley) 6/4/93");
	+__RCSID("$NetBSD: getusershell.c,v 1.17 1999/01/25 01:09:34 lukem Exp $");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/getvfsbyname.c
	===================================================================
	--- head/lib/libc/gen/getvfsbyname.c
	+++ head/lib/libc/gen/getvfsbyname.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)kvm_getvfsbyname.c 8.1 (Berkeley) 4/3/95";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)kvm_getvfsbyname.c 8.1 (Berkeley) 4/3/95");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/glob-compat11.c
	===================================================================
	--- head/lib/libc/gen/glob-compat11.c
	+++ head/lib/libc/gen/glob-compat11.c
	@@ -34,12 +34,10 @@
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.
	*
	- * from: $FreeBSD$
	+ * From: @(#)glob.c 8.3 (Berkeley) 10/13/93
	+ * From: FreeBSD: head/lib/libc/gen/glob.c 317913 2017-05-07 19:52:56Z jilles
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	__FBSDID("$FreeBSD$");

	Index: head/lib/libc/gen/glob.c
	===================================================================
	--- head/lib/libc/gen/glob.c
	+++ head/lib/libc/gen/glob.c
	@@ -37,10 +37,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)glob.c 8.3 (Berkeley) 10/13/93");
	__FBSDID("$FreeBSD$");

	/*
	Index: head/lib/libc/gen/initgroups.c
	===================================================================
	--- head/lib/libc/gen/initgroups.c
	+++ head/lib/libc/gen/initgroups.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)initgroups.c 8.1 (Berkeley) 6/4/93";
	-#endif
	#include <sys/cdefs.h>
	+__SCCSID("@(#)initgroups.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/isatty.c
	===================================================================
	--- head/lib/libc/gen/isatty.c
	+++ head/lib/libc/gen/isatty.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)isatty.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)isatty.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <termios.h>
	Index: head/lib/libc/gen/nftw-compat11.c
	===================================================================
	--- head/lib/libc/gen/nftw-compat11.c
	+++ head/lib/libc/gen/nftw-compat11.c
	@@ -17,8 +17,8 @@
	* Agency (DARPA) and Air Force Research Laboratory, Air Force
	* Materiel Command, USAF, under agreement number F39502-99-1-0512.
	*
	- * from: $OpenBSD: nftw.c,v 1.7 2006/03/31 19:41:44 millert Exp $
	- * from: $FreeBSD$
	+ * From: $OpenBSD: nftw.c,v 1.7 2006/03/31 19:41:44 millert Exp $
	+ * From: FreeBSD: head/lib/libc/gen/nftw.c 239160 2012-08-09 22:05:40Z jilles
	*/

	#include <sys/cdefs.h>
	Index: head/lib/libc/gen/nice.c
	===================================================================
	--- head/lib/libc/gen/nice.c
	+++ head/lib/libc/gen/nice.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)nice.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)nice.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/types.h>
	Index: head/lib/libc/gen/nlist.c
	===================================================================
	--- head/lib/libc/gen/nlist.c
	+++ head/lib/libc/gen/nlist.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)nlist.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/opendir.c
	===================================================================
	--- head/lib/libc/gen/opendir.c
	+++ head/lib/libc/gen/opendir.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)opendir.c 8.8 (Berkeley) 5/1/95";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)opendir.c 8.8 (Berkeley) 5/1/95");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/pause.c
	===================================================================
	--- head/lib/libc/gen/pause.c
	+++ head/lib/libc/gen/pause.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)pause.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)pause.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <signal.h>
	Index: head/lib/libc/gen/popen.c
	===================================================================
	--- head/lib/libc/gen/popen.c
	+++ head/lib/libc/gen/popen.c
	@@ -32,10 +32,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 5/3/95";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)popen.c 8.3 (Berkeley) 5/3/95");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/psignal.c
	===================================================================
	--- head/lib/libc/gen/psignal.c
	+++ head/lib/libc/gen/psignal.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)psignal.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)psignal.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	/*
	Index: head/lib/libc/gen/pw_scan.c
	===================================================================
	--- head/lib/libc/gen/pw_scan.c
	+++ head/lib/libc/gen/pw_scan.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)pw_scan.c 8.3 (Berkeley) 4/2/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)pw_scan.c 8.3 (Berkeley) 4/2/94");
	__FBSDID("$FreeBSD$");

	/*
	Index: head/lib/libc/gen/raise.c
	===================================================================
	--- head/lib/libc/gen/raise.c
	+++ head/lib/libc/gen/raise.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)raise.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)raise.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <signal.h>
	Index: head/lib/libc/gen/readdir-compat11.c
	===================================================================
	--- head/lib/libc/gen/readdir-compat11.c
	+++ head/lib/libc/gen/readdir-compat11.c
	@@ -26,13 +26,10 @@
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.
	*
	- * from:
	- * $FreeBSD$
	+ * From: @(#)readdir.c 8.3 (Berkeley) 9/29/94
	+ * From: FreeBSD: head/lib/libc/gen/readdir.c 314436 2017-02-28 23:42:47Z imp
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)readdir.c 8.3 (Berkeley) 9/29/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	__FBSDID("$FreeBSD$");

	Index: head/lib/libc/gen/readdir.c
	===================================================================
	--- head/lib/libc/gen/readdir.c
	+++ head/lib/libc/gen/readdir.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)readdir.c 8.3 (Berkeley) 9/29/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)readdir.c 8.3 (Berkeley) 9/29/94");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/rewinddir.c
	===================================================================
	--- head/lib/libc/gen/rewinddir.c
	+++ head/lib/libc/gen/rewinddir.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)rewinddir.c 8.1 (Berkeley) 6/8/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)rewinddir.c 8.1 (Berkeley) 6/8/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/scandir-compat11.c
	===================================================================
	--- head/lib/libc/gen/scandir-compat11.c
	+++ head/lib/libc/gen/scandir-compat11.c
	@@ -26,13 +26,10 @@
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.
	*
	- * from:
	- * $FreeBSD$
	+ * From: @(#)scandir.c 8.3 (Berkeley) 1/2/94
	+ * From: FreeBSD: head/lib/libc/gen/scandir.c 317372 2017-04-24 14:56:41Z pfg
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)scandir.c 8.3 (Berkeley) 1/2/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	__FBSDID("$FreeBSD$");

	Index: head/lib/libc/gen/scandir.c
	===================================================================
	--- head/lib/libc/gen/scandir.c
	+++ head/lib/libc/gen/scandir.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)scandir.c 8.3 (Berkeley) 1/2/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)scandir.c 8.3 (Berkeley) 1/2/94");
	__FBSDID("$FreeBSD$");

	/*
	Index: head/lib/libc/gen/seekdir.c
	===================================================================
	--- head/lib/libc/gen/seekdir.c
	+++ head/lib/libc/gen/seekdir.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)seekdir.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)seekdir.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/setdomainname.c
	===================================================================
	--- head/lib/libc/gen/setdomainname.c
	+++ head/lib/libc/gen/setdomainname.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)sethostname.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)sethostname.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/sethostname.c
	===================================================================
	--- head/lib/libc/gen/sethostname.c
	+++ head/lib/libc/gen/sethostname.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)sethostname.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)sethostname.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/setjmperr.c
	===================================================================
	--- head/lib/libc/gen/setjmperr.c
	+++ head/lib/libc/gen/setjmperr.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)setjmperr.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)setjmperr.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	/*
	Index: head/lib/libc/gen/setmode.c
	===================================================================
	--- head/lib/libc/gen/setmode.c
	+++ head/lib/libc/gen/setmode.c
	@@ -32,10 +32,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)setmode.c 8.2 (Berkeley) 3/25/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)setmode.c 8.2 (Berkeley) 3/25/94");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/siginterrupt.c
	===================================================================
	--- head/lib/libc/gen/siginterrupt.c
	+++ head/lib/libc/gen/siginterrupt.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)siginterrupt.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)siginterrupt.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/siglist.c
	===================================================================
	--- head/lib/libc/gen/siglist.c
	+++ head/lib/libc/gen/siglist.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)siglist.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)siglist.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <signal.h>
	Index: head/lib/libc/gen/signal.c
	===================================================================
	--- head/lib/libc/gen/signal.c
	+++ head/lib/libc/gen/signal.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)signal.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)signal.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	/*
	Index: head/lib/libc/gen/sigsetops.c
	===================================================================
	--- head/lib/libc/gen/sigsetops.c
	+++ head/lib/libc/gen/sigsetops.c
	@@ -27,14 +27,10 @@
	* 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.
	- *
	- * @(#)sigsetops.c 8.1 (Berkeley) 6/4/93
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)sigsetops.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)sigsetops.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <errno.h>
	Index: head/lib/libc/gen/sleep.c
	===================================================================
	--- head/lib/libc/gen/sleep.c
	+++ head/lib/libc/gen/sleep.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)sleep.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)sleep.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/stringlist.c
	===================================================================
	--- head/lib/libc/gen/stringlist.c
	+++ head/lib/libc/gen/stringlist.c
	@@ -26,10 +26,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char *rcsid = "$NetBSD: stringlist.c,v 1.2 1997/01/17 07:26:20 lukem Exp $";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__RCSID("$NetBSD: stringlist.c,v 1.2 1997/01/17 07:26:20 lukem Exp $");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/strtofflags.c
	===================================================================
	--- head/lib/libc/gen/strtofflags.c
	+++ head/lib/libc/gen/strtofflags.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)stat_flags.c 8.1 (Berkeley) 5/31/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)stat_flags.c 8.1 (Berkeley) 5/31/93");
	__FBSDID("$FreeBSD$");

	#include <sys/types.h>
	Index: head/lib/libc/gen/sysconf.c
	===================================================================
	--- head/lib/libc/gen/sysconf.c
	+++ head/lib/libc/gen/sysconf.c
	@@ -32,10 +32,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)sysconf.c 8.2 (Berkeley) 3/20/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)sysconf.c 8.2 (Berkeley) 3/20/94");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/sysctl.c
	===================================================================
	--- head/lib/libc/gen/sysctl.c
	+++ head/lib/libc/gen/sysctl.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)sysctl.c 8.2 (Berkeley) 1/4/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)sysctl.c 8.2 (Berkeley) 1/4/94");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/syslog.c
	===================================================================
	--- head/lib/libc/gen/syslog.c
	+++ head/lib/libc/gen/syslog.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)syslog.c 8.5 (Berkeley) 4/29/95");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/telldir.c
	===================================================================
	--- head/lib/libc/gen/telldir.c
	+++ head/lib/libc/gen/telldir.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)telldir.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)telldir.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/termios.c
	===================================================================
	--- head/lib/libc/gen/termios.c
	+++ head/lib/libc/gen/termios.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)termios.c 8.2 (Berkeley) 2/21/94");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/time.c
	===================================================================
	--- head/lib/libc/gen/time.c
	+++ head/lib/libc/gen/time.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)time.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/types.h>
	Index: head/lib/libc/gen/times.c
	===================================================================
	--- head/lib/libc/gen/times.c
	+++ head/lib/libc/gen/times.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)times.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)times.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	Index: head/lib/libc/gen/timezone.c
	===================================================================
	--- head/lib/libc/gen/timezone.c
	+++ head/lib/libc/gen/timezone.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)timezone.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)timezone.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/types.h>
	Index: head/lib/libc/gen/ttyname.c
	===================================================================
	--- head/lib/libc/gen/ttyname.c
	+++ head/lib/libc/gen/ttyname.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)ttyname.c 8.2 (Berkeley) 1/27/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)ttyname.c 8.2 (Berkeley) 1/27/94");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/ttyslot.c
	===================================================================
	--- head/lib/libc/gen/ttyslot.c
	+++ head/lib/libc/gen/ttyslot.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)ttyslot.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)ttyslot.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	int __ttyslot(void);
	Index: head/lib/libc/gen/ualarm.c
	===================================================================
	--- head/lib/libc/gen/ualarm.c
	+++ head/lib/libc/gen/ualarm.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)ualarm.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)ualarm.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/time.h>
	Index: head/lib/libc/gen/uname.c
	===================================================================
	--- head/lib/libc/gen/uname.c
	+++ head/lib/libc/gen/uname.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "From: @(#)uname.c 8.1 (Berkeley) 1/4/94";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)uname.c 8.1 (Berkeley) 1/4/94");
	__FBSDID("$FreeBSD$");

	#define uname wrapped_uname
	Index: head/lib/libc/gen/usleep.c
	===================================================================
	--- head/lib/libc/gen/usleep.c
	+++ head/lib/libc/gen/usleep.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)usleep.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)usleep.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/utime.c
	===================================================================
	--- head/lib/libc/gen/utime.c
	+++ head/lib/libc/gen/utime.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)utime.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)utime.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <sys/time.h>
	Index: head/lib/libc/gen/valloc.c
	===================================================================
	--- head/lib/libc/gen/valloc.c
	+++ head/lib/libc/gen/valloc.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)valloc.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)valloc.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include <stdlib.h>
	Index: head/lib/libc/gen/wait.c
	===================================================================
	--- head/lib/libc/gen/wait.c
	+++ head/lib/libc/gen/wait.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)wait.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)wait.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/wait3.c
	===================================================================
	--- head/lib/libc/gen/wait3.c
	+++ head/lib/libc/gen/wait3.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)wait3.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)wait3.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"
	Index: head/lib/libc/gen/waitpid.c
	===================================================================
	--- head/lib/libc/gen/waitpid.c
	+++ head/lib/libc/gen/waitpid.c
	@@ -29,10 +29,8 @@
	* SUCH DAMAGE.
	*/

	-#if defined(LIBC_SCCS) && !defined(lint)
	-static char sccsid[] = "@(#)waitpid.c 8.1 (Berkeley) 6/4/93";
	-#endif /* LIBC_SCCS and not lint */
	#include <sys/cdefs.h>
	+__SCCSID("@(#)waitpid.c 8.1 (Berkeley) 6/4/93");
	__FBSDID("$FreeBSD$");

	#include "namespace.h"

File Metadata

Mime Type: text/plain
Expires: Tue, Apr 28, 5:52 AM (6 h, 23 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 32237087
Default Alt Text: D15831.diff (40 KB)

D15831.diffNo OneTemporaryActions

D15831.diffView Options

File Metadata

Event Timeline

D15831.diff
No OneTemporary
Actions

D15831.diff
View Options