Skip to content

Commit

Permalink
Update Task Files, task_2
Browse files Browse the repository at this point in the history
  • Loading branch information
Rahma-cloud committed May 16, 2023
1 parent ec0f459 commit 760a5fe
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions exe_args.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

/**
* exe_args - argument execution function
* @cmd: command name
* @exe: executable file name
* @arg_vector: custom argument vector
* @arg_count: custom argument count
* @line_buffer: line_buffer parameter to be freed on failure
* @line_buffer_cpy: line_buffer_cpy parameter to be freed on failure
* Return: Success (0)
*/

int exe_args(char *cmd, char **arg_vector, int arg_count,
int exe_args(char *exe, char **arg_vector, int arg_count,
char *line_buffer, char *line_buffer_cpy)
{
int arg_exe;
Expand All @@ -28,7 +28,7 @@ int exe_args(char *cmd, char **arg_vector, int arg_count,
process_id = fork();
if (process_id == -1)
{
perror(cmd);
perror(exe);
free(line_buffer);
free(line_buffer_cpy);
free(arg_vector);
Expand All @@ -39,7 +39,7 @@ int exe_args(char *cmd, char **arg_vector, int arg_count,
arg_exe = execve(arg_vector[0], arg_vector, NULL);
if (arg_exe == -1)
{
perror(cmd);
perror(exe);
free(line_buffer);
free(line_buffer_cpy);
free(arg_vector);
Expand Down
12 changes: 4 additions & 8 deletions get_args.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

/**
* get_args - Get Arguments
* @cmd: command name
* @exe: executable file name
* Return: On Success (0)
*/

int get_args(char *cmd)
int get_args(char *exe)
{
int arg_count = 0;
char **arg_vector = NULL;
Expand All @@ -30,14 +30,10 @@ int get_args(char *cmd)
}
else
{
/* getline() succeded */
cpy_args(line_buffer, &line_buffer_cpy);
tok_args(line_buffer, line_buffer_cpy, &arg_count, &arg_vector);

/* getline() succeded */
if (arg_count > 1)
dprintf(2, "%s: No such file or directory\n", cmd);
else
exe_args(cmd, arg_vector, arg_count, line_buffer, line_buffer_cpy);
exe_args(exe, arg_vector, arg_count, line_buffer, line_buffer_cpy);
}
free(line_buffer_cpy);
free(arg_vector);
Expand Down
9 changes: 6 additions & 3 deletions main.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,20 @@

int main(int ac, char **av)
{
char *cmd = av[0];
/* store the exe filename */
char *exe = av[0];

/* command line args */
if (ac > 1)
{
av = av + 1;
ac = ac - 1;
exe_args(cmd, av, ac, NULL, NULL);
exe_args(exe, av, ac, NULL, NULL);
}
else
{
get_args(cmd);
/* input not from command line */
get_args(exe);
}
return (0);
}
3 changes: 2 additions & 1 deletion main.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@

/* Prototypes */
int get_args(char *cmd);
int exe_args(char *cmd, char **arg_vector, int arg_count, char *line_buffer, char *line_buffer_cpy);
int exe_args(char *cmd, char **arg_vector, int arg_count,
char *line_buffer, char *line_buffer_cpy);
int cpy_args(char *line_buffer, char **line_buffer_cpy);
int tok_args(char *line_buffer, char *line_buffer_cpy,
int *arg_count, char ***arg_vector);
Expand Down
Binary file modified ralesh
Binary file not shown.

0 comments on commit 760a5fe

Please sign in to comment.