Replacing atoi with proper number parsing

green-coding-solutions · Sep 28, 2024 · 93b8806 · 93b8806
1 parent 209e1cb
commit 93b8806
Show file tree

Hide file tree

Showing 39 changed files with 116 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ venv/
 lib/hardware_info_root.py
 tools/cluster/cleanup.sh
 node_modules/
+lib/c/parse_int.o
diff --git a/install_linux.sh b/install_linux.sh
@@ -28,10 +28,10 @@ fi
 sudo systemctl stop tinyproxy
 sudo systemctl disable tinyproxy
 
-build_binaries
-
 print_message "Building C libs"
-#make -C "lib/c"
+make -C "lib/c"
+
+build_binaries
 
 print_message "Building sgx binaries"
 make -C lib/sgx-software-enable

diff --git a/lib/c/Makefile b/lib/c/Makefile
@@ -0,0 +1,4 @@
+CFLAGS = -o3 -Wall
+
+parse_int.o: parse_int.c
+	gcc -c $< $(CFLAGS) -o $@
diff --git a/lib/c/parse_int.c b/lib/c/parse_int.c
@@ -0,0 +1,32 @@
+#include "parse_int.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <limits.h>
+
+unsigned int parse_int(char *argument) {
+    unsigned long int number = 0;
+    char *endptr;
+
+    errno = 0;  // Reset errno before the call
+    number = strtoul(argument, &endptr, 10);
+
+    if (errno == ERANGE && (number == LONG_MAX || number == LONG_MIN)) {
+        fprintf(stderr, "Error: Could not parse -i argument - Number out of range\n");
+        exit(1);
+    } else if (errno != 0 && number == 0) {
+        fprintf(stderr, "Error: Could not parse -i argument - Invalid number\n");
+        exit(1);
+    } else if (endptr == argument) {
+        fprintf(stderr, "Error: Could not parse -i argument - No digits were found\n");
+        exit(1);
+    } else if (*endptr != '\0') {
+        fprintf(stderr, "Error: Could not parse -i argument - Invalid characters after number\n");
+        exit(1);
+    }
+
+    return number;
+}
+
diff --git a/lib/c/parse_int.h b/lib/c/parse_int.h
@@ -0,0 +1,6 @@
+#ifndef PARSE_INT_H
+#define PARSE_INT_H
+
+unsigned int parse_int(char *argument);
+
+#endif // PARSE_INT_H
diff --git a/metric_providers/cpu/energy/rapl/msr/component/Makefile b/metric_providers/cpu/energy/rapl/msr/component/Makefile
@@ -1,6 +1,6 @@
-CFLAGS = -o3 -Wall -lm
+CFLAGS = -o3 -Wall -lm -I../../../../../../lib/c
 
 metric-provider-binary: source.c
-	gcc $< $(CFLAGS) -o $@
+	gcc ../../../../../../lib/c/parse_int.o $< $(CFLAGS) -o $@
 	sudo chown root $@
 	sudo chmod u+s $@
diff --git a/metric_providers/cpu/energy/rapl/msr/component/source.c b/metric_providers/cpu/energy/rapl/msr/component/source.c
@@ -37,7 +37,7 @@
 #include <sys/syscall.h>
 #include <sys/time.h>
 #include <limits.h>
-
+#include "parse_int.h"
 
 /* AMD Support */
 #define MSR_AMD_RAPL_POWER_UNIT            0xc0010299
