Enhance getcwd(3) to handle NULL like glibc.
Bug: http://code.google.com/p/android/issues/detail?id=36085
Change-Id: I960a1b585887eb66176c61d29c5c61c239a4003f
diff --git a/libc/Android.mk b/libc/Android.mk
index c66ec59..364f4ca 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -17,7 +17,6 @@
unistd/fstatfs.c \
unistd/ftime.c \
unistd/ftok.c \
- unistd/getcwd.c \
unistd/getdtablesize.c \
unistd/gethostname.c \
unistd/getopt_long.c \
@@ -275,6 +274,7 @@
bionic/fdprintf.c \
bionic/fork.c \
bionic/fts.c \
+ bionic/getcwd.cpp \
bionic/if_nametoindex.c \
bionic/if_indextoname.c \
bionic/ioctl.c \
diff --git a/libc/bionic/getcwd.cpp b/libc/bionic/getcwd.cpp
new file mode 100644
index 0000000..e06f52e
--- /dev/null
+++ b/libc/bionic/getcwd.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "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
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ */
+
+#include <unistd.h>
+#include <errno.h>
+
+extern "C" int __getcwd(char* buf, size_t size);
+
+char* getcwd(char* buf, size_t size) {
+ // You can't specify size 0 unless you're asking us to allocate for you.
+ if (buf != NULL && size == 0) {
+ errno = EINVAL;
+ return NULL;
+ }
+
+ // Allocate a buffer if necessary.
+ char* allocated_buf = NULL;
+ if (buf == NULL) {
+ size_t allocated_size = size;
+ if (size == 0) {
+ // The Linux kernel won't return more than a page, so translate size 0 to 4KiB.
+ // TODO: if we need to support paths longer than that, we'll have to walk the tree ourselves.
+ size = getpagesize();
+ }
+ buf = allocated_buf = reinterpret_cast<char*>(malloc(allocated_size));
+ if (buf == NULL) {
+ // malloc set errno.
+ return NULL;
+ }
+ }
+
+ // Ask the kernel to fill our buffer.
+ int rc = __getcwd(buf, size);
+ if (rc == -1) {
+ free(allocated_buf);
+ // __getcwd set errno.
+ return NULL;
+ }
+
+ // If we allocated a whole page, only return as large an allocation as necessary.
+ if (allocated_buf != NULL) {
+ if (size == 0) {
+ buf = strdup(allocated_buf);
+ free(allocated_buf);
+ } else {
+ buf = allocated_buf;
+ }
+ }
+
+ return buf;
+}
diff --git a/libc/unistd/getcwd.c b/libc/unistd/getcwd.c
deleted file mode 100644
index 1172445..0000000
--- a/libc/unistd/getcwd.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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
- * COPYRIGHT OWNER OR CONTRIBUTORS 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.
- */
-#include <unistd.h>
-#include <errno.h>
-
-extern int __getcwd(char * buf, size_t size);
-
-char *getcwd(char *buf, size_t size)
-{
- if (buf == NULL || size == 0) {
- errno = EINVAL;
- return NULL;
- }
- return ( __getcwd(buf, size) < 0 ) ? NULL : buf;
-}
diff --git a/tests/Android.mk b/tests/Android.mk
index 2721138..e9fdde1 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -20,6 +20,7 @@
test_tags = eng tests
test_src_files = \
+ getcwd_test.cpp \
regex_test.cpp \
# Build for the device (with bionic). Run with:
diff --git a/tests/getcwd_test.cpp b/tests/getcwd_test.cpp
new file mode 100644
index 0000000..45ff395
--- /dev/null
+++ b/tests/getcwd_test.cpp
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+
+#include <errno.h>
+#include <limits.h>
+#include <unistd.h>
+
+TEST(getcwd, auto_full) {
+ // If we let the library do all the work, everything's fine.
+ errno = 0;
+ char* cwd = getcwd(NULL, 0);
+ ASSERT_TRUE(cwd != NULL);
+ ASSERT_EQ(errno, 0);
+ ASSERT_GE(strlen(cwd), 1U);
+ free(cwd);
+}
+
+TEST(getcwd, auto_reasonable) {
+ // If we ask the library to allocate a reasonable buffer, everything's fine.
+ errno = 0;
+ char* cwd = getcwd(NULL, PATH_MAX);
+ ASSERT_TRUE(cwd != NULL);
+ ASSERT_EQ(errno, 0);
+ ASSERT_GE(strlen(cwd), 1U);
+ free(cwd);
+}
+
+TEST(getcwd, auto_too_small) {
+ // If we ask the library to allocate a too-small buffer, ERANGE.
+ errno = 0;
+ char* cwd = getcwd(NULL, 1);
+ ASSERT_TRUE(cwd == NULL);
+ ASSERT_EQ(errno, ERANGE);
+}
+
+TEST(getcwd, auto_too_large) {
+ // If we ask the library to allocate an unreasonably large buffer, ERANGE.
+ errno = 0;
+ char* cwd = getcwd(NULL, static_cast<size_t>(-1));
+ ASSERT_TRUE(cwd == NULL);
+ ASSERT_EQ(errno, ENOMEM);
+}
+
+TEST(getcwd, manual_too_small) {
+ // If we allocate a too-small buffer, ERANGE.
+ char tiny_buf[1];
+ errno = 0;
+ char* cwd = getcwd(tiny_buf, sizeof(tiny_buf));
+ ASSERT_TRUE(cwd == NULL);
+ ASSERT_EQ(errno, ERANGE);
+}
+
+TEST(getcwd, manual_zero) {
+ // If we allocate a zero-length buffer, EINVAL.
+ char tiny_buf[1];
+ errno = 0;
+ char* cwd = getcwd(tiny_buf, 0);
+ ASSERT_TRUE(cwd == NULL);
+ ASSERT_EQ(errno, EINVAL);
+}
+
+TEST(getcwd, manual_path_max) {
+ char* buf = new char[PATH_MAX];
+ errno = 0;
+ char* cwd = getcwd(buf, PATH_MAX);
+ ASSERT_TRUE(cwd == buf);
+ ASSERT_EQ(errno, 0);
+ ASSERT_GE(strlen(cwd), 1U);
+ delete[] cwd;
+}