From 7f24a0e64774e6566242f44b0f06ab06607d0c97 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 10 Nov 2005 16:18:56 +1100 Subject: - (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. --- openbsd-compat/realpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openbsd-compat/realpath.c') diff --git a/openbsd-compat/realpath.c b/openbsd-compat/realpath.c index 8430bec24..8c889db3e 100644 --- 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 * @@ -28,6 +26,8 @@ * SUCH DAMAGE. */ +/* OPENBSD ORIGINAL: lib/libc/stdlib/realpath.c */ + #include "includes.h" #if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH) -- cgit v1.2.3 From 7cb2a78ae2657fa85f9996f63b053d036531331e Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sat, 12 Nov 2005 14:14:52 +1100 Subject: - (dtucker) [openbsd-compat/realpath.c] Sync $OpenBSD tag. --- ChangeLog | 3 ++- openbsd-compat/realpath.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'openbsd-compat/realpath.c') diff --git a/ChangeLog b/ChangeLog index e87996bb4..550834eeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 20051112 - (dtucker) [openbsd-compat/getrrsetbyname.c] Restore Portable-specific ifdef lost during sync. Spotted by tim@. + - (dtucker) [openbsd-compat/realpath.c] Sync $OpenBSD tag. 20051110 - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from @@ -3296,4 +3297,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.3990 2005/11/12 03:06:29 dtucker Exp $ +$Id: ChangeLog,v 1.3991 2005/11/12 03:14:52 dtucker Exp $ diff --git a/openbsd-compat/realpath.c b/openbsd-compat/realpath.c index 8c889db3e..b6120d034 100644 --- a/openbsd-compat/realpath.c +++ b/openbsd-compat/realpath.c @@ -1,3 +1,4 @@ +/* $OpenBSD: realpath.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */ /* * Copyright (c) 2003 Constantin S. Svintsoff * -- cgit v1.2.3