Only return 0..255 from main().

I think this may fix some bugs with windows exit codes being screwy.

diff --git a/changes/normalize_exit b/changes/normalize_exit
new file mode 100644 (file)
index 0000000..636d45a
--- /dev/null
+++ b/changes/normalize_exit
@@ -0,0 +1,3 @@
+  o Minor features:
+    - Try harder to normalize the exit status of the Tor process to the
+      standard-provided range.

diff --git a/src/or/tor_main.c b/src/or/tor_main.c
index af03b8c06aebed176de34290ff0c06da3927beab..65bb020c2c68f4c99b19845f8a82aab7df3f562e 100644 (file)
--- a/src/or/tor_main.c
+++ b/src/or/tor_main.c
@@ -27,6 +27,10 @@ int tor_main(int argc, char *argv[]);
 int
 main(int argc, char *argv[])
 {
-  return tor_main(argc, argv);
+  int r = tor_main(argc, argv);
+  if (r < 0 || r > 255)
+    return 1;
+  else
+    return r;
 }