missing help for option -i

[calc.git] / calc.c

diff --git a/calc.c b/calc.c
index 5014f3ef8e4c5342ce0eb278dc0b9be66a169e8a..8ae39fe58798026b6c18ad6016316134305c264b 100644 (file)
--- a/calc.c
+++ b/calc.c
@@ -37,6 +37,7 @@ int usage (int ret)
     fprintf (fid, "usage: %s\n", progname);
     fprintf (fid, " -h : help message\n");
     fprintf (fid, " -b : in/out-put base (%s)\n", show_base ());
+    fprintf (fid, " -i : input prompt (%s)\n", oprompt);
     fprintf (fid, " -n : no readline mode (%s)\n", mode ? "yes" : "no");
     fprintf (fid, " -n : no readline mode (%s)\n", mode ? "yes" : "no");
     fprintf (fid, " -o : output prompt (%s)\n", oprompt);
@@ -211,13 +212,16 @@ int main (int argc, char *argv[])
 
         if (mode) {
             free (buffer);
+            buffer = NULL;
         } else {
             memset (buffer, 0, BUFFER_SIZE);
         }
         fflush (stdout);
     }
 
-    clean_read_line (buffer);
+    if (mode) {
+        clean_read_line (buffer);
+    }
 
     free_format ();
 
@@ -239,6 +243,7 @@ int main (int argc, char *argv[])
 // test: calc.exe -p 2>&1 | grep -q 'missing precision'
 // test: calc.exe -v 2>&1 | grep -q 'missing verbose'
 // test: echo "1 + 1" | calc.exe -i '# ' | grep -q '# 1 + 1'
+// test: echo "1 + 1" | calc.exe -i '# ' -i 'x ' | grep -q 'x 1 + 1'
 // test: echo "1 + 1" | calc.exe -o '# ' | grep -q '# 2'
 // test: echo "1 + 1" | calc.exe -o '# ' -o 'x ' | grep -q 'x 2'
 // test: echo "1 + 2" | calc.exe | grep -q '=> 3'
@@ -388,11 +393,11 @@ int main (int argc, char *argv[])
 // test: echo -e 'set (1, 2, -5, 6, -8, 9, -2, 23, 4)\nmin (5, -3)\nmax (-1)\nmin\nmean\nmed\nmax\nord\nprod\nsum\nvar\nquit' | calc.exe -n -v 3 | grep -q bye
 // test: echo -e 'min\nmean\nmed\nmax\nprod\nsum\nvar\nord\nset (1)\nord' | calc.exe -n | grep -c error | xargs test 9 =
 // test: echo -e 'prog (1, cos(pi * arg (1))) / 4' | calc.exe | grep -c error | xargs test 1 = 
-// test: echo -e 'format\n.12345678901' | calc.exe | grep -n '=> 6'
-// test: echo -e 'format (8)\n.12345678901' | calc.exe | grep -n '=> 0.12345679'
-// test: echo -e 'format (12)\n.12345678901' | calc.exe | grep -n '=> 0.12345678901'
-// test: echo -e 'format (4)\n.12345678901\format' | calc.exe | grep -n '=> 4'
-// test: echo -e 'format (0)' | calc.exe | grep -n 'error'
+// test: echo -e 'format\n.12345678901' | calc.exe | grep -q '=> 6'
+// test: echo -e 'format (8)\n.12345678901' | calc.exe | grep -q '=> 0.12345679'
+// test: echo -e 'format (12)\n.12345678901' | calc.exe | grep -q '=> 0.12345678901'
+// test: echo -e 'format (4)\n.12345678901\format' | calc.exe | grep -q '=> 4'
+// test: echo -e 'format (0)' | calc.exe | grep -q 'error'
 // test: echo -e 'ff + ff' | calc.exe -b 16 | grep -q '=> 1fe'
 // test: echo -e '60 / 4' | calc.exe -b 8 | grep -q '=> 14'
 // test: echo -e 'z00-z0+1-2*z+20x' | calc.exe -b 36 | grep -q '=> 1000'
@@ -416,4 +421,7 @@ int main (int argc, char *argv[])
 // Factorial sequence
 // test: echo -e 'prog (1, cond (arg (1) > 1, arg (1) * call (1, arg (1) - 1), 1))\ncall (1, 10)' | calc.exe | grep -q '=> 3.6288e+06'
 
+// Birthday problem
+// test: echo -e '{sto (1, 365), sto (2, 0), sto (10, 1), while (inc (2) < 50, {sto (10, rcl (10) * (rcl (1) - rcl (2)) / rcl (1)), print (rcl (2) + 1), print ((1 - rcl (10)) * 100)})};' | calc.exe | grep -q '=> 97.0374'
+
 /* vim: set ts=4 sw=4 et: */