summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-11-12 14:14:52 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-11-12 14:14:52 +1100
commit7cb2a78ae2657fa85f9996f63b053d036531331e (patch)
tree561c71336b306c2d70eccb778fbdad4a556b60b2
parent16fd99c72702049030901b15a158a2159fe8f428 (diff)
- (dtucker) [openbsd-compat/realpath.c] Sync $OpenBSD tag.
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/realpath.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e87996bb4..550834eeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
120051112 120051112
2 - (dtucker) [openbsd-compat/getrrsetbyname.c] Restore Portable-specific 2 - (dtucker) [openbsd-compat/getrrsetbyname.c] Restore Portable-specific
3 ifdef lost during sync. Spotted by tim@. 3 ifdef lost during sync. Spotted by tim@.
4 - (dtucker) [openbsd-compat/realpath.c] Sync $OpenBSD tag.
4 5
520051110 620051110
6 - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from 7 - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from
@@ -3296,4 +3297,4 @@
3296 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3297 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3297 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3298 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3298 3299
3299$Id: ChangeLog,v 1.3990 2005/11/12 03:06:29 dtucker Exp $ 3300$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 @@
1/* $OpenBSD: realpath.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
1/* 2/*
2 * Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru> 3 * Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru>
3 * 4 *