diff options
| author | Dominik Kaiser | 2024-05-07 15:30:14 +0200 |
|---|---|---|
| committer | Dominik Kaiser | 2024-05-07 15:30:14 +0200 |
| commit | ff846486ce845beab8b0fe31c227b5c5ad620bb9 (patch) | |
| tree | 7baf5d54899e6da59b87c9a9cf1d394863b04e20 | |
| parent | 7af46f10e23296baa72b70e5fbc72eb35e2a9b01 (diff) | |
| download | pipex-ff846486ce845beab8b0fe31c227b5c5ad620bb9.tar.gz pipex-ff846486ce845beab8b0fe31c227b5c5ad620bb9.zip | |
Still restoring
| -rw-r--r-- | include/pipex.h | 14 | ||||
| -rw-r--r-- | src/input_handling.c | 5 |
2 files changed, 16 insertions, 3 deletions
diff --git a/include/pipex.h b/include/pipex.h index 1a79cf1..8f24cc0 100644 --- a/include/pipex.h +++ b/include/pipex.h @@ -6,7 +6,7 @@ /* By: dkaiser <dkaiser@student.42heilbronn.de +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/29 14:04:28 by dkaiser #+# #+# */ -/* Updated: 2024/04/29 16:38:38 by dkaiser ### ########.fr */ +/* Updated: 2024/05/07 15:29:47 by dkaiser ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,4 +16,16 @@ # include "../libft/libft.h" # include <unistd.h> +typedef struct s_pxdata +{ + int in_fd; + int out_fd; + char **cmds; +} t_pxdata; + +char **get_split_path(char *envp[]); +char *get_pwd(char *envp[]); +char *find_in_path(char *cmd, char **path); +char *get_cmd_path(char *cmd, char **path, char *pwd); +t_pxdata *get_pxdata(int argc, char *argv[], char *envp[]); #endif // PIPEX_H diff --git a/src/input_handling.c b/src/input_handling.c index e4bf7d6..ef4cec8 100644 --- a/src/input_handling.c +++ b/src/input_handling.c @@ -6,7 +6,7 @@ /* By: dkaiser <dkaiser@student.42heilbronn.de +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/02 12:13:23 by dkaiser #+# #+# */ -/* Updated: 2024/05/07 15:17:19 by dkaiser ### ########.fr */ +/* Updated: 2024/05/07 15:26:08 by dkaiser ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,7 @@ #include "pipex.h" #include <fcntl.h> #include <stdlib.h> +#include <sys/_types/_s_ifmt.h> #include <unistd.h> static char **get_cmds(int argc, char *argv[], char *envp[]) @@ -50,7 +51,7 @@ t_pxdata *get_pxdata(int argc, char *argv[], char *envp[]) if (!result) return (NULL); // TODO: Check if an error message needs to be sent result->in_fd = open(argv[1], O_RDONLY); - result->out_fd = open(argv[--argc], O_WRONLY | O_CREAT | O_TRUNC); + result->out_fd = open(argv[--argc], O_WRONLY | O_CREAT | O_TRUNC, S_IREAD | S_IWUSR); result->cmds = get_cmds(argc, argv, envp); return (result); } |