- (djm) Annotate OpenBSD-derived files in openbsd-compat/ with original

   source file path (in OpenBSD tree).

diff --git a/ChangeLog b/ChangeLog
index 6990515d70b7b7ad362ab7f202468bc208130af3..904969a666299909154891f9f24bc2a6cf831b35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@
    - dtucker@cvs.openbsd.org 2003/11/24 00:16:35
      [ssh.1 ssh.c]
      Make ssh -k mean GSSAPIDelegateCredentials=no. Suggestion & ok markus@
+ - (djm) Annotate OpenBSD-derived files in openbsd-compat/ with original 
+   source file path (in OpenBSD tree).
 
 20031122
  - (dtucker) [channels.c] Make AIX write limit code clearer.  Suggested by djm@

diff --git a/openbsd-compat/base64.c b/openbsd-compat/base64.c
index 91a5ab0ed8248774093cb3162017a0adba5a516b..dcaa03e5d701d8855e585b7f40cf73bcba65f4e3 100644 (file)
--- a/openbsd-compat/base64.c
+++ b/openbsd-compat/base64.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/net/base64.c */
+
 /*     $OpenBSD: base64.c,v 1.4 2002/01/02 23:00:10 deraadt Exp $      */
 
 /*

diff --git a/openbsd-compat/basename.c b/openbsd-compat/basename.c
index 2054c806891b21d54464de4560085d069e29733a..552dc1e1cde732f396fe5d6d7b90b86b2ae3e8b7 100644 (file)
--- a/openbsd-compat/basename.c
+++ b/openbsd-compat/basename.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/gen/basename.c */
+
 /*     $OpenBSD: basename.c,v 1.11 2003/06/17 21:56:23 millert Exp $   */
 
 /*

diff --git a/openbsd-compat/daemon.c b/openbsd-compat/daemon.c
index 6dd45f6a79a7e342332fcb2ae2121b6a403e1ed4..c0be5fff9d8c448f14ecb06d25b9a0d34babf8d0 100644 (file)
--- a/openbsd-compat/daemon.c
+++ b/openbsd-compat/daemon.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/gen/daemon.c */
+
 /*-
  * Copyright (c) 1990, 1993
  *     The Regents of the University of California.  All rights reserved.

diff --git a/openbsd-compat/dirname.c b/openbsd-compat/dirname.c
index 1ab7516d853491678a99f48f94d92d924c3cee83..25ab34dd683f5510f5caaa9b3114b3156e7c2f10 100644 (file)
--- a/openbsd-compat/dirname.c
+++ b/openbsd-compat/dirname.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/gen/dirname.c */
+
 /*      $OpenBSD: dirname.c,v 1.10 2003/06/17 21:56:23 millert Exp $    */
 
 /*

diff --git a/openbsd-compat/getcwd.c b/openbsd-compat/getcwd.c
index 31d1cfe934a165fd6ad55b0f3b6e1f4ec0a6273e..19be59172ea272f40b63d75613f8332c65c4a4fd 100644 (file)
--- a/openbsd-compat/getcwd.c
+++ b/openbsd-compat/getcwd.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/gen/getcwd.c */
+
 /*
  * Copyright (c) 1989, 1991, 1993
  *     The Regents of the University of California.  All rights reserved.

diff --git a/openbsd-compat/getgrouplist.c b/openbsd-compat/getgrouplist.c
index 085cda8c3192c3b9de211eba86692def2a203a82..59c164f4455d8026f1960658a8daffe4c9971704 100644 (file)
--- a/openbsd-compat/getgrouplist.c
+++ b/openbsd-compat/getgrouplist.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/gen/getgrouplist.c */
+
 /*
  * Copyright (c) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.

diff --git a/openbsd-compat/getopt.c b/openbsd-compat/getopt.c
index 2136fbfcca609f85dd886815a401fd5e20f7eba9..f5ee6778da41d16852ea234660ac70a85d413185 100644 (file)
--- a/openbsd-compat/getopt.c
+++ b/openbsd-compat/getopt.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/stdlib/getopt.c */
+
 /*
  * Copyright (c) 1987, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.

diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 2307337a76f7039d1c4bb6ccee904230ac373356..bb5451cd26fd0ccce3c46d94de09b3ad01f46c08 100644 (file)
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/net/getrrsetbyname.c */
+
 /* $OpenBSD: getrrsetbyname.c,v 1.7 2003/03/07 07:34:14 itojun Exp $ */
 
 /*

diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h
index 0739972fee91f9e3e3170491713a690c34f8dccd..67937ef5f4ae93955ed2358b16359433f1f4e339 100644 (file)
--- a/openbsd-compat/getrrsetbyname.h
+++ b/openbsd-compat/getrrsetbyname.h
@@ -1,3 +1,5 @@
+/* OPENBSD BASED ON : include/netdb.h */
+
 /* $OpenBSD: getrrsetbyname.c,v 1.4 2001/08/16 18:16:43 ho Exp $ */
 
 /*

diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index 50f35c304712d78cc0fe3bd3945a62c50e15081e..7fafc8c402876680a60607d9f1479f8530f51597 100644 (file)
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/gen/glob.c */
+
 /*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.

diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index aceddbc48757cf1915be7702b0ea6ccd5bc63b7e..3428b201352ec404cca90d13a36b93582615bb13 100644 (file)
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -1,3 +1,5 @@
+/* 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 $     */
 

