- changed make

- malloc with error function

1 files changed, 12 insertions, 10 deletions

diff --git a/src/helper_functions.c b/src/helper_functions.c
index 5c81f15..c1931fd 100644
--- a/src/helper_functions.c
+++ b/src/helper_functions.c
@@ -1,11 +1,21 @@
 #ifndef shell_helper_functions
 #define shell_helper_functions
 
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+void *malloce(size_t size){
+    void* mal=malloc(size);
+    if(!mal){
+        fprintf(stderr, "lsh: allocation error\n");
+        exit(EXIT_FAILURE);
+    }
+    return mal;
+}
+
 // You must free the result if result is non-NULL.
 char *str_replace(char *orig, char *rep, char *with) {
     char *result; // the return string
@@ -59,11 +69,7 @@ char *basename(char *path_in)
     char *lastToken = NULL;
     char *basePath;
 
-    basePath = (char *)malloc(sizeof(char) * (strlen(path_in) + 1));
-    if (!basePath) {
-        fprintf(stderr, "lsh: allocatin error\n");
-        exit(EXIT_FAILURE);
-    }
+    basePath = (char *)malloce(sizeof(char) * (strlen(path_in) + 1));
     strcpy(basePath, path_in);
 
     token = strtok(basePath, "/");
@@ -77,11 +83,7 @@ char *basename(char *path_in)
         return NULL;
     }
 
-    char *ret_str = (char*)malloc(sizeof(char)*strlen(lastToken)+1);
-    if (!ret_str) {
-        fprintf(stderr, "lsh: allocation error\n");
-        exit(EXIT_FAILURE);
-    }
+    char *ret_str = (char*)malloce(sizeof(char)*strlen(lastToken)+1);
     strcpy(ret_str,lastToken);
     free(basePath);
     return ret_str;