singleshot
/
struct-lab-03
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add cd command

master
germanFid 2022-06-22 20:42:06 +03:00
parent 5eb11a83d4
commit 570cf96e60
2 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
handler.h
View File

@ -56,7 +56,7 @@ int checkMinorArgumentValid(char* command, char* argument)
return FAILURE;
}
int checkMajorArgumenntValid(char* argument, Folder* RootFolder, Folder* CurrentFolder, Folder** ResultFolder, File** ResultFile)
int checkMajorArgumentValid(char* argument, Folder* RootFolder, Folder* CurrentFolder, Folder** ResultFolder, File** ResultFile)
{
Folder* ptr;
char* path = (char*) malloc(MAX_COMMAND_LEN);
@ -196,7 +196,7 @@ int checkArgumentValid(char* command, char* argument, Folder* RootFolder, Folder
else
{
// Обрабатываем объект
iResult = checkMajorArgumenntValid(argument, RootFolder, CurrentFolder, _ResultFolder, _ResultFile);
iResult = checkMajorArgumentValid(argument, RootFolder, CurrentFolder, &_ResultFolder, &_ResultFile);
if (iResult == WRONG_ARGUMENT_FAILURE)
{
return WRONG_ARGUMENT_FAILURE;
@ -204,22 +204,40 @@ int checkArgumentValid(char* command, char* argument, Folder* RootFolder, Folder
if (iResult == OBJECT_FILE)
{
resultFile = _ResultFile;
printf("- resultFile: %d %d", resultFile, _ResultFile); // TODO: Delete debug
*resultFile = _ResultFile;
}
if (iResult == OBJECT_FOLDER)
{
resultFolder = _ResultFolder;
printf("- resultFolder: %d %d", resultFolder, _ResultFolder); // TODO: Delete debug
*resultFolder = _ResultFolder;
}
}
return SUCCESS;
}
int executeCommand(char* command, char* minorArg, Folder* majorArgFolder, File* majorArgFile, int majorArgIsFolder, Folder* RootFolder, Folder** CurrentFolder)
{
if (!strcmp(command, "cd"))
{
printf("COMMAND: cd\n");
printf("%d", majorArgFile);
if (!majorArgIsFolder)
{
return FAILURE;
}
*CurrentFolder = majorArgFolder;
return SUCCESS;
}
else
{
printf("Unknown command: %s", command);
return FAILURE;
}
}
int commandParserHandler(char* input, Folder* RootFolder, Folder* CurrentFolder)
int commandParserHandler(char* input, Folder* RootFolder, Folder** CurrentFolder)
{
int result = SUCCESS; // Если что-то пойдет не так, то он изменится
@ -257,7 +275,7 @@ int commandParserHandler(char* input, Folder* RootFolder, Folder* CurrentFolder)
case 1:
// аргумент 1
if (checkArgumentValid(command, istr, RootFolder, CurrentFolder, ResultFolder, ResultFile))
if (checkArgumentValid(command, istr, RootFolder, *CurrentFolder, &ResultFolder, &ResultFile))
{
result = WRONG_OPTION;
goto cleanup;
@ -277,7 +295,7 @@ int commandParserHandler(char* input, Folder* RootFolder, Folder* CurrentFolder)
goto cleanup;
}
if (checkArgumentValid(command, istr, RootFolder, CurrentFolder, ResultFolder, ResultFile))
if (checkArgumentValid(command, istr, RootFolder, *CurrentFolder, &ResultFolder, &ResultFile))
{
result = WRONG_OPTION;
goto cleanup;
@ -295,6 +313,8 @@ int commandParserHandler(char* input, Folder* RootFolder, Folder* CurrentFolder)
}
printf("%s, %s, %s", command, arg1, arg2);
result = executeCommand(command, arg1, ResultFolder, ResultFile, ResultFolder != NULL, RootFolder, CurrentFolder);
// printf("- exec: %d", r);
cleanup: free(str);
free(command);

56
main.c
View File

@ -20,39 +20,39 @@ int main(int argc, char** argv)
addFolder("test11", &RootFolder.folders[0]);
Folder* ResultFolder = NULL;
File* ResultFile = NULL;
// Folder* ResultFolder = NULL;
// File* ResultFile = NULL;
printf("!!! %d\n", &RootFolder.folders[0]);
// printf("!!! %d\n", &RootFolder.folders[0]);
// iResult = checkArgumentValid("ls", "/test1/", &RootFolder, CurrentFolder, ResultFolder, ResultFile);
iResult = checkMajorArgumenntValid("/", &RootFolder, CurrentFolder, &ResultFolder, &ResultFile);
printf("%d\n", iResult);
// iResult = checkArgumentValid("ls", "/test1/", &RootFolder, CurrentFolder, &ResultFolder, &ResultFile);
// // iResult = checkMajorArgumenntValid("/", &RootFolder, CurrentFolder, &ResultFolder, &ResultFile);
// printf("%d\n", iResult);
if (ResultFolder != NULL)
{
printf("%s\n", ResultFolder->filename);
print_list(ResultFolder, 0);
}
else
printf("ResultFolder is NULL\n");
// char* buf;
// while (1)
// if (ResultFolder != NULL)
// {
// printf("> ");
// buf = commandCallHandler();
// if (buf == NULL)
// {
// printf("Input too long!\n");
// }
// iResult = commandParserHandler(buf, &RootFolder, CurrentFolder);
// printf("result: %d\n", iResult);
// printf("%s\n", ResultFolder->filename);
// print_list(ResultFolder, 0);
// }
// else
// printf("ResultFolder is NULL\n");
char* buf;
while (1)
{
printf("%s > ", CurrentFolder->filename);
buf = commandCallHandler();
if (buf == NULL)
{
printf("Input too long!\n");
}
iResult = commandParserHandler(buf, &RootFolder, &CurrentFolder);
printf("result: %d\n", iResult);
}
return 0;
}