diff --git a/openbsd-compat/inet_aton.c b/openbsd-compat/inet_aton.c
index 5de49868dfb2e83b81c4d4804de713df0efcf248..c141bcc68a4ac45297cab9350a7d348933e5d1a9 100644 (file)
--- a/openbsd-compat/inet_aton.c
+++ b/openbsd-compat/inet_aton.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/net/inet_addr.c */
+
 /*     $OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert Exp $   */
 
 /*

diff --git a/openbsd-compat/inet_ntoa.c b/openbsd-compat/inet_ntoa.c
index f9fdc9ee57dc20c8c087ec6964e6f99e93bee1f0..dc010dc53f8ad757a53c015686157bd0b9522bea 100644 (file)
--- a/openbsd-compat/inet_ntoa.c
+++ b/openbsd-compat/inet_ntoa.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/net/inet_ntoa.c */
+
 /*
  * Copyright (c) 1983, 1993
  *     The Regents of the University of California.  All rights reserved.

diff --git a/openbsd-compat/inet_ntop.c b/openbsd-compat/inet_ntop.c
index 075eac44f2016b6f011109abba3b71abc6f8e0b6..7031625b4441b98c9184e34c4e0101018fadd7d8 100644 (file)
--- a/openbsd-compat/inet_ntop.c
+++ b/openbsd-compat/inet_ntop.c
@@ -1,3 +1,5 @@
+/* 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.

diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c
index 2cd74783505eacc12c59afd24901e676af23a3cf..aff8d200560aeff1d7d9e739f5668dca64462edf 100644 (file)
--- a/openbsd-compat/mktemp.c
+++ b/openbsd-compat/mktemp.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/stdio/mktemp.c */
+
 /* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */
 /* Changes: Removed mktemp */
 

diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 0d0baf569763839477fc9d2fb02f435f92933182..4ee1be5de283d00796c7484cd3b1858ec7e7bbba 100644 (file)
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */
+
 /*     $OpenBSD: readpassphrase.c,v 1.16 2003/06/17 21:56:23 millert Exp $     */
 
 /*

diff --git a/openbsd-compat/readpassphrase.h b/openbsd-compat/readpassphrase.h
index 92908a48955211aa199a68415d13d4739d34d6c1..178edf3461948dcacb4cca94ee9936ee6cd2ce25 100644 (file)
--- a/openbsd-compat/readpassphrase.h
+++ b/openbsd-compat/readpassphrase.h
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: include/readpassphrase.h */
+
 /*     $OpenBSD: readpassphrase.h,v 1.3 2002/06/28 12:32:22 millert Exp $      */
 
 /*

diff --git a/openbsd-compat/realpath.c b/openbsd-compat/realpath.c
index 922305ffd5d1aa5b7f4c76e40ad728b576c52fcd..218fbecb2beb6992e601811e9f2ef2ab788c79e4 100644 (file)
--- a/openbsd-compat/realpath.c
+++ b/openbsd-compat/realpath.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/stdlib/realpath.c */
+
 /*
  * Copyright (c) 1994
  *     The Regents of the University of California.  All rights reserved.

diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c
index 608a3b184d94567b0a6b22703f0049120c54c740..75167065ca5f062e19780483ff5251ae463d8ada 100644 (file)
--- a/openbsd-compat/rresvport.c
+++ b/openbsd-compat/rresvport.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/net/rresvport.c */
+
 /*
  * Copyright (c) 1995, 1996, 1998 Theo de Raadt.  All rights reserved.
  * Copyright (c) 1983, 1993, 1994

diff --git a/openbsd-compat/setenv.c b/openbsd-compat/setenv.c
index c9941c1957269fe8a0ea06f231bca7d7f5f585f8..b7ba0ce83b89c2ec68625e0032514561026a7809 100644 (file)
--- a/openbsd-compat/setenv.c
+++ b/openbsd-compat/setenv.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/stdlib/setenv.c */
+
 /*
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.

diff --git a/openbsd-compat/sigact.c b/openbsd-compat/sigact.c
index 35fbab0eb9d4385c07763d880732abce8aa643c6..2772ac574aaeeec327b3a2861d10917639d54b1f 100644 (file)
--- a/openbsd-compat/sigact.c
+++ b/openbsd-compat/sigact.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libcurses/base/sigaction.c */
+
 /*     $OpenBSD: sigaction.c,v 1.3 1999/06/27 08:14:21 millert Exp $   */
 
 /****************************************************************************

diff --git a/openbsd-compat/strlcat.c b/openbsd-compat/strlcat.c
index cae16657cc27d31ab95f193e9c58b82186967c57..70f01cb2a6a7003017cb9c3cc70260f8b7371ddd 100644 (file)
--- a/openbsd-compat/strlcat.c
+++ b/openbsd-compat/strlcat.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/string/strlcat.c */
+
 /*     $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $    */
 
 /*

diff --git a/openbsd-compat/strlcpy.c b/openbsd-compat/strlcpy.c
index c8fe29987e49d4ce742e48c3ecb57b88b368e57f..ccfa12a0a5e04134260a2aadd90cee7d6f86f3fc 100644 (file)
--- a/openbsd-compat/strlcpy.c
+++ b/openbsd-compat/strlcpy.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/string/strlcpy.c */
+
 /*     $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $     */
 
 /*

diff --git a/openbsd-compat/strmode.c b/openbsd-compat/strmode.c
index adf5e273e39cff146bde084f26c6cf26d6abd7da..ea8d515e3874346c0e406e5714d8198c3eebfd57 100644 (file)
--- a/openbsd-compat/strmode.c
+++ b/openbsd-compat/strmode.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/string/strmode.c */
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.

