Changeset 775 for soft/giet_vm/applications/shell

Timestamp:

Feb 4, 2016, 5:05:56 PM (9 years ago)

Author:

alain

Message:

Introduce the dump command in shell.

File:

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

soft/giet_vm/applications/shell/shell.c

@@ -44 +44 @@
 static void cmd_time(int argc, char** argv)
 {
-    giet_tty_printf("%d\n", giet_proctime());
+    giet_tty_printf(" cycle = %d\n", giet_proctime());
 }
 
@@ -50 +50 @@
 static void cmd_ls(int argc, char** argv)
 {
-    int fd;
-    fat_dirent_t entry;
-
-    if (argc < 2)
-    {
-        giet_tty_printf("  usage : %s <pathname>\n", argv[0]);
-        return;
-    }
-
-    fd = giet_fat_opendir(argv[1]);
+    int            fd;
+    int            rec;
+    char*          pathname;
+    fat_dirent_t   entry;
+
+    if (argc == 2)
+    {
+        rec = 0;
+        pathname = argv[1];
+    }
+    else if ( (argc == 3) && (strcmp( argv[1] , "-r" ) == 0) )
+    {
+        rec = 1;
+        pathname = argv[2];
+
+        giet_tty_printf("  error : recursive mode not supported yet\n");
+        return;
+    }
+    else
+    {
+        giet_tty_printf("  usage : ls [-r] pathname\n");
+        return;
+    }
+
+    fd  = giet_fat_opendir( pathname );
 
     if (fd < 0)
@@ -84 +99 @@
     if (argc < 2)
     {
-        giet_tty_printf("  usage : %s <path>\n", argv[0]);
+        giet_tty_printf("  usage : mkdir pathname\n");
         return;
     }
@@ -101 +116 @@
     if (argc < 3)
     {
-        giet_tty_printf("  usage : %s <src> <dst>\n", argv[0]);
+        giet_tty_printf("  usage : cp src_pathname dst_pathname>\n");
         return;
     }
@@ -141 +156 @@
     if (info.is_dir)
     {
-        giet_tty_printf("error : %s is a directory\n", argv[2] );  // TODO
+        giet_tty_printf("  error : %s is a directory\n", argv[2] );  // TODO
         goto exit;
     }
@@ -150 +165 @@
         int len = (size - i < 1024 ? size - i : 1024);
         int wlen;
-
-        giet_tty_printf("\rwrite %d/%d (%d%%)", i, size, 100*i/size);
 
         len = giet_fat_read(src_fd, &buf, len);
@@ -162 +175 @@
         i += len;
     }
-    giet_tty_printf("\n");
 
 exit:
@@ -176 +188 @@
     if (argc < 2)
     {
-        giet_tty_printf("  usage : %s <file>\n", argv[0]);
+        giet_tty_printf("  usage : rm pathname\n");
         return;
     }
@@ -193 +205 @@
     if (argc < 2)
     {
-        giet_tty_printf("  usage : %s <pathname>\n", argv[0]);
+        giet_tty_printf("  usage : rmdir pathname\n");
         return;
     }
@@ -209 +221 @@
     if (argc < 3)
     {
-        giet_tty_printf("  usage : %s <src> <dst>\n", argv[0]);
+        giet_tty_printf("  usage : %s src_pathname dst_pathname\n", argv[0]);
         return;
     }
@@ -225 +237 @@
     if (argc < 2)
     {
-        giet_tty_printf("  usage : %s <vspace_name>\n", argv[0]);
+        giet_tty_printf("  usage : %s vspace_name\n", argv[0]);
         return;
     }
@@ -241 +253 @@
     if (argc < 2)
     {
-        giet_tty_printf("  usage : %s <vspace_name>\n", argv[0]);
+        giet_tty_printf("  usage : %s vspace_name\n", argv[0]);
         return;
     }
@@ -274 +286 @@
     if (argc < 3)
     {
-        giet_tty_printf("  usage : %s <vspace_name> <thread_name>\n", argv[0] );
+        giet_tty_printf("  usage : %s vspace_name thread_name\n", argv[0] );
         return;
     }
@@ -286 +298 @@
     if (argc < 3)
     {
-        giet_tty_printf("  usage : %s <vspace_name> <thread_name>\n", argv[0] );
+        giet_tty_printf("  usage : %s vspace_name thread_name\n", argv[0] );
         return;
     }
@@ -298 +310 @@
     if (argc < 3)
     {
-        giet_tty_printf("  usage : %s <vspace_name> <thread_name>\n", argv[0] );
+        giet_tty_printf("  usage : %s vspace_name thread_name\n", argv[0] );
         return;
     }
@@ -308 +320 @@
 static void cmd_cat(int argc, char** argv)
 {
-    if (argc < 2)
-    {
-        giet_tty_printf("  usage : %s <path_name> \n", argv[0] );
+    if (argc != 2)
+    {
+        giet_tty_printf("  usage : cat pathname \n");
         return;
     }
@@ -358 +370 @@
     }
 
-/*
-    // allocate a temporary buffer for the file
-    heap_init( x , y );
-    buf = (char*)malloc( size );  
-    if( buf == NULL )
-    {
-        giet_tty_printf("  error : cannot allocate buffer with size = %d\n", size );
-        goto exit;
-    }
-    // load the file 
-    len = giet_fat_read( fd , buf , size );
-    if ( len != size )
-    {
-        giet_tty_printf("  error : cannot load file %s / size = %d / len = %d\n",
-                        argv[1] , size , len );
-        goto exit;
-    }
-*/
     // set terminating '0' 
     buf[size] = 0;
@@ -387 +381 @@
 }
 
+///////////////////////////////////////////
+static void cmd_dump(int argc, char** argv)
+{
+    if ((argc == 2) && (strcmp( argv[1] , "-bs" ) == 0))
+    {
+        giet_fat_dump( DUMP_BS , NULL , 0 );
+    }
+    else if ((argc == 2) && (strcmp( argv[1] , "-fs" ) == 0))
+    {
+        giet_fat_dump( DUMP_FS , NULL , 0 );
+    }
+    else if ((argc == 3) && (strcmp( argv[1] , "-fat" ) == 0))
+    {
+        giet_fat_dump( DUMP_FAT , NULL , atoi( argv[2] ) );
+    }
+    else if ((argc == 4) && (strcmp( argv[1] , "-file" ) == 0))
+    {
+        giet_fat_dump( DUMP_FILE , argv[2] , atoi( argv[3] ) );
+    }
+    else if ((argc == 4) && (strcmp( argv[1] , "-dir" ) == 0))
+    {
+        giet_fat_dump( DUMP_DIR , argv[2] , atoi( argv[3] ) );
+    }
+    else
+    {
+        giet_tty_printf("  usage : dump [-bs] [-fs] [-fat block] "
+                        "[-file pathname block] [-dir pathname block]\n");
+        return;
+    }
+}
+
+
 ////////////////////////////////////////////////////////////////////
 struct command_t cmd[] =
@@ -393 +419 @@
     { "context",    "display a thread context",             cmd_context },
     { "cp",         "replicate a file in file system",      cmd_cp },
+    { "dump",       "display content of disk sector",       cmd_dump },
     { "exec",       "start an application",                 cmd_exec },
     { "help",       "list available commands",              cmd_help },