diff options
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | dhcpcd.c | 14 |
2 files changed, 12 insertions, 5 deletions
@@ -1,5 +1,4 @@ # Copyright 2006 The Android Open Source Project -ifneq ($(TARGET_SIMULATOR),true) LOCAL_PATH:= $(call my-dir) etc_dir := $(TARGET_OUT)/etc/dhcpcd @@ -57,5 +56,3 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(hooks_target) LOCAL_SRC_FILES := $(hooks_dir)/$(LOCAL_MODULE) include $(BUILD_PREBUILT) - -endif @@ -1905,9 +1905,14 @@ main(int argc, char **argv) char pidpropname[PROPERTY_KEY_MAX]; char pidpropval[PROPERTY_VALUE_MAX]; + if (optind != argc - 1) { + syslog(LOG_ERR, "Android requires an interface"); + exit(EXIT_FAILURE); + } + if (snprintf(pidpropname, sizeof(pidpropname), - "dhcp.%s.pid", iface->name) >= PROPERTY_KEY_MAX) + "dhcp.%s.pid", argv[optind]) >= PROPERTY_KEY_MAX) exit(EXIT_FAILURE); property_get(pidpropname, pidpropval, NULL); if (strlen(pidpropval) == 0) @@ -1985,9 +1990,14 @@ main(int argc, char **argv) if (set_cloexec(pidfd) == -1) exit(EXIT_FAILURE); #ifdef ANDROID + if (optind != argc - 1) { + syslog(LOG_ERR, "Android requires an interface"); + exit(EXIT_FAILURE); + } + if (snprintf(pidpropname, sizeof(pidpropname), - "dhcp.%s.pid", iface->name) >= PROPERTY_KEY_MAX) + "dhcp.%s.pid", argv[optind]) >= PROPERTY_KEY_MAX) exit(EXIT_FAILURE); if (snprintf(pidpropval, sizeof(pidpropval), "%d", getpid()) >= PROPERTY_VALUE_MAX) exit(EXIT_FAILURE); |