diff --git a/openbsd-compat/strsep.c b/openbsd-compat/strsep.c
index b13671343a7495f481fdcb88d11246da3e3d8b82..330d84ce151b26a36428561bbb3b4ebe51c019ab 100644 (file)
--- a/openbsd-compat/strsep.c
+++ b/openbsd-compat/strsep.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/string/strsep.c */
+
 /*     $OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $      */
 
 /*-

diff --git a/openbsd-compat/strtoul.c b/openbsd-compat/strtoul.c
index 877e6a01f439c69fc3ce59553793f42faf534d2e..24d0e253dd29239d3f88031bf36ce5cd85319789 100644 (file)
--- a/openbsd-compat/strtoul.c
+++ b/openbsd-compat/strtoul.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoul.c */
+
 /*
  * Copyright (c) 1990 Regents of the University of California.
  * All rights reserved.

diff --git a/openbsd-compat/sys-queue.h b/openbsd-compat/sys-queue.h
index dd5c47525112415268dc5cf517d5457936591199..8ff19e45234d0250e40a92e6560622b9c686afba 100644 (file)
--- a/openbsd-compat/sys-queue.h
+++ b/openbsd-compat/sys-queue.h
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: sys/sys/queue.h */
+
 /*     $OpenBSD: queue.h,v 1.23 2003/06/02 23:28:21 millert Exp $      */
 /*     $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $       */
 

diff --git a/openbsd-compat/sys-tree.h b/openbsd-compat/sys-tree.h
index 927ca04cd76b30e76948ad5ba21a760b5406dc32..73cfbe72a6618c442240bc6848e14d9a89ee81d8 100644 (file)
--- a/openbsd-compat/sys-tree.h
+++ b/openbsd-compat/sys-tree.h
@@ -1,3 +1,5 @@
+/* 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>

diff --git a/openbsd-compat/vis.c b/openbsd-compat/vis.c
index e6a2ce98d0a014aca51113544e5caf2bacffd685..1fb7a01e3a9592771f15faed902ea6674eca3814 100644 (file)
--- a/openbsd-compat/vis.c
+++ b/openbsd-compat/vis.c
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: lib/libc/gen/vis.c */
+
 /*-
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.

diff --git a/openbsd-compat/vis.h b/openbsd-compat/vis.h
index 1c131cc8558d69fc41825ba98ee62f74a0d4153d..663355a240f0566339928f86b7d3abedeb768f18 100644 (file)
--- a/openbsd-compat/vis.h
+++ b/openbsd-compat/vis.h
@@ -1,3 +1,5 @@
+/* OPENBSD ORIGINAL: include/vis.h */
+
 /*     $OpenBSD: vis.h,v 1.6 2003/06/02 19:34:12 millert Exp $ */
 /*     $NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $      */