@@ -521,7 +521,7 @@ int main(int argc, char **argv) {
             printf("\t-c      : check system and exit\n");
             exit(0);
         case 'i':
-            msleep_time = atoi(optarg);
+            msleep_time = parse_int(optarg);
             break;
         case 'd':
             measurement_mode=MEASURE_DRAM;

diff --git a/metric_providers/cpu/time/cgroup/container/Makefile b/metric_providers/cpu/time/cgroup/container/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -o3 -Wall
+CFLAGS = -o3 -Wall -I../../../../../lib/c
 
 metric-provider-binary: source.c
-	gcc $< $(CFLAGS) -o $@
+	gcc ../../../../../lib/c/parse_int.o $< $(CFLAGS) -o $@
diff --git a/metric_providers/cpu/time/cgroup/container/source.c b/metric_providers/cpu/time/cgroup/container/source.c
@@ -7,6 +7,7 @@
 #include <string.h> // for strtok
 #include <getopt.h>
 #include <limits.h>
+#include "parse_int.h"
 
 #define DOCKER_CONTAINER_ID_BUFFER 65 // Docker container ID size is 64 + 1 byte for NUL termination
 
@@ -156,7 +157,7 @@ int main(int argc, char **argv) {
             printf("\tCLOCKS_PER_SEC\t%ld\n", CLOCKS_PER_SEC);
             exit(0);
         case 'i':
-            msleep_time = atoi(optarg);
+            msleep_time = parse_int(optarg);
             break;
         case 'r':
             rootless_mode = 1;

diff --git a/metric_providers/cpu/time/cgroup/system/Makefile b/metric_providers/cpu/time/cgroup/system/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -o3 -Wall
+CFLAGS = -o3 -Wall -I../../../../../lib/c
 
 metric-provider-binary: source.c
-	gcc $< $(CFLAGS) -o $@
+	gcc ../../../../../lib/c/parse_int.o $< $(CFLAGS) -o $@
diff --git a/metric_providers/cpu/time/cgroup/system/source.c b/metric_providers/cpu/time/cgroup/system/source.c
@@ -4,6 +4,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <time.h>
+#include "parse_int.h"
 
 // All variables are made static, because we believe that this will
 // keep them local in scope to the file and not make them persist in state
@@ -77,7 +78,7 @@ int main(int argc, char **argv) {
             printf("\tCLOCKS_PER_SEC\t%ld\n", CLOCKS_PER_SEC);
             exit(0);
         case 'i':
-            msleep_time = atoi(optarg);
+            msleep_time = parse_int(optarg);
             break;
         case 'c':
             check_system_flag = 1;

diff --git a/metric_providers/cpu/time/procfs/system/Makefile b/metric_providers/cpu/time/procfs/system/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -o3 -Wall
+CFLAGS = -o3 -Wall -I../../../../../lib/c
 
 metric-provider-binary: source.c
-	gcc $< $(CFLAGS) -o $@
+	gcc ../../../../../lib/c/parse_int.o $< $(CFLAGS) -o $@
diff --git a/metric_providers/cpu/time/procfs/system/source.c b/metric_providers/cpu/time/procfs/system/source.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <time.h>
-
+#include "parse_int.h"
 
 // All variables are made static, because we believe that this will
 // keep them local in scope to the file and not make them persist in state
@@ -86,7 +86,7 @@ int main(int argc, char **argv) {
             printf("\tCLOCKS_PER_SEC\t%ld\n", CLOCKS_PER_SEC);
             exit(0);
         case 'i':
-            msleep_time = atoi(optarg);
+            msleep_time = parse_int(optarg);
             break;
         case 'c':
             check_system_flag = 1;

diff --git a/metric_providers/cpu/utilization/cgroup/container/Makefile b/metric_providers/cpu/utilization/cgroup/container/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -o3 -Wall
+CFLAGS = -o3 -Wall -I../../../../../lib/c
 
 metric-provider-binary: source.c
-	gcc $< $(CFLAGS) -o $@
+	gcc ../../../../../lib/c/parse_int.o $< $(CFLAGS) -o $@
diff --git a/metric_providers/cpu/utilization/cgroup/container/source.c b/metric_providers/cpu/utilization/cgroup/container/source.c
@@ -7,6 +7,7 @@
 #include <string.h> // for strtok
 #include <getopt.h>
 #include <limits.h>
+#include "parse_int.h"
 
 #define DOCKER_CONTAINER_ID_BUFFER 65 // Docker container ID size is 64 + 1 byte for NUL termination
 
@@ -248,7 +249,7 @@ int main(int argc, char **argv) {
             printf("\tCLOCKS_PER_SEC\t%ld\n", CLOCKS_PER_SEC);
             exit(0);
         case 'i':
-            msleep_time = atoi(optarg);
+            msleep_time = parse_int(optarg);
             break;
         case 'r':
             rootless_mode = 1;

diff --git a/metric_providers/cpu/utilization/mach/system/Makefile b/metric_providers/cpu/utilization/mach/system/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -o3 -Wall
+CFLAGS = -o3 -Wall -I../../../../../lib/c
 
 metric-provider-binary: source.c
-	gcc $< $(CFLAGS) -o $@
+	gcc ../../../../../lib/c/parse_int.o $< $(CFLAGS) -o $@
diff --git a/metric_providers/cpu/utilization/mach/system/source.c b/metric_providers/cpu/utilization/mach/system/source.c
@@ -6,6 +6,7 @@
 #include <mach/mach.h>
 #include <mach/mach_host.h>
 #include <unistd.h>
+#include "parse_int.h"
 
 void loop_utilization(unsigned int msleep_time) {
     processor_info_array_t cpuInfo = NULL, prevCpuInfo = NULL;
@@ -92,7 +93,7 @@ int main(int argc, char **argv) {
             printf("\t-c      : check system and exit\n\n");
             exit(0);
         case 'i':
-            msleep_time = atoi(optarg);
+            msleep_time = parse_int(optarg);
             if (msleep_time < 50){
                 fprintf(stderr,"A value of %i is to small. Results will include 0s as the kernel does not update as fast.\n",msleep_time);
             }

diff --git a/metric_providers/cpu/utilization/procfs/system/Makefile b/metric_providers/cpu/utilization/procfs/system/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -o3 -Wall
+CFLAGS = -o3 -Wall -I../../../../../lib/c
 
 metric-provider-binary: source.c
-	gcc $< $(CFLAGS) -o $@
+	gcc ../../../../../lib/c/parse_int.o $< $(CFLAGS) -o $@
diff --git a/metric_providers/cpu/utilization/procfs/system/source.c b/metric_providers/cpu/utilization/procfs/system/source.c
@@ -4,6 +4,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <time.h>
+#include "parse_int.h"
 
 typedef struct procfs_time_t { // struct is a specification and this static makes no sense here
     unsigned long user_time;
@@ -118,7 +119,7 @@ int main(int argc, char **argv) {
             printf("\tCLOCKS_PER_SEC\t%ld\n", CLOCKS_PER_SEC);
             exit(0);
         case 'i':
-            msleep_time = atoi(optarg);
+            msleep_time = parse_int(optarg);
             break;
         case 'c':
             check_system_flag = 1;

diff --git a/metric_providers/disk/io/cgroup/container/Makefile b/metric_providers/disk/io/cgroup/container/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -o3 -Wall
+CFLAGS = -o3 -Wall -I../../../../../lib/c
 
 metric-provider-binary: source.c
-	gcc $< $(CFLAGS) -o $@
+	gcc ../../../../../lib/c/parse_int.o $< $(CFLAGS) -o $@
diff --git a/metric_providers/disk/io/cgroup/container/source.c b/metric_providers/disk/io/cgroup/container/source.c
@@ -6,6 +6,7 @@
 #include <string.h> // for strtok
 #include <getopt.h>
 #include <limits.h>
+#include "parse_int.h"
 
 #define DOCKER_CONTAINER_ID_BUFFER 65 // Docker container ID size is 64 + 1 byte for NUL termination
 
@@ -166,7 +167,7 @@ int main(int argc, char **argv) {
             printf("\t-c      : check system and exit\n\n");
             exit(0);
         case 'i':
-            msleep_time = atoi(optarg);
+            msleep_time = parse_int(optarg);
             break;
         case 'r':
             rootless_mode = 1;

diff --git a/metric_providers/disk/io/procfs/system/Makefile b/metric_providers/disk/io/procfs/system/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -o3 -Wall
+CFLAGS = -o3 -Wall -I../../../../../lib/c
 
 metric-provider-binary: source.c
-	gcc $< $(CFLAGS) -o $@
+	gcc ../../../../../lib/c/parse_int.o $< $(CFLAGS) -o $@
diff --git a/metric_providers/disk/io/procfs/system/source.c b/metric_providers/disk/io/procfs/system/source.c
@@ -8,6 +8,7 @@
 #include <limits.h>
 #include <sys/ioctl.h>
 #include <linux/fs.h>
+#include "parse_int.h"
 
 // All variables are made static, because we believe that this will
 // keep them local in scope to the file and not make them persist in state
@@ -92,7 +93,7 @@ int main(int argc, char **argv) {
             printf("\t-c      : check system and exit\n\n");
             exit(0);
         case 'i':
-            msleep_time = atoi(optarg);
+            msleep_time = parse_int(optarg);
             break;
         case 'c':
             check_system_flag = 1;

diff --git a/metric_providers/disk/used/statvfs/system/Makefile b/metric_providers/disk/used/statvfs/system/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -o3 -Wall
+CFLAGS = -o3 -Wall -I../../../../../lib/c
 
 metric-provider-binary: source.c
-	gcc $< $(CFLAGS) -o $@
+	gcc ../../../../../lib/c/parse_int.o $< $(CFLAGS) -o $@
diff --git a/metric_providers/disk/used/statvfs/system/source.c b/metric_providers/disk/used/statvfs/system/source.c
@@ -5,6 +5,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <getopt.h>
+#include "parse_int.h"
 
 // All variables are made static, because we believe that this will
 // keep them local in scope to the file and not make them persist in state
@@ -73,7 +74,7 @@ int main(int argc, char **argv) {
             printf("\t-c      : check system and exit\n\n");
             exit(0);
         case 'i':
-            msleep_time = atoi(optarg);
+            msleep_time = parse_int(optarg);
             break;
         case 'c':
             check_system_flag = 1;

diff --git a/metric_providers/lm_sensors/Makefile b/metric_providers/lm_sensors/Makefile
@@ -2,13 +2,13 @@ PROGRAM = metric-provider-binary
 SOURCES = source.c chips.c
 GLIBLIB = $(shell pkg-config --libs glib-2.0)
 GLIBGLAGS = $(shell pkg-config --cflags glib-2.0)
-CFLAGS = -o3 -Wall -Llib -lsensors $(GLIBLIB) $(GLIBGLAGS)
+CFLAGS = -o3 -Wall -Llib -lsensors $(GLIBLIB) $(GLIBGLAGS) -I../../lib/c
 
 binary:
-	gcc $(SOURCES) $(CFLAGS) -o $(PROGRAM)
+	gcc ../../lib/c/parse_int.o $(SOURCES) $(CFLAGS) -o $(PROGRAM)
 
 lint:
 	cpplint *.c *.h
 
 debug:
-	gcc $(SOURCES) $(CFLAGS) -g -o $(PROGRAM)
+	gcc ../../lib/c/parse_int.o $(SOURCES) $(CFLAGS) -g -o $(PROGRAM)
diff --git a/metric_providers/lm_sensors/source.c b/metric_providers/lm_sensors/source.c
@@ -45,6 +45,7 @@
 #include "sensors/error.h"
 #include "sensors/sensors.h"
 #include "source.h"
+#include "parse_int.h"
 
 int fahrenheit;
 char degstr[5]; /* store the correct string to print degrees */
@@ -235,10 +236,10 @@ int main(int argc, char *argv[]) {
                 fahrenheit = 1;
                 break;
             case 'i':
-                msleep_time = atoi(optarg);
+                msleep_time = parse_int(optarg);
                 break;
             case 'n':
-                measurement_amount = atoi(optarg);
+                measurement_amount = parse_int(optarg);
                 break;
             default:
                 exit(1);

diff --git a/metric_providers/memory/energy/rapl/msr/component/Makefile b/metric_providers/memory/energy/rapl/msr/component/Makefile
@@ -1,6 +1,6 @@
-CFLAGS = -o3 -Wall -lm
+CFLAGS = -o3 -Wall -lm -I../../../../../../lib/c
 
 metric-provider-binary: source.c
-	gcc $< $(CFLAGS) -o $@
+	gcc ../../../../../../lib/c/parse_int.o $< $(CFLAGS) -o $@
 	sudo chown root $@
 	sudo chmod u+s $@
diff --git a/metric_providers/memory/used/cgroup/container/Makefile b/metric_providers/memory/used/cgroup/container/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -o3 -Wall
+CFLAGS = -o3 -Wall -I../../../../../lib/c
 
 metric-provider-binary: source.c
-	gcc $< $(CFLAGS) -o $@
+	gcc ../../../../../lib/c/parse_int.o $< $(CFLAGS) -o $@