Fixed buffer overflows, makefile

.gitignore

@@ -0,0 +1 @@
+ropipe

Makefile

@@ -16,7 +16,7 @@ else
 endif
 uninstall:
 ifneq ($(shell id -u), 0)
-        @echo "You must be root to uninstall"
+	@echo "You must be root to uninstall"
 else
 	echo "Removing man file"
 	rm -rf /usr/local/share/man/man1/ropipe.1
@@ -26,3 +26,4 @@ endif
 update:
 	git pull
 	make install
+

ropipe.c

@@ -1,139 +1,138 @@
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #define RDIGITS 14
+int validateN(char c) {
+  int n = (int)c;
+  return c > 47 && n < 58;
+}
 /*
  * Returns the value of a roman numeral digit
  * @param {char} c - Roman digit
-*/
+ */
-static int roman_to_integer(char c)
+static int roman_to_integer(char c) {
-{
+  switch (c) {
-    switch (c)
+  case 'I':
-    {
+    return 1;
-    case 'I':
+  case 'V':
-        return 1;
+    return 5;
-    case 'V':
+  case 'X':
-        return 5;
+    return 10;
-    case 'X':
+  case 'L':
-        return 10;
+    return 50;
-    case 'L':
+  case 'C':
-        return 50;
+    return 100;
-    case 'C':
+  case 'D':
-        return 100;
+    return 500;
-    case 'D':
+  case 'M':
-        return 500;
+    return 1000;
-    case 'M':
+  default:
-        return 1000;
+    return 0;
-    default:
+  }
-        return 0;
-    }
 }
 /*
  * Returns the interger value of a roman number
  * @param {string} s - Roman number
-*/
+ */
-int roman_to_int(char *s)
+int roman_to_int(char *s) {
-{
+  int i, int_num = roman_to_integer(s[0]);
-    int i, int_num = roman_to_integer(s[0]);
 
-    for (i = 1; s[i] != '\0'; i++)
+  for (i = 1; s[i] != '\0'; i++) {
-    {
+    int prev_num = roman_to_integer(s[i - 1]);
-        int prev_num = roman_to_integer(s[i - 1]);
+    int cur_num = roman_to_integer(s[i]);
-        int cur_num = roman_to_integer(s[i]);
+    if (prev_num < cur_num) {
-        if (prev_num < cur_num)
+      int_num = int_num - prev_num + (cur_num - prev_num);
-        {
+    } else {
-            int_num = int_num - prev_num + (cur_num - prev_num);
+      int_num += cur_num;
-        }
-        else
-        {
-            int_num += cur_num;
-        }
     }
-    return int_num;
+  }
+  return int_num;
 }
 /*
  * Map of roman digits symbols and their value
  * @elem {string} sym - digit symbol
  * @elem {int} val - digit symbol
-*/
+ */
-typedef struct
+typedef struct {
-{
+  char *sym;
-    char *sym;
+  int val;
-    int val;
 } numeral;
 /*
  * Returns greatest numeral index
  * @elem {numeral} nu - map of roman digits symbols and their value
  * @elem {int} num - number
-*/
+ */
-int maxNume(numeral *nu, int num)
+int maxNume(numeral *nu, int num) {
-{
+  int i, index;
-    int i, index;
+  for (i = 0; i < RDIGITS; i++) { // RDIGITS numerals in array
-    for (i = 0; i < RDIGITS; i++)
+    if (nu[i].val <= num)
-    { //RDIGITS numerals in array
+      index = i;
-        if (nu[i].val <= num)
+  }
-            index = i;
+  // gretest value numeral index, not greater than number
-    }
+  return index;
-    //gretest value numeral index, not greater than number
-    return index;
 }
 /*
  * Prints roman number from integer
  * @elem {numeral} nu - map of roman digits symbols and their value
  * @elem {int} num - number
-*/
+ */
-void decToRoman(numeral *nu, int num)
+void decToRoman(numeral *nu, int num) {
-{
+  int max;
-    int max;
+  if (num != 0) {
-    if (num != 0)
+    max = maxNume(nu, num);
-    {
+    printf("%s", nu[max].sym);
-        max = maxNume(nu, num);
+    num -= nu[max].val;  // decrease number
-        printf("%s", nu[max].sym);
+    decToRoman(nu, num); // recursively print numerals
-        num -= nu[max].val;  //decrease number
+  }
-        decToRoman(nu, num); //recursively print numerals
-    }
 }
 /*
  * Main
  * @elem {int} argc - Argument count
  * @elem {string[]} argv - Strings array
-*/
+ */
-int main(int argc, char *argv[])
+int main(int argc, char *argv[]) {
-{
+  int direction = 0;
-    int direction = 0;
+  /*
-    /*
+   * 0: integer to roman (default)
-    * 0: integer to roman (default)
+   * 1: roman to integer
-    * 1: roman to integer
+   */
-    */
+  for (int i = 0; i < argc; i++) {
-    for (int i = 0; i < argc; i++)
+    if (strcmp(argv[i], "-r")) {
-    {
+      direction = 1;
-        if (strcmp(argv[i], "-r"))
+    } else {
-        {
+      direction = 0;
-            direction = 1;
-        }
-        else
-        {
-            direction = 0;
-        }
     }
-    numeral nume[RDIGITS] = {{"I", 1}, {"IV", 4}, {"V", 5}, {"IX", 9}, {"X", 10}, {"XL", 40}, {"L", 50}, {"XC", 90}, {"C", 100}, {"CD", 400}, {"D", 500}, {"CM", 900}, {"M", 1000}, {"MMMM", 4000}};
+  }
-    char *str1;
+  numeral nume[RDIGITS] = {{"I", 1},    {"IV", 4},     {"V", 5},   {"IX", 9},
-    int inputint = 0;
+                           {"X", 10},   {"XL", 40},    {"L", 50},  {"XC", 90},
-    switch (direction)
+                           {"C", 100},  {"CD", 400},   {"D", 500}, {"CM", 900},
+                           {"M", 1000}, {"MMMM", 4000}};
+  char str[51];
+  int inputint = 0;
+  switch (direction) {
+  case 0:
+    while (scanf("%50s", str) &&
+           !feof(stdin)) // read integers and convert to roman
     {
-    case 0:
+      printf("%d\n", roman_to_int(str));
-        while (scanf("%s", &str1) && !feof(stdin)) // read integers and convert to roman
+      scanf("%*[^\n]"); // discard all until newline
-        {
-            printf("%d\n", roman_to_int(&str1));
-        }
-        break;
-    case 1:
-        while (scanf("%d", &inputint) && !feof(stdin)) // read roman and  convert to integers
-        {
-            decToRoman(nume, inputint);
-            printf("\n");
-        }
-        break;
     }
-    return 0;
+    break;
+  case 1:
+    while (scanf("%9s", str) &&
+           !feof(stdin)) // read roman and  convert to integers
+    {
+      for (int i = 0; i < strlen(str); i++) {
+        if (!validateN(str[i]))
+          break;
+      }
+      sscanf(str, "%d", &inputint);
+      decToRoman(nume, inputint);
+      printf("\n");
+      scanf("%*[^\n]"); // discard all until newline
+    }
+    break;
+  }
+  return 0;
 }