aboutsummaryrefslogtreecommitdiff
path: root/toys
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2018-07-24 11:39:42 -0700
committerRob Landley <rob@landley.net>2018-08-04 11:09:20 -0500
commit65c743f97a738fd3a6f97a0b759bb8a4da964c58 (patch)
tree6057b95d9498234291ef4fda5152c60ec4d29712 /toys
parent4b6c9d20f7274e20aca8301734b7da31310d9628 (diff)
downloadtoybox-65c743f97a738fd3a6f97a0b759bb8a4da964c58.tar.gz
file: slightly improve .class, add .dex.
Diffstat (limited to 'toys')
-rw-r--r--toys/posix/file.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/toys/posix/file.c b/toys/posix/file.c
index 715c3e86..333869cd 100644
--- a/toys/posix/file.c
+++ b/toys/posix/file.c
@@ -244,10 +244,14 @@ static void do_regular_file(int fd, char *name)
// TODO: parsing JPEG for width/height is harder than GIF or PNG.
else if (len>32 && !memcmp(toybuf, "\xff\xd8", 2)) xputs("JPEG image data");
- // https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html
+ // https://en.wikipedia.org/wiki/Java_class_file#General_layout
else if (len>8 && strstart(&s, "\xca\xfe\xba\xbe"))
- xprintf("Java class file, version %d.%d\n",
- (int)peek_be(s+2, 2), (int)peek_be(s, 2));
+ xprintf("Java class file, version %d.%d (Java 1.%d)\n",
+ (int)peek_be(s+2, 2), (int)peek_be(s, 2), (int)peek_be(s+2, 2)-44);
+
+ // https://source.android.com/devices/tech/dalvik/dex-format#dex-file-magic
+ else if (len>8 && strstart(&s, "dex\n") && s[3] == 0)
+ xprintf("Android dex file, version %s\n", s);
// https://people.freebsd.org/~kientzle/libarchive/man/cpio.5.txt
// the lengths for cpio are size of header + 9 bytes, since any valid