Merge branch 'main' of https://github.com/EyobABN/simple_shell into main

EyobABN · EyobABN · commit 30d0d54b329c · 2022-05-19T12:24:35.000+03:00
Merging main with backup branches
diff --git a/cdHandler.c b/cdHandler.c
@@ -37,6 +37,8 @@ void updateEnv(char *key, char __attribute__((unused))**cmds, int *lst_ret)
  */
 void cdHandler(char **av, char __attribute__((unused))**cmds, int *lst_ret)
 {
+	int status;
+
 	if (*lst_ret != 0)
 	{
 		return;
@@ -48,13 +50,17 @@ void cdHandler(char **av, char __attribute__((unused))**cmds, int *lst_ret)
 		{
 			updateEnv("PWD", cmds, lst_ret);
 			free_entire_arr(av);
+			status = 0;
+			*lst_ret = status;
 			return;
 		}
 	}
 	if (chdir(av[1]) == 0)
 	{
 		updateEnv("PWD", cmds, lst_ret);
 		free_entire_arr(av);
+		status = 0;
+		*lst_ret = status;
 		return;
 	}
 	else
diff --git a/setenvHandler.c b/setenvHandler.c
@@ -88,7 +88,9 @@ void setenvHandler(char **av, char __attribute__((unused))**cmds, int *lst_ret)
 			environ[i] = new; /* needs to be free'd */
 			break;
 		}
+		free(token);
 	}
+	free(token);
 	if (found == 0)
 		create_var(av, new);
 	free_entire_arr(av);

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ void updateEnv(char key, char __attribute__((unused))cmds, int lst_ret)`
`37`	`37`	`*/`
`38`	`38`	`void cdHandler(char av, char __attribute__((unused))cmds, int *lst_ret)`
`39`	`39`	`{`
	`40`	`+ int status;`
	`41`	`+`
`40`	`42`	`if (*lst_ret != 0)`
`41`	`43`	`{`
`42`	`44`	`return;`
`@@ -48,13 +50,17 @@ void cdHandler(char av, char __attribute__((unused))cmds, int *lst_ret)`
`48`	`50`	`{`
`49`	`51`	`updateEnv("PWD", cmds, lst_ret);`
`50`	`52`	`free_entire_arr(av);`
	`53`	`+ status = 0;`
	`54`	`+ *lst_ret = status;`
`51`	`55`	`return;`
`52`	`56`	`}`
`53`	`57`	`}`
`54`	`58`	`if (chdir(av[1]) == 0)`
`55`	`59`	`{`
`56`	`60`	`updateEnv("PWD", cmds, lst_ret);`
`57`	`61`	`free_entire_arr(av);`
	`62`	`+ status = 0;`
	`63`	`+ *lst_ret = status;`
`58`	`64`	`return;`
`59`	`65`	`}`
`60`	`66`	`else`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,9 @@ void setenvHandler(char av, char __attribute__((unused))cmds, int *lst_ret)`
`88`	`88`	`environ[i] = new; /* needs to be free'd */`
`89`	`89`	`break;`
`90`	`90`	`}`
	`91`	`+ free(token);`
`91`	`92`	`}`
	`93`	`+ free(token);`
`92`	`94`	`if (found == 0)`
`93`	`95`	`create_var(av, new);`
`94`	`96`	`free_entire_arr(av);`