- (dtucker) [openbsd-compat/{LOTS}] Move the "OPENBSD ORIGINAL" markers to

after the copyright notices. Having them at the top next to the CVSIDs guarantees a conflict for each and every sync.
2005-11-10 16:18:56 +11:00 · 2005-11-10 16:18:56 +11:00 · 7f24a0e647
parent 80c0d7eb88
commit 7f24a0e647
32 changed files with 66 additions and 63 deletions
--- a/5
+++ b/5
@ -14,6 +14,9 @@
   prototypes, removal of "register").
 - (dtucker) [openbsd-compat/strlcat.c] Sync OpenBSD revs 1.11 - 1.12 (removal
   of "register").
+ - (dtucker) [openbsd-compat/{LOTS}] Move the "OPENBSD ORIGINAL" markers to
+   after the copyright notices.  Having them at the top next to the CVSIDs
+   guarantees a conflict for each and every sync.

 20051105
 - (djm) OpenBSD CVS Sync
@ -3256,4 +3259,4 @@
   - (djm) Trim deprecated options from INSTALL. Mention UsePAM
   - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu

-$Id: ChangeLog,v 1.3961 2005/11/10 05:05:37 dtucker Exp $
+$Id: ChangeLog,v 1.3962 2005/11/10 05:18:56 dtucker Exp $
--- a/openbsd-compat/base64.c
+++ b/openbsd-compat/base64.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/base64.c */
-
 /*	$OpenBSD: base64.c,v 1.4 2002/01/02 23:00:10 deraadt Exp $	*/

 /*
@ -44,6 +42,8 @@
 * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
 */

+/* OPENBSD ORIGINAL: lib/libc/net/base64.c */
+
 #include "includes.h"

 #if (!defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)) || (!defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON))
--- a/openbsd-compat/basename.c
+++ b/openbsd-compat/basename.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/basename.c */
-
 /*	$OpenBSD: basename.c,v 1.11 2003/06/17 21:56:23 millert Exp $	*/

 /*
@ -18,6 +16,8 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

+/* OPENBSD ORIGINAL: lib/libc/gen/basename.c */
+
 #include "includes.h"
 #ifndef HAVE_BASENAME

--- a/openbsd-compat/daemon.c
+++ b/openbsd-compat/daemon.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/daemon.c */
-
 /*-
 * Copyright (c) 1990, 1993
 *	The Regents of the University of California.  All rights reserved.
@ -29,6 +27,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/gen/daemon.c */
+
 #include "includes.h"

 #ifndef HAVE_DAEMON
--- a/openbsd-compat/dirname.c
+++ b/openbsd-compat/dirname.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/dirname.c */
-
 /*      $OpenBSD: dirname.c,v 1.10 2003/06/17 21:56:23 millert Exp $    */

 /*
@ -18,6 +16,8 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

+/* OPENBSD ORIGINAL: lib/libc/gen/dirname.c */
+
 #include "includes.h"
 #ifndef HAVE_DIRNAME

--- a/openbsd-compat/getcwd.c
+++ b/openbsd-compat/getcwd.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/getcwd.c */
-
 /*
 * Copyright (c) 1989, 1991, 1993
 *	The Regents of the University of California.  All rights reserved.
@ -29,6 +27,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/gen/getcwd.c */
+
 #include "includes.h"

 #if !defined(HAVE_GETCWD)
--- a/openbsd-compat/getgrouplist.c
+++ b/openbsd-compat/getgrouplist.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/getgrouplist.c */
-
 /*	$OpenBSD: getgrouplist.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */
 /*
 * Copyright (c) 1991, 1993
@ -30,6 +28,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/gen/getgrouplist.c */
+
 #include "includes.h"

 #ifndef HAVE_GETGROUPLIST
--- a/openbsd-compat/getopt.c
+++ b/openbsd-compat/getopt.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/getopt.c */
-
 /*
 * Copyright (c) 1987, 1993, 1994
 *	The Regents of the University of California.  All rights reserved.
@ -29,6 +27,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/stdlib/getopt.c */
+
 #include "includes.h"
 #if !defined(HAVE_GETOPT) || !defined(HAVE_GETOPT_OPTRESET)

--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/getrrsetbyname.c */
-
 /* $OpenBSD: getrrsetbyname.c,v 1.10 2005/03/30 02:58:28 tedu Exp $ */

 /*
@ -45,6 +43,8 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

+/* OPENBSD ORIGINAL: lib/libc/net/getrrsetbyname.c */
+
 #include "includes.h"

 #ifndef HAVE_GETRRSETBYNAME
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/glob.c */
-
 /*
 * Copyright (c) 1989, 1993
 *	The Regents of the University of California.  All rights reserved.
@ -32,6 +30,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/gen/glob.c */
+
 #include "includes.h"
 #include <ctype.h>

