Merge "Init: Fix Clang unsupported attributes"
diff --git a/include/netutils/ifc.h b/include/netutils/ifc.h
index 49e77e4..3b27234 100644
--- a/include/netutils/ifc.h
+++ b/include/netutils/ifc.h
@@ -51,6 +51,7 @@
extern int ifc_clear_addresses(const char *name);
extern int ifc_create_default_route(const char *name, in_addr_t addr);
+extern int ifc_remove_default_route(const char *ifname);
extern int ifc_get_info(const char *name, in_addr_t *addr, int *prefixLength,
unsigned *flags);
diff --git a/include/utils/Compat.h b/include/utils/Compat.h
index 0df40a1..a238afe 100644
--- a/include/utils/Compat.h
+++ b/include/utils/Compat.h
@@ -35,6 +35,12 @@
#endif /* __APPLE__ */
+#if defined(_WIN32)
+#define O_CLOEXEC 0
+#define O_NOFOLLOW 0
+#define DEFFILEMODE 0666
+#endif /* _WIN32 */
+
#if HAVE_PRINTF_ZD
# define ZD "%zd"
# define ZD_TYPE ssize_t
diff --git a/include/utils/file.h b/include/utils/file.h
new file mode 100644
index 0000000..108cabc
--- /dev/null
+++ b/include/utils/file.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef UTILS_FILE_H
+#define UTILS_FILE_H
+
+#include <string>
+
+namespace android {
+
+bool ReadFileToString(const std::string& path, std::string* content);
+bool WriteStringToFile(const std::string& content, const std::string& path);
+
+} // namespace android
+
+#endif
diff --git a/init/init.c b/init/init.c
index 096d898..8bb6da0 100644
--- a/init/init.c
+++ b/init/init.c
@@ -349,7 +349,7 @@
if (arg_idx == INIT_PARSER_MAXARGS)
break;
}
- arg_ptrs[arg_idx] = '\0';
+ arg_ptrs[arg_idx] = NULL;
execve(svc->args[0], (char**) arg_ptrs, (char**) ENV);
}
_exit(127);
diff --git a/libnetutils/ifc_utils.c b/libnetutils/ifc_utils.c
index ab6c654..bfe7121 100644
--- a/libnetutils/ifc_utils.c
+++ b/libnetutils/ifc_utils.c
@@ -639,6 +639,26 @@
#endif
}
+/*
+ * Removes the default route for the named interface.
+ */
+int ifc_remove_default_route(const char *ifname)
+{
+ struct rtentry rt;
+ int result;
+
+ ifc_init();
+ memset(&rt, 0, sizeof(rt));
+ rt.rt_dev = (void *)ifname;
+ rt.rt_flags = RTF_UP|RTF_GATEWAY;
+ init_sockaddr_in(&rt.rt_dst, 0);
+ if ((result = ioctl(ifc_ctl_sock, SIOCDELRT, &rt)) < 0) {
+ ALOGD("failed to remove default route for %s: %s", ifname, strerror(errno));
+ }
+ ifc_close();
+ return result;
+}
+
int
ifc_configure(const char *ifname,
in_addr_t address,
diff --git a/libutils/Android.mk b/libutils/Android.mk
index 52de910..701fe0e 100644
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@@ -14,9 +14,6 @@
LOCAL_PATH:= $(call my-dir)
-# libutils is a little unique: It's built twice, once for the host
-# and once for the device.
-
commonSources:= \
BasicHashtable.cpp \
BlobCache.cpp \
@@ -42,7 +39,8 @@
Tokenizer.cpp \
Unicode.cpp \
VectorImpl.cpp \
- misc.cpp
+ file.cpp \
+ misc.cpp \
host_commonCflags := -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS) -Werror
@@ -111,11 +109,6 @@
include $(BUILD_SHARED_LIBRARY)
-# Include subdirectory makefiles
-# ============================================================
-# If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework
-# team really wants is to build the stuff defined by this makefile.
-ifeq (,$(ONE_SHOT_MAKEFILE))
+# Build the tests in the tests/ subdirectory.
include $(call first-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/libutils/file.cpp b/libutils/file.cpp
new file mode 100644
index 0000000..aa35ff2
--- /dev/null
+++ b/libutils/file.cpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2015 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 "utils/file.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <utils/Compat.h> // For TEMP_FAILURE_RETRY on Darwin.
+
+bool android::ReadFileToString(const std::string& path, std::string* content) {
+ content->clear();
+
+ int fd = TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_CLOEXEC | O_NOFOLLOW));
+ if (fd == -1) {
+ return false;
+ }
+
+ while (true) {
+ char buf[BUFSIZ];
+ ssize_t n = TEMP_FAILURE_RETRY(read(fd, &buf[0], sizeof(buf)));
+ if (n == -1) {
+ TEMP_FAILURE_RETRY(close(fd));
+ return false;
+ }
+ if (n == 0) {
+ TEMP_FAILURE_RETRY(close(fd));
+ return true;
+ }
+ content->append(buf, n);
+ }
+}
+
+bool android::WriteStringToFile(const std::string& content, const std::string& path) {
+ int fd = TEMP_FAILURE_RETRY(open(path.c_str(),
+ O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NOFOLLOW,
+ DEFFILEMODE));
+ if (fd == -1) {
+ return false;
+ }
+
+ const char* p = content.data();
+ size_t left = content.size();
+ while (left > 0) {
+ ssize_t n = TEMP_FAILURE_RETRY(write(fd, p, left));
+ if (n == -1) {
+ TEMP_FAILURE_RETRY(close(fd));
+ return false;
+ }
+ p += n;
+ left -= n;
+ }
+ TEMP_FAILURE_RETRY(close(fd));
+ return true;
+}
diff --git a/libutils/tests/Android.mk b/libutils/tests/Android.mk
index 634f44f..03d5342 100644
--- a/libutils/tests/Android.mk
+++ b/libutils/tests/Android.mk
@@ -26,6 +26,7 @@
BasicHashtable_test.cpp \
BlobCache_test.cpp \
BitSet_test.cpp \
+ file_test.cpp \
Looper_test.cpp \
LruCache_test.cpp \
String8_test.cpp \
diff --git a/libutils/tests/file_test.cpp b/libutils/tests/file_test.cpp
new file mode 100644
index 0000000..acf66a6
--- /dev/null
+++ b/libutils/tests/file_test.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2013 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 "utils/file.h"
+
+#include <errno.h>
+#include <gtest/gtest.h>
+
+TEST(file, ReadFileToString_ENOENT) {
+ std::string s("hello");
+ errno = 0;
+ EXPECT_FALSE(android::ReadFileToString("/proc/does-not-exist", &s));
+ EXPECT_EQ(ENOENT, errno);
+ EXPECT_EQ("", s); // s was cleared.
+}
+
+TEST(file, ReadFileToString_success) {
+ std::string s("hello");
+ EXPECT_TRUE(android::ReadFileToString("/proc/version", &s));
+ EXPECT_GT(s.length(), 6U);
+ EXPECT_EQ('\n', s[s.length() - 1]);
+ s[5] = 0;
+ EXPECT_STREQ("Linux", s.c_str());
+}