Changeset 660

Timestamp:

Jul 24, 2015, 3:10:49 PM (9 years ago)

Author:

guerin

Message:

shell: use readdir for ls

File:

• soft/giet_vm/applications/shell/main.c (modified) (2 diffs)

soft/giet_vm/applications/shell/main.c

@@ -48 +48 @@
 static void cmd_ls(int argc, char** argv)
 {
-    if (argc < 2)
-    {
-        giet_tty_printf("%s <path>\n", argv[0]);
-        return;
-    }
-
-    giet_fat_list(argv[1]);
+    int fd;
+    fat_dirent_t entry;
+
+    if (argc < 2)
+        fd = giet_fat_opendir("/");
+    else
+        fd = giet_fat_opendir(argv[1]);
+
+    if (fd < 0)
+    {
+        giet_tty_printf("can't list directory (err=%d)\n", fd);
+        return;
+    }
+
+    while (giet_fat_readdir(fd, &entry) == 0)
+    {
+        if (entry.is_dir)
+            giet_tty_printf("dir ");
+        else
+            giet_tty_printf("file");
+
+        giet_tty_printf(" | size = %d \t| cluster = %X \t| %s\n",
+                        entry.size, entry.cluster, entry.name );
+    }
+
+    giet_fat_closedir(fd);
 }
 
@@ -85 +104 @@
     int src_fd = -1;
     int dst_fd = -1;
-    struct fat_file_info_s info;
+    fat_file_info_t info;
     int size;
     int i;