commit 7d0c73cb8dda620a17503911726a3a01356eb39d
author Scott Anderson <saa@android.com> Fri Oct 18 18:15:32 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 18 18:15:32 2013 +0000
tree a6a169350152696cff8a2d1302b2f806992294d4
parent fb7e395455c9a2acee13aaa527768558d0a58b7c
parent 9e97fee0190307dd38eb2e3cd76b4ec60ab057b7

Merge "Enhance the ioctl toolbox command"

toolbox/ioctl.c

diff --git a/toolbox/ioctl.c b/toolbox/ioctl.c
index fb555d2..fd24885 100644
--- a/toolbox/ioctl.c
+++ b/toolbox/ioctl.c
@@ -63,10 +63,14 @@
         exit(1);
     }
 
-    fd = open(argv[optind], O_RDWR | O_SYNC);
-    if (fd < 0) {
-        fprintf(stderr, "cannot open %s\n", argv[optind]);
-        return 1;
+    if (!strcmp(argv[optind], "-")) {
+        fd = STDIN_FILENO;
+    } else {
+        fd = open(argv[optind], read_only ? O_RDONLY : (O_RDWR | O_SYNC));
+        if (fd < 0) {
+            fprintf(stderr, "cannot open %s\n", argv[optind]);
+            return 1;
+        }
     }
     optind++;