Merge pull request #104 from plankp/master

Fixed naming clash with `base64` value 62 and 63
raphydaphy · Nov 29, 2015 · 06ceeb7 · 06ceeb7
2 parents 40e199c + a072ee2
commit 06ceeb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/kernel/apps/calc.c b/kernel/apps/calc.c
@@ -79,6 +79,7 @@ void calc(string args)
         print("\nUse calc -h for help\n>  ", 0x0F);
 
         readStr(calcInput, CALCSIZE);
+        strcat(calcInput, "+0"); // Unary related hack! do not delete
 
         for(int i = 0; i < CALCSIZE; i++)
         {
@@ -87,7 +88,7 @@ void calc(string args)
             else
             {
                 int pInput = ctoi(calcInput[i]);
-                if (pInput != -1)
+                if ((pInput != -1) && (pInput != 62) && (pInput != 63))
                     tempNum = concat(tempNum, pInput);
                 else {
                     // Properly check for math operator

diff --git a/kernel/apps/calc.h b/kernel/apps/calc.h
@@ -13,7 +13,7 @@
 #endif
 
 // math storage variables
-char calcInput[CALCSIZE];
+char calcInput[CALCSIZE + 2]; // For `+0`
 int mathOp[CALCSIZE];
 int tempNum;
 double strNum[CALCSIZE];