BSD-style copyright; Add S_IFLNK and MIN/MAX id they are missing.

diff --git a/compat.h b/compat.h
index 20dbca6e3bd5fa09877c9bf2ac00e8964edfd487..c30468e1595c37a46b1ea43ac096165910542130 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -1,24 +1,30 @@
 /*
- *  CU sudo version 1.6
- *  Copyright (c) 1996, 1998, 1999 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1996, 1998, 1999 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 1, or (at your option)
- *  any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Please send bugs, changes, problems to sudo-bugs@courtesan.com
- *
- *  $Sudo$
+ * $Sudo$
  */
 
 #ifndef _SUDO_COMPAT_H
@@ -28,7 +34,7 @@
  * Macros that may be missing on some Operating Systems
  */
 
-/* Deal with ansi stuff reasonably.  */
+/* Deal with ANSI stuff reasonably.  */
 #ifndef  __P
 #  if defined (__cplusplus) || defined (__STDC__)
 #    define __P(args)          args
@@ -71,6 +77,9 @@
 #ifndef _S_IFDIR
 #  define _S_IFDIR             S_IFDIR
 #endif /* _S_IFDIR */
+#ifndef _S_IFLNK
+#define _S_IFLNK               S_IFLNK
+#endif /* _S_IFLNK */
 #ifndef S_ISREG
 #  define S_ISREG(m)           (((m) & _S_IFMT) == _S_IFREG)
 #endif /* S_ISREG */
@@ -105,6 +114,16 @@
 #  define      STDERR_FILENO   2
 #endif
 
+/*
+ * BSD defines these in <sys/param.h> but others may not.
+ */
+#ifndef MIN
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+#ifndef MAX
+#define MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+
 /*
  * Emulate seteuid() for AIX via setuidx() -- needed for some versions of AIX
  */