Import of OpenSSH 3.7.1p2

[gssapi-openssh.git] / openssh / openbsd-compat / getcwd.c

diff --git a/openssh/openbsd-compat/getcwd.c b/openssh/openbsd-compat/getcwd.c
index de3baccbbbaa4707ed9bf4b16f4aeb4af2aa4f3e..31d1cfe934a165fd6ad55b0f3b6e1f4ec0a6273e 100644 (file)
--- a/openssh/openbsd-compat/getcwd.c
+++ b/openssh/openbsd-compat/getcwd.c
@@ -10,6 +10,9 @@
  * 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. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -24,12 +27,12 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "includes.h"
 
 #if !defined(HAVE_GETCWD)
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getcwd.c,v 1.6 2000/07/19 15:25:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: getcwd.c,v 1.9 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -47,7 +50,7 @@ static char rcsid[] = "$OpenBSD: getcwd.c,v 1.6 2000/07/19 15:25:13 deraadt Exp
            (dp->d_name[1] == '.' && dp->d_name[2] == '\0')))
 
 char *
-getcwd(char *pt,size_t size)
+getcwd(char *pt, size_t size)
 {
        register struct dirent *dp;
        register DIR *dir = NULL;
@@ -127,7 +130,7 @@ getcwd(char *pt,size_t size)
                /*
                 * Build pointer to the parent directory, allocating memory
                 * as necessary.  Max length is 3 for "../", the largest
-                * possible component name, plus a trailing NULL.
+                * possible component name, plus a trailing NUL.
                 */
                if (bup + 3  + MAXNAMLEN + 1 >= eup) {
                        char *nup;