--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: include/glob.h */
-
 /*	$OpenBSD: glob.h,v 1.8 2003/06/02 19:34:12 millert Exp $	*/
 /*	$NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $	*/

@ -37,6 +35,8 @@
 *	@(#)glob.h	8.1 (Berkeley) 6/2/93
 */

+/* OPENBSD ORIGINAL: include/glob.h */
+
 #if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \
    !defined(GLOB_HAS_GL_MATCHC)

--- a/openbsd-compat/inet_aton.c
+++ b/openbsd-compat/inet_aton.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/inet_addr.c */
-
 /*	$OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert Exp $	*/

 /*
@ -51,6 +49,8 @@
 * --Copyright--
 */

+/* OPENBSD ORIGINAL: lib/libc/net/inet_addr.c */
+
 #include "includes.h"

 #if !defined(HAVE_INET_ATON)
--- a/openbsd-compat/inet_ntoa.c
+++ b/openbsd-compat/inet_ntoa.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/inet_ntoa.c */
-
 /*
 * Copyright (c) 1983, 1993
 *	The Regents of the University of California.  All rights reserved.
@ -29,6 +27,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/net/inet_ntoa.c */
+
 #include "includes.h"

 #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA)
--- a/openbsd-compat/inet_ntop.c
+++ b/openbsd-compat/inet_ntop.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/inet_ntop.c */
-
 /*	$OpenBSD: inet_ntop.c,v 1.5 2002/08/23 16:27:31 itojun Exp $	*/

 /* Copyright (c) 1996 by Internet Software Consortium.
@ -18,6 +16,8 @@
 * SOFTWARE.
 */

+/* OPENBSD ORIGINAL: lib/libc/net/inet_ntop.c */
+
 #include "includes.h"

 #ifndef HAVE_INET_NTOP
--- a/openbsd-compat/mktemp.c
+++ b/openbsd-compat/mktemp.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdio/mktemp.c */
-
 /* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */
 /* Changes: Removed mktemp */

@ -32,6 +30,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/stdio/mktemp.c */
+
 #include "includes.h"

 #if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP)
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */
-
 /*	$OpenBSD: readpassphrase.c,v 1.16 2003/06/17 21:56:23 millert Exp $	*/

 /*
@ -22,6 +20,8 @@
 * Materiel Command, USAF, under agreement number F39502-99-1-0512.
 */

+/* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.16 2003/06/17 21:56:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
--- a/openbsd-compat/readpassphrase.h
+++ b/openbsd-compat/readpassphrase.h
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: include/readpassphrase.h */
-
 /*	$OpenBSD: readpassphrase.h,v 1.3 2002/06/28 12:32:22 millert Exp $	*/

 /*
@ -29,6 +27,8 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: include/readpassphrase.h */
+
 #ifndef _READPASSPHRASE_H_
 #define _READPASSPHRASE_H_

--- a/openbsd-compat/realpath.c
+++ b/openbsd-compat/realpath.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/realpath.c */
-
 /*
 * Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru>
 *
@ -28,6 +26,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/stdlib/realpath.c */
+
 #include "includes.h"

 #if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH)
--- a/openbsd-compat/rresvport.c
+++ b/openbsd-compat/rresvport.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/rresvport.c */
-
 /*
 * Copyright (c) 1995, 1996, 1998 Theo de Raadt.  All rights reserved.
 * Copyright (c) 1983, 1993, 1994
@ -30,6 +28,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/net/rresvport.c */
+
 #include "includes.h"

 #ifndef HAVE_RRESVPORT_AF
--- a/openbsd-compat/setenv.c
+++ b/openbsd-compat/setenv.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/setenv.c */
-
 /*	$OpenBSD: setenv.c,v 1.9 2005/08/08 08:05:37 espie Exp $ */
 /*
 * Copyright (c) 1987 Regents of the University of California.
@ -30,6 +28,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/stdlib/setenv.c */
+
 #include "includes.h"
 #if !defined(HAVE_SETENV) || !defined(HAVE_UNSETENV)

--- a/openbsd-compat/sigact.c
+++ b/openbsd-compat/sigact.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libcurses/base/sigaction.c */
-
 /*	$OpenBSD: sigaction.c,v 1.3 1999/06/27 08:14:21 millert Exp $	*/

 /****************************************************************************
@ -35,6 +33,8 @@
 *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 ****************************************************************************/

+/* OPENBSD ORIGINAL: lib/libcurses/base/sigaction.c */
+
 #include "includes.h"
 #include <signal.h>
 #include "sigact.h"
--- a/openbsd-compat/strlcat.c
+++ b/openbsd-compat/strlcat.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/string/strlcat.c */
-
 /*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/

 /*
@ -18,6 +16,8 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

+/* OPENBSD ORIGINAL: lib/libc/string/strlcat.c */
+
 #include "includes.h"
 #ifndef HAVE_STRLCAT

--- a/openbsd-compat/strlcpy.c
+++ b/openbsd-compat/strlcpy.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/string/strlcpy.c */
-
 /*	$OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $	*/

 /*
@ -18,6 +16,8 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

+/* OPENBSD ORIGINAL: lib/libc/string/strlcpy.c */
+
 #include "includes.h"
 #ifndef HAVE_STRLCPY

--- a/openbsd-compat/strmode.c
+++ b/openbsd-compat/strmode.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/string/strmode.c */
-
 /*-
 * Copyright (c) 1990 The Regents of the University of California.
 * All rights reserved.
@ -29,6 +27,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/string/strmode.c */
+
 #include "includes.h"
 #ifndef HAVE_STRMODE

--- a/openbsd-compat/strsep.c
+++ b/openbsd-compat/strsep.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/string/strsep.c */
-
 /*	$OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $	*/

 /*-
@ -31,6 +29,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/string/strsep.c */
+
 #include "includes.h"

 #if !defined(HAVE_STRSEP)
--- a/openbsd-compat/strtoll.c
+++ b/openbsd-compat/strtoll.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoll.c */
-
 /*-
 * Copyright (c) 1992 The Regents of the University of California.
 * All rights reserved.
@ -29,6 +27,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoll.c */
+
 #include "includes.h"
 #ifndef HAVE_STRTOLL

--- a/openbsd-compat/strtonum.c
+++ b/openbsd-compat/strtonum.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/strtonum.c */
-
 /*	$OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $	*/

 /*
@ -19,6 +17,8 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

+/* OPENBSD ORIGINAL: lib/libc/stdlib/strtonum.c */
+
 #include "includes.h"
 #ifndef HAVE_STRTONUM
 #include <limits.h>
--- a/openbsd-compat/strtoul.c
+++ b/openbsd-compat/strtoul.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoul.c */
-
 /*
 * Copyright (c) 1990 Regents of the University of California.
 * All rights reserved.
@ -29,6 +27,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoul.c */
+
 #include "includes.h"
 #ifndef HAVE_STRTOUL

--- a/openbsd-compat/sys-queue.h
+++ b/openbsd-compat/sys-queue.h
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: sys/sys/queue.h */
-
 /*	$OpenBSD: queue.h,v 1.25 2004/04/08 16:08:21 henning Exp $	*/
 /*	$NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $	*/

@ -34,6 +32,8 @@
 *	@(#)queue.h	8.5 (Berkeley) 8/20/94
 */

+/* OPENBSD ORIGINAL: sys/sys/queue.h */
+
 #ifndef	_FAKE_QUEUE_H_
 #define	_FAKE_QUEUE_H_

--- a/openbsd-compat/sys-tree.h
+++ b/openbsd-compat/sys-tree.h
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: sys/sys/tree.h */
-
 /*	$OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $	*/
 /*
 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@ -26,6 +24,8 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: sys/sys/tree.h */
+
 #ifndef	_SYS_TREE_H_
 #define	_SYS_TREE_H_

--- a/openbsd-compat/vis.c
+++ b/openbsd-compat/vis.c
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/vis.c */
-
 /*	$OpenBSD: vis.c,v 1.19 2005/09/01 17:15:49 millert Exp $ */
 /*-
 * Copyright (c) 1989, 1993
@ -30,6 +28,8 @@
 * SUCH DAMAGE.
 */

+/* OPENBSD ORIGINAL: lib/libc/gen/vis.c */
+
 #include "includes.h"
 #if !defined(HAVE_STRNVIS)

--- a/openbsd-compat/vis.h
+++ b/openbsd-compat/vis.h
@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: include/vis.h */
-
 /*	$OpenBSD: vis.h,v 1.11 2005/08/09 19:38:31 millert Exp $	*/
 /*	$NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $	*/

@ -34,6 +32,8 @@
 *	@(#)vis.h	5.9 (Berkeley) 4/3/91
 */

+/* OPENBSD ORIGINAL: include/vis.h */
+
 #include "includes.h"
 #if !defined(HAVE_STRNVIS)