fixed command not found on empty quotes and echo $ between double quotes

zakissimo · Jan 13, 2023 · d44eca2 · d44eca2
1 parent cadaa19
commit d44eca2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/builtin.c b/builtin.c
@@ -30,7 +30,6 @@ int	builtin(char *cmd)
 		}
 		i++;
 	}
-	printf("jsp: %s\n", cmd_split[0]);
 	free_tab(cmd_split);
 	return (-1);
 }

diff --git a/dollar.c b/dollar.c
@@ -118,7 +118,8 @@ void	find_var(t_token *token, char *input)
 				i++;
 				len++;
 			}
-			if (len == 0 && (input[i] == '\'' || input[i] == '\"'))
+			if (len == 0 && (input[i] == '\'' || input[i] == '\"') \
+				&& i > 1 && input[i - 2] != '\"')
 				token->arg = ft_strdup("-");
 			else
 				token->arg = ft_substr(input, token->str_idx + 1, len);

diff --git a/minishell.c b/minishell.c
@@ -39,7 +39,6 @@ void	events(t_list **head)
 		{
 			scan_heredocs();
 			get_cmd();
-			print_cmds();
 			if (!g_glob->sig_int)
 				pipex();
 			unlink_heredocs();

diff --git a/pipex_children.c b/pipex_children.c
@@ -40,16 +40,13 @@ void	child(t_cmd *cmd, int *pipes, int *children_pid)
 	char	**envp;
 	char	**cmd_split;
 
-	ft_printf("0- cmd: %s\n", cmd->str);
 	if (cmd->fd_in != -1 && cmd->fd_out != -1 \
 		&& cmd->str && cmd->str[0] != '\0')
 	{
 		g_glob->exit_ret = 1;
 		cmd_split = ft_split_quotes(cmd->str, " \t");
 		cmd_split[0] = remove_quotes(cmd_split[0]);
-		ft_printf("1- cmd: %s\n", cmd_split[0]);
 		cmd_split[0] = get_path(cmd_split[0], false);
-		ft_printf("2- cmd: %s\n", cmd_split[0]);
 		exit_on_error(cmd, cmd_split, pipes, children_pid);
 		dup_and_close(cmd, pipes);
 		envp = envp_list_to_tab();
@@ -80,7 +77,7 @@ static char	*get_path_loop(char *cmd, t_list *envp_entry)
 	{	
 		cmd_absolute = ft_strjoin(paths[i], "/");
 		cmd_absolute = ft_strjoinf(cmd_absolute, cmd);
-		if (access(cmd_absolute, 0) == 0)
+		if (access(cmd_absolute, 0) == 0 && !is_dir(cmd_absolute))
 		{
 			free_tab(paths);
 			free(cmd);

diff --git a/utils_pipex.c b/utils_pipex.c
@@ -61,8 +61,17 @@ void	exit_on_permission(char **cmd_split, \
 
 void	print_cmd_not_found(char *str)
 {
-	ft_putstr_fd(str, 2);
+	char	**str_split;
+
+	str_split = ft_split_quotes(str, " \t");
+	if (str_split[0][0] == '\0')
+	{
+		free(str_split[0]);
+		str_split[0] = ft_strdup("\'\'");
+	}
+	ft_putstr_fd(str_split[0], 2);
 	ft_putstr_fd(": command not found\n", 2);
+	free_tab(str_split);
 }
 
 void	close_pipes(int *pipes)
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ int builtin(char *cmd) @@
     		}
     		i++;
     	}
-    	printf("jsp: %s\n", cmd_split[0]);
     	free_tab(cmd_split);
     	return (-1);
     }
@@ Expand Down @@