FINAL COMMIT

Sister20 · Apr 29, 2023 · 0a9cae3 · 0a9cae3
1 parent 05b4cc3
commit 0a9cae3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/src/user/cp.c b/src/user/cp.c
@@ -341,7 +341,7 @@ void copy(char* args_val, int (*args_info)[2], int args_count) {
         };
         memcpy(&(srcReq.name), srcName, 8);
         memcpy(&(srcReq.ext), srcExt, 3);
-        uint32_t retCode;
+        int retCode;
 
         interrupt(0, (uint32_t) &srcReq, (uint32_t) &retCode, 0x0);
 

diff --git a/src/user/ls.c b/src/user/ls.c
@@ -9,7 +9,12 @@
 void printDirectoryTable() {
     for (int i = 1; i < 63; i++) {
         if (dir_table.table[i].user_attribute == UATTR_NOT_EMPTY) {
-            put(dir_table.table[i].name, BIOS_LIGHT_BLUE);
+            if (dir_table.table[i].name[7] != '\0') {
+                putn(dir_table.table[i].name, BIOS_LIGHT_BLUE, 8);
+            }
+            else {
+                put(dir_table.table[i].name, BIOS_LIGHT_BLUE);
+            }
             if (dir_table.table[i].attribute != ATTR_SUBDIRECTORY && strlen(dir_table.table[i].ext) != 0) {
                 put(".", BIOS_LIGHT_BLUE);
                 putn(dir_table.table[i].ext, BIOS_LIGHT_BLUE, 3);
@@ -18,7 +23,12 @@ void printDirectoryTable() {
         }
     }
     if (dir_table.table[63].user_attribute == UATTR_NOT_EMPTY) {
-        put(dir_table.table[63].name, BIOS_LIGHT_BLUE);
+        if (dir_table.table[63].name[7] != '\0') {
+            putn(dir_table.table[63].name, BIOS_LIGHT_BLUE, 8);
+        }
+        else {
+            put(dir_table.table[63].name, BIOS_LIGHT_BLUE);
+        }
         if (dir_table.table[63].attribute != ATTR_SUBDIRECTORY && strlen(dir_table.table[63].ext) != 0) {
             put(".", BIOS_LIGHT_BLUE);
             putn(dir_table.table[63].ext, BIOS_LIGHT_BLUE, 3);

diff --git a/src/user/mv.c b/src/user/mv.c
@@ -25,7 +25,7 @@ bool remove_mv(char* args_val, int (*args_info)[2], int args_count) {
     bool directoryNotFound = FALSE;
 
     // If path is not absolute, set the currently visited directory to current working directory
-    if (!isPathAbsolute(args_val, args_info, args_count-1)) {
+    if (!isPathAbsolute(args_val, args_info, args_count)) {
         dest_search_directory_number = current_directory;
     }
 
@@ -106,9 +106,9 @@ bool remove_mv(char* args_val, int (*args_info)[2], int args_count) {
                         i++;
                     }
                     if (i < lenName) { // Jika ada extension
-                            if (lenName-i-1 > 3) { // Jika extension lebih dari 3 karakter
-                                break;
-                            }
+                        if (lenName-i-1 > 3) { // Jika extension lebih dari 3 karakter
+                            break;
+                        }
                         memcpy(name, args_val + posName, i);
                         if (*(args_val + posName + i + 1) != 0x0A) {
                             memcpy(extension, args_val + posName + i + 1, lenName-i-1);
@@ -150,9 +150,10 @@ bool remove_mv(char* args_val, int (*args_info)[2], int args_count) {
             .buffer_size = 0
     };
     memcpy(&(destReq.name), name, 8);
-    uint32_t retCode;
+    memcpy(&(destReq.ext), extension, 3);
+    uint32_t retCode = 0;
 
-    if (directoryNotFound) {
+    if (directoryNotFound || fileFound) {
         // Check if it is a file or it doesnt exist
         interrupt(3, (uint32_t) &destReq, (uint32_t) &retCode, 0x0);
         if (retCode != 0) {
@@ -168,7 +169,6 @@ bool remove_mv(char* args_val, int (*args_info)[2], int args_count) {
             }
             return FALSE;
         }
-        return TRUE;
     }
     else {
         // Directory
@@ -190,10 +190,11 @@ bool remove_mv(char* args_val, int (*args_info)[2], int args_count) {
             }
             return FALSE;
         }
-        return TRUE;
     }
+    return TRUE;
 }
 
+
 bool copy_mv(char* args_val, int (*args_info)[2], int args_count) {
     /* Searches if the destination exists and if it is a file or directory.
        Returns 1 if it is a file, 0 if it is a directory, -1 if it is not found */
@@ -527,7 +528,7 @@ bool copy_mv(char* args_val, int (*args_info)[2], int args_count) {
     };
     memcpy(&(srcReq.name), srcName, 8);
     memcpy(&(srcReq.ext), srcExt, 3);
-    uint32_t retCode;
+    int retCode = 0;
 
     interrupt(0, (uint32_t) &srcReq, (uint32_t) &retCode, 0x0);
 

diff --git a/src/user/rm.c b/src/user/rm.c
@@ -146,9 +146,9 @@ void remove(char* args_val, int (*args_info)[2], int args_count) {
     };
     memcpy(&(destReq.name), name, 8);
     memcpy(&(destReq.ext), extension, 3);
-    uint32_t retCode;
+    int retCode = 0;
 
-    if (directoryNotFound) {
+    if (directoryNotFound || fileFound) {
         // Check if it is a file or it doesnt exist
         interrupt(3, (uint32_t) &destReq, (uint32_t) &retCode, 0x0);
         if (retCode != 0) {