[tor-commits] [orbot/master] updated script for shell cmd logging
n8fr8 at torproject.org
n8fr8 at torproject.org
Thu Jan 26 01:12:35 UTC 2012
commit 9935cc8784a403a21ad7db12ad3edb32d1695753
Author: Nathan Freitas <nathan at freitas.net>
Date: Mon Jan 16 22:54:42 2012 -0500
updated script for shell cmd logging
---
.../android/service/TorServiceUtils.java | 86 +++++++++-----------
1 files changed, 40 insertions(+), 46 deletions(-)
diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java
index faf7989..cd4429d 100644
--- a/src/org/torproject/android/service/TorServiceUtils.java
+++ b/src/org/torproject/android/service/TorServiceUtils.java
@@ -161,57 +161,51 @@ public class TorServiceUtils implements TorServiceConstants {
public static int doShellCommand(String[] cmds, StringBuilder log, boolean runAsRoot, boolean waitFor) throws Exception
{
- TorService.logMessage("executing shell cmds: " + cmds[0] + "; runAsRoot=" + runAsRoot);
+ TorService.logMessage("executing shell cmds: " + cmds[0] + "; runAsRoot=" + runAsRoot + ";waitFor=" + waitFor);
-
Process proc = null;
int exitCode = -1;
-
- if (runAsRoot)
- proc = Runtime.getRuntime().exec("su");
- else
- proc = Runtime.getRuntime().exec("sh");
-
-
- OutputStreamWriter out = new OutputStreamWriter(proc.getOutputStream());
-
- for (int i = 0; i < cmds.length; i++)
- {
- out.write(cmds[i]);
- out.write("\n");
- }
-
- out.flush();
- out.write("exit\n");
- out.flush();
-
- if (waitFor)
- {
-
- final char buf[] = new char[10];
-
- // Consume the "stdout"
- InputStreamReader reader = new InputStreamReader(proc.getInputStream());
- int read=0;
- while ((read=reader.read(buf)) != -1) {
- if (log != null) log.append(buf, 0, read);
- }
-
- // Consume the "stderr"
- reader = new InputStreamReader(proc.getErrorStream());
- read=0;
- while ((read=reader.read(buf)) != -1) {
- if (log != null) log.append(buf, 0, read);
- }
-
- exitCode = proc.waitFor();
- log.append("process exit code: ");
- log.append(exitCode);
- log.append("\n");
-
- TorService.logMessage("command process exit value: " + exitCode);
+ if (runAsRoot)
+ proc = Runtime.getRuntime().exec("su");
+ else
+ proc = Runtime.getRuntime().exec("sh");
+
+
+ OutputStreamWriter out = new OutputStreamWriter(proc.getOutputStream());
+
+ for (int i = 0; i < cmds.length; i++)
+ {
+ out.write(cmds[i]);
+ out.write("\n");
+ }
+
+ out.flush();
+ out.write("exit\n");
+ out.flush();
+
+ if (waitFor)
+ {
+
+ final char buf[] = new char[10];
+
+ // Consume the "stdout"
+ InputStreamReader reader = new InputStreamReader(proc.getInputStream());
+ int read=0;
+ while ((read=reader.read(buf)) != -1) {
+ if (log != null) log.append(buf, 0, read);
}
+
+ // Consume the "stderr"
+ reader = new InputStreamReader(proc.getErrorStream());
+ read=0;
+ while ((read=reader.read(buf)) != -1) {
+ if (log != null) log.append(buf, 0, read);
+ }
+
+ exitCode = proc.waitFor();
+
+ }
return exitCode;
More information about the tor-commits
mailing list