summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--defines.h11
-rw-r--r--openbsd-compat/realpath.c7
3 files changed, 11 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index d7b6ede3c..e09afd65a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
12 - (bal) Use 'NGROUPS' for NeXT Since 'MAX_NGROUPS' is wrapped up in -lposix 12 - (bal) Use 'NGROUPS' for NeXT Since 'MAX_NGROUPS' is wrapped up in -lposix
13 stuff. Change suggested by Mark Miller <markm@swoon.net> 13 stuff. Change suggested by Mark Miller <markm@swoon.net>
14 - (bal) Small fix to scp. %lu vs %ld 14 - (bal) Small fix to scp. %lu vs %ld
15 - (bal) NeXTStep lacks S_ISLNK. Plus split up S_IS*
15 16
1620010318 1720010318
17 - (bal) Fixed scp type casing issue which causes "scp: protocol error: 18 - (bal) Fixed scp type casing issue which causes "scp: protocol error:
@@ -4611,4 +4612,4 @@
4611 - Wrote replacements for strlcpy and mkdtemp 4612 - Wrote replacements for strlcpy and mkdtemp
4612 - Released 1.0pre1 4613 - Released 1.0pre1
4613 4614
4614$Id: ChangeLog,v 1.978 2001/03/19 03:09:40 mouring Exp $ 4615$Id: ChangeLog,v 1.979 2001/03/19 03:12:25 mouring Exp $
diff --git a/defines.h b/defines.h
index 9d58db38d..29c46a620 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
1#ifndef _DEFINES_H 1#ifndef _DEFINES_H
2#define _DEFINES_H 2#define _DEFINES_H
3 3
4/* $Id: defines.h,v 1.59 2001/03/19 02:27:26 tim Exp $ */ 4/* $Id: defines.h,v 1.60 2001/03/19 03:12:26 mouring Exp $ */
5 5
6/* Some platforms need this for the _r() functions */ 6/* Some platforms need this for the _r() functions */
7#if !defined(_REENTRANT) && !defined(SNI) 7#if !defined(_REENTRANT) && !defined(SNI)
@@ -99,11 +99,18 @@ enum
99# define O_NONBLOCK 00004 99# define O_NONBLOCK 00004
100#endif 100#endif
101 101
102#ifndef S_ISREG 102#ifndef S_ISDIR
103# define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR)) 103# define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR))
104#endif /* S_ISDIR */
105
106#ifndef S_ISREG
104# define S_ISREG(mode) (((mode) & (_S_IFMT)) == (_S_IFREG)) 107# define S_ISREG(mode) (((mode) & (_S_IFMT)) == (_S_IFREG))
105#endif /* S_ISREG */ 108#endif /* S_ISREG */
106 109
110#ifndef S_ISLNK
111# define S_ISLNK(mode) (((mode) & (_S_IFMT)) == (_S_IFLNK))
112#endif /* S_ISLNK */
113
107#ifndef S_IXUSR 114#ifndef S_IXUSR
108# define S_IXUSR 0000100 /* execute/search permission, */ 115# define S_IXUSR 0000100 /* execute/search permission, */
109# define S_IXGRP 0000010 /* execute/search permission, */ 116# define S_IXGRP 0000010 /* execute/search permission, */
diff --git a/openbsd-compat/realpath.c b/openbsd-compat/realpath.c
index baf17f1a4..fbe2a9c2c 100644
--- a/openbsd-compat/realpath.c
+++ b/openbsd-compat/realpath.c
@@ -45,13 +45,6 @@ static char *rcsid = "$OpenBSD: realpath..c,v 1.4 1998/05/18 09:55:19 deraadt Ex
45#include <unistd.h> 45#include <unistd.h>
46 46
47/* 47/*
48 * S_ISLNK compatibility
49 */
50#ifndef S_ISLNK
51#define S_ISLNK(m) ((m & 0170000) == 0120000)
52#endif
53
54/*
55 * MAXSYMLINKS 48 * MAXSYMLINKS
56 */ 49 */
57#ifndef MAXSYMLINKS 50#ifndef MAXSYMLINKS