am 746f3243: Add USB vendor IDs for Quanta, INQ and Sony.
* commit '746f3243f6d30ab51a36dcfea76eac3ba29ac625':
Add USB vendor IDs for Quanta, INQ and Sony.
diff --git a/adb/adb.c b/adb/adb.c
index e35c334..e7a28d2 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -940,24 +940,29 @@
}
}
- /* for the device, start the usb transport if the
- ** android usb device exists and the "service.adb.tcp.port" and
- ** "persist.adb.tcp.port" properties are not set.
- ** Otherwise start the network transport.
- */
- property_get("service.adb.tcp.port", value, "");
- if (!value[0])
- property_get("persist.adb.tcp.port", value, "");
- if (sscanf(value, "%d", &port) == 1 && port > 0) {
- // listen on TCP port specified by service.adb.tcp.port property
- local_init(port);
- } else if (access("/dev/android_adb", F_OK) == 0) {
+ int usb = 0;
+ if (access("/dev/android_adb", F_OK) == 0) {
// listen on USB
usb_init();
- } else {
+ usb = 1;
+ }
+
+ // If one of these properties is set, also listen on that port
+ // If one of the properties isn't set and we couldn't listen on usb,
+ // listen on the default port.
+ property_get("service.adb.tcp.port", value, "");
+ if (!value[0]) {
+ property_get("persist.adb.tcp.port", value, "");
+ }
+ if (sscanf(value, "%d", &port) == 1 && port > 0) {
+ printf("using port=%d\n", port);
+ // listen on TCP port specified by service.adb.tcp.port property
+ local_init(port);
+ } else if (!usb) {
// listen on default port
local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);
}
+
D("adb_main(): pre init_jdwp()\n");
init_jdwp();
D("adb_main(): post init_jdwp()\n");
diff --git a/init/init.c b/init/init.c
index 165fea0..68e9f49 100755
--- a/init/init.c
+++ b/init/init.c
@@ -59,13 +59,12 @@
#endif
static char console[32];
-static char serialno[32];
-static char bootmode[32];
-static char baseband[32];
-static char carrier[32];
-static char bootloader[32];
-static char hardware[32];
-static char modelno[32];
+static char serialno[PROP_VALUE_MAX];
+static char bootmode[PROP_VALUE_MAX];
+static char baseband[PROP_VALUE_MAX];
+static char carrier[PROP_VALUE_MAX];
+static char bootloader[PROP_VALUE_MAX];
+static char hardware[PROP_VALUE_MAX];
static unsigned revision = 0;
static char qemu[32];
@@ -448,8 +447,6 @@
strlcpy(bootloader, value, sizeof(bootloader));
} else if (!strcmp(name,"androidboot.hardware")) {
strlcpy(hardware, value, sizeof(hardware));
- } else if (!strcmp(name,"androidboot.modelno")) {
- strlcpy(modelno, value, sizeof(modelno));
}
} else {
/* in the emulator, export any kernel option with the
@@ -599,9 +596,6 @@
property_set("ro.carrier", carrier[0] ? carrier : "unknown");
property_set("ro.bootloader", bootloader[0] ? bootloader : "unknown");
- if (modelno[0])
- property_set("ro.boot.modelno", modelno);
-
property_set("ro.hardware", hardware);
snprintf(tmp, PROP_VALUE_MAX, "%d", revision);
property_set("ro.revision", tmp);
diff --git a/rootdir/init.rc b/rootdir/init.rc
index cad4cd8..a1a2668 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -163,6 +163,8 @@
mkdir /data/app-private 0771 system system
mkdir /data/app 0771 system system
mkdir /data/property 0700 root root
+ mkdir /data/ssh 0750 root shell
+ mkdir /data/ssh/empty 0700 root root
# create dalvik-cache, so as to enforce our permissions
mkdir /data/dalvik-cache 0771 system system
@@ -486,3 +488,6 @@
socket dumpstate stream 0660 shell log
disabled
oneshot
+
+service sshd /system/bin/start-ssh
+ class main
diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index d7a675a..7e20448 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -55,7 +55,8 @@
nandread \
ionice \
touch \
- lsof
+ lsof \
+ md5
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
TOOLS += r
@@ -68,6 +69,8 @@
LOCAL_SHARED_LIBRARIES := libcutils libc libusbhost
+LOCAL_C_INCLUDES := bionic/libc/bionic
+
LOCAL_MODULE:= toolbox
# Including this will define $(intermediates).
diff --git a/toolbox/hd.c b/toolbox/hd.c
index da31245..0d2f96a 100644
--- a/toolbox/hd.c
+++ b/toolbox/hd.c
@@ -68,6 +68,8 @@
if(count > 0 && base + count - filepos < read_len)
read_len = base + count - filepos;
res = read(fd, &buf, read_len);
+ if(res == 0)
+ break;
for(i = 0; i < res; i++) {
if((i & 15) == 0) {
printf("%08x: ", filepos + i);
@@ -80,7 +82,7 @@
lsum = 0;
}
}
- if(res <= 0) {
+ if(res < 0) {
printf("Read error on %s, offset %d len %d, %s\n", argv[optind], filepos, read_len, strerror(errno));
return 1;
}
diff --git a/toolbox/md5.c b/toolbox/md5.c
new file mode 100644
index 0000000..2fb8b05
--- /dev/null
+++ b/toolbox/md5.c
@@ -0,0 +1,77 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <md5.h>
+
+/* When this was written, bionic's md5.h did not define this. */
+#ifndef MD5_DIGEST_LENGTH
+#define MD5_DIGEST_LENGTH 16
+#endif
+
+static int usage()
+{
+ fprintf(stderr,"md5 file ...\n");
+ return -1;
+}
+
+static int do_md5(const char *path)
+{
+ unsigned int i;
+ int fd;
+ MD5_CTX md5_ctx;
+ unsigned char md5[MD5_DIGEST_LENGTH];
+
+ fd = open(path, O_RDONLY);
+ if (fd < 0) {
+ fprintf(stderr,"could not open %s, %s\n", path, strerror(errno));
+ return -1;
+ }
+
+ /* Note that bionic's MD5_* functions return void. */
+ MD5_Init(&md5_ctx);
+
+ while (1) {
+ char buf[4096];
+ ssize_t rlen;
+ rlen = read(fd, buf, sizeof(buf));
+ if (rlen == 0)
+ break;
+ else if (rlen < 0) {
+ (void)close(fd);
+ fprintf(stderr,"could not read %s, %s\n", path, strerror(errno));
+ return -1;
+ }
+ MD5_Update(&md5_ctx, buf, rlen);
+ }
+ if (close(fd)) {
+ fprintf(stderr,"could not close %s, %s\n", path, strerror(errno));
+ return -1;
+ }
+
+ MD5_Final(md5, &md5_ctx);
+
+ for (i = 0; i < (int)sizeof(md5); i++)
+ printf("%02x", md5[i]);
+ printf(" %s\n", path);
+
+ return 0;
+}
+
+int md5_main(int argc, char *argv[])
+{
+ int i, ret = 0;
+
+ if (argc < 2)
+ return usage();
+
+ /* loop over the file args */
+ for (i = 1; i < argc; i++) {
+ if (do_md5(argv[i]))
+ ret = 1;
+ }
+
+ return ret;
+}