Guams/zzsh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(fix): fix de la commande cd

Browse Source
This commit is contained in:
guamss 2023-06-28 15:04:11 +02:00
parent e1b7a5d702
commit 04d14ffa7b
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/exec/exec.c
View File

@ -1,3 +1,5 @@
#include <limits.h>
#include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "../cmd/cmd.h" #include "../cmd/cmd.h"
@ -25,10 +27,9 @@ int builtin_execute(cmd** input, char** env)
{ {
for(int i=0; input[i]!=NULL; i++) for(int i=0; input[i]!=NULL; i++)
{ {
switch(input[i]->executable) if (strcmp(input[i]->executable, "cd") == 0)
{ {
case "cd": change_directory(input[i]->args);
change_directory(input[i]->args);
} }
} }
} }
@ -37,20 +38,26 @@ int change_directory(char** args)
{ {
if(len(args)!=2) if(len(args)!=2)
{ {
printf("Mauvais arguments"); printf("Mauvais arguments\n");
return 1; return 1;
} }
if(chdir(path[1])!=0) if(chdir(args[1])!=0)
{ {
printf("Mauvais chemin : %s", path); printf("Mauvais chemin : %s\n", args[1]);
return 1; return 1;
} }
char cwd[PATH_MAX];
if (getcwd(cwd, sizeof(cwd)) != NULL)
{
printf("Current working dir: %s\n", cwd);
}
return 0; return 0;
} }
int len(char** list) int len(char** list)
{ {
for (int index=0; index!=NULL; index++); int index;
for (index = 0; list[index]!=NULL; index++);
return index; return index;
} }
@ -59,15 +66,15 @@ int main()
cmd** tests; cmd** tests;
tests = malloc(2*sizeof(cmd*)); tests = malloc(2*sizeof(cmd*));
cmd test; cmd test;
test.executable = "/bin/cat"; test.executable = "cd";
test.args = malloc(3*sizeof(char*)); test.args = malloc(3*sizeof(char*));
test.args[0] = "cat"; test.args[0] = "cd";
test.args[1] = "file"; test.args[1] = "..";
test.args[2] = NULL; test.args[2] = NULL;
test.fd_in = 0; test.fd_in = 0;
test.fd_out = 1; test.fd_out = 1;
tests[0] = &test; tests[0] = &test;
tests[1] = NULL; tests[1] = NULL;
execute(tests, NULL); builtin_execute(tests, NULL);
return 0; return 0;
} }