Merge commit 'upstream/1.7.6p1'

[debian/sudo] / getcwd.c

diff --git a/getcwd.c b/getcwd.c
index 6b5588a330a79c345a3b3a40c938c7bad57bf021..1260ad46f14678d5faf4ac31eec2471b2a2b3765 100644 (file)
--- a/getcwd.c
+++ b/getcwd.c
@@ -44,11 +44,10 @@
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
-#else
-# ifdef HAVE_STRINGS_H
-#  include <strings.h>
-# endif
 #endif /* HAVE_STRING_H */
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif /* HAVE_STRINGS_H */
 #if defined(HAVE_MALLOC_H) && !defined(STDC_HEADERS)
 # include <malloc.h>
 #endif /* HAVE_MALLOC_H && !STDC_HEADERS */
@@ -72,16 +71,12 @@
 # endif
 #endif
 
-#include <compat.h>
+#include "missing.h"
 
 #define        ISDOT(dp) \
        (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || \
            (dp->d_name[1] == '.' && dp->d_name[2] == '\0')))
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: getcwd.c,v 1.28 2005/02/08 03:55:42 millert Exp $";
-#endif /* lint */
-
 char *
 getcwd(pt, size)
        char *pt;
@@ -109,12 +104,12 @@ getcwd(pt, size)
                ptsize = 0;
                if (!size) {
                        errno = EINVAL;
-                       return (NULL);
+                       return NULL;
                }
                ept = pt + size;
        } else {
                if ((pt = malloc(ptsize = 1024 - 4)) == NULL)
-                       return (NULL);
+                       return NULL;
                ept = pt + ptsize;
        }
        bpt = ept - 1;
@@ -159,7 +154,7 @@ getcwd(pt, size)
                         */
                        bcopy(bpt, pt, ept - bpt);
                        free(up);
-                       return (pt);
+                       return pt;
                }
 
                /*
@@ -267,5 +262,5 @@ err:
                free(up);
        if (dir)
                (void)closedir(dir);
-       return (NULL);
+       return NULL;
 }