diff --git a/include/command.h b/include/command.h index 58fc5d9..6cf2c91 100644 --- a/include/command.h +++ b/include/command.h @@ -1,24 +1,26 @@ #ifndef COMMAND_H #define COMMAND_H -#include "include/osproject.h" +#include "include/osproject.h" -void command_ls(int argc, char** argv); -void command_mkdir(int argc, char** argv); +void command_ls(DTree* tree, int argc, char** argv); +void command_mkdir(DTree* tree, int argc, char** argv); void command_cat(DTree* tree, const char* filename); void command_alias(AliasTable* table, int argc, char** argv); -void command_rm(int argc, char** argv); -int command_cd (DTree *tree, UList *users, int argc, char **argv); -int command_pwd (DTree *tree, Stack *stack, UList *users); -int command_cp (DTree *tree, int argc, char **argv); +void command_rm(DTree* tree, int argc, char** argv); + +int command_cd(DTree* tree, UList* users, int argc, char** argv); +int command_pwd(DTree* tree, Stack* stack, UList* users); +int command_cp(DTree* tree, int argc, char** argv); + +int cd(DTree* tree, char* command); +int MovePath(DTree* tree, char* path); +int Movecurrent(DTree* tree, char* segment); -int cd (DTree *tree, char *command); -int MovePath (DTree *tree, char *path); -int Movecurrent(DTree *tree, char *segment); +int pwd(DTree* tree, Stack* stack, char* opt); +int PrintPath(DTree* tree, Stack* stack); +int cp(DTree* tree, char* src, char* dst); -int pwd (DTree *tree, Stack *stack, char *opt); -int PrintPath (DTree *tree, Stack *stack); -int cp (DTree *tree, char *src, char *dst); +void UpdateUserDir(UList* users, DTree* tree); -void UpdateUserDir(UList *users, DTree *tree); #endif diff --git a/include/ls.h b/include/ls.h index 5ac0b51..af6d12a 100644 --- a/include/ls.h +++ b/include/ls.h @@ -3,6 +3,6 @@ #include "osproject.h" -void command_ls(int argc, char** argv); +void command_ls(DTree* tree, int argc, char** argv); #endif diff --git a/src/ls.c b/src/ls.c index a680da8..b6502d0 100644 --- a/src/ls.c +++ b/src/ls.c @@ -2,8 +2,6 @@ #include #include "../include/ls.h" -extern DTree* tree;//전체트리 - void print_permissions(int permission[9]) { const char* rwx = "rwx"; for (int i = 0; i < 9; i++) { @@ -11,9 +9,24 @@ void print_permissions(int permission[9]) { } } -void command_ls(int argc, char** argv) {//차별점 함수를 ls,ls-a,ls-al로 따로 구현하지 않고 - int show_all = 0, long_format = 0;//한번에 구현 + 순서가 ls-la여도 가능 +void print_long_format(TNode* node) { + printf("%c", node->type); + print_permissions(node->permission); + printf(" %d %d %5d %02d-%02d %02d:%02d %s\n", + node->UID, node->GID, node->SIZE, + node->month, node->day, node->hour, node->minute, + node->name); +} + +void print_short_format(TNode* node) { + if (strlen(node->name) < 8) + printf("%s\t\t", node->name); + else + printf("%s\t", node->name); +} +void command_ls(DTree* tree, int argc, char** argv) { + int show_all = 0, long_format = 0; for (int i = 1; i < argc; i++) { if (strcmp(argv[i], "-a") == 0) show_all = 1; else if (strcmp(argv[i], "-l") == 0) long_format = 1; @@ -21,27 +34,41 @@ void command_ls(int argc, char** argv) {// show_all = long_format = 1; } + int count = 0; + + if (show_all) { + // "." 출력 + TNode* current = tree->current; + if (long_format) print_long_format(current); + else print_short_format(current); + count++; + + // ".." 출력 + TNode* parent = current->Parent; + if (parent) { + if (long_format) print_long_format(parent); + else print_short_format(parent); + count++; + } + + if (!long_format && count % 5 == 0) printf("\n"); + } + TNode* node = tree->current->left; - while (node != NULL) { + while (node) { if (!show_all && node->name[0] == '.') { node = node->right; continue; } - if (long_format) { - printf("%c", node->type); - print_permissions(node->permission); - printf(" %d %d %5d %02d-%02d %02d:%02d %s\n", - node->UID, node->GID, node->SIZE, - node->month, node->day, node->hour, node->minute, - node->name); - } + if (long_format) print_long_format(node); else { - printf("%s ", node->name); + print_short_format(node); + if (++count % 5 == 0) printf("\n"); } node = node->right; } - if (!long_format) printf("\n"); + if (!long_format && count % 5 != 0) printf("\n"); } diff --git a/src/rm.c b/src/rm.c index 0d90135..7c90df5 100644 --- a/src/rm.c +++ b/src/rm.c @@ -4,46 +4,79 @@ #include "../include/osproject.h" #include "../include/command.h" -extern DTree* tree; +void delete_node(DTree* dTree, const char* path, int recursive, int force, int verbose) { + TNode* currentN = dTree->current; + TNode* target = NULL; + TNode* tmpDir = NULL; + char tmp[MAXDIRECTORY]; + char tmp2[MAXDIRECTORY]; + char tmp3[MAXDIRECTORY]; + char* str; + int val; -void delete_node(TNode* parent, const char* name, int recursive, int force, int verbose) { - TNode* prev = NULL; - TNode* curr = parent->left; + strncpy(tmp, path, MAXDIRECTORY); - while (curr) { - if (strcmp(curr->name, name) == 0) { - if (curr->type == 'd' && !recursive) { - if (!force) - printf("rm: 디렉토리 '%s'를 지우려면 -r 옵션이 필요합니다.\n", name); - return; - } + // 경로가 포함된 경우 + if (strchr(path, '/')) { + strncpy(tmp2, getDir(path), MAXDIRECTORY); + val = MovePath(dTree, tmp2); + if (val != 0) { + if (!force) + printf("rm: '%s': 그런 파일이나 디렉터리가 없습니다.\n", tmp2); + return; + } - if (curr->type == 'd' && recursive) { - while (curr->left) - delete_node(curr, curr->left->name, recursive, force, verbose); - } + str = strtok(tmp, "/"); + while (str != NULL) { + strncpy(tmp3, str, MAXNAME); + str = strtok(NULL, "/"); + } + } + else { + strncpy(tmp3, path, MAXNAME); + } - if (verbose) - printf("삭제됨: %s\n", curr->name); + // 디렉터리인지 파일인지 판별 + target = ExistDir(dTree, tmp3, 'd'); + if (target && !recursive) { + if (!force) + printf("rm: 디렉토리 '%s'를 지우려면 -r 옵션이 필요합니다.\n", tmp3); + dTree->current = currentN; + return; + } + if (!target) { + target = ExistDir(dTree, tmp3, 'f'); + } - if (prev) - prev->right = curr->right; - else - parent->left = curr->right; + if (!target) { + if (!force) + printf("rm: '%s': 그런 파일이나 디렉터리가 없습니다.\n", tmp3); + dTree->current = currentN; + return; + } - free(curr); - return; - } + // 권한 확인 + if (!force && (IsPermission(dTree->current, 'w') != 0 || IsPermission(target, 'w') != 0)) { + printf("rm: '%s'을(를) 지울 수 없습니다: Permission denied\n", tmp3); + dTree->current = currentN; + return; + } - prev = curr; - curr = curr->right; + // 재귀 삭제 처리 + if (target->type == 'd' && recursive) { + while (target->left) + delete_node(dTree, target->left->name, recursive, force, verbose); } - if (!force) - printf("rm: '%s': 그런 파일이나 디렉터리가 없습니다.\n", name); + // 실제 삭제 + if (verbose) + printf("삭제됨: %s\n", tmp3); + RemoveDir(dTree, tmp3); + + dTree->current = currentN; // 원위치 복귀 } -void command_rm(int argc, char** argv) { +void command_rm(DTree* tree, int argc, char** argv) { int recursive = 0, force = 0, verbose = 0; int i = 1; @@ -53,13 +86,13 @@ void command_rm(int argc, char** argv) { else if (argv[i][j] == 'f') force = 1; else if (argv[i][j] == 'v') verbose = 1; else { - printf("알 수 없는 옵션: -%c\n", argv[i][j]); + printf("rm: 알 수 없는 옵션 -- '%c'\n", argv[i][j]); return; } } } for (; i < argc; i++) { - delete_node(tree->current, argv[i], recursive, force, verbose); + delete_node(tree, argv[i], recursive, force, verbose); } }