Changeset 610 for trunk/user

Timestamp:

Dec 27, 2018, 7:38:58 PM (6 years ago)

Author:

alain

Message:

Fix several bugs in VFS to support the following
ksh commandis : cp, mv, rm, mkdir, cd, pwd

File:

• trunk/user/ksh/ksh.c (modified) (12 diffs)

trunk/user/ksh/ksh.c

@@ -55 +55 @@
 
 #define MAIN_DEBUG          0
+
+#define CMD_CAT_DEBUG       0
+#define CMD_CP_DEBUG        0
 #define CMD_LOAD_DEBUG      0
-#define CMD_CAT_DEBUG       0
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -209 +211 @@
             path = argv[1];
 
-        printf("  error: not implemented yet\n" );
+        // call the relevant syscall
+        if( chdir( path ) )
+        {
+            printf("  error: cannot found <%s> directory\n", path );
+        }
     }
 
@@ -250 +256 @@
     }
 
+#if CMD_CP_DEBUG
+long long unsigned cycle;
+get_cycle( &cycle );
+printf("\n[%s] open file <%s> done / cycle %d\n",
+__FUNCTION__ , srcpath , (int)cycle );
+#endif
+
     // get file stats
     if ( stat( srcpath , &st ) )
@@ -258 +271 @@
     }
 
+#if CMD_CP_DEBUG
+get_cycle( &cycle );
+printf("\n[%s] stats file <%s> done / cycle %d\n",
+__FUNCTION__ , srcpath , (int)cycle );
+#endif
+
         if ( S_ISDIR(st.st_mode) )
     {
@@ -277 +296 @@
         }
 
+#if CMD_CP_DEBUG
+get_cycle( &cycle );
+printf("\n[%s] open file <%s> done / cycle %d\n",
+__FUNCTION__ , dstpath , (int)cycle );
+#endif
+
         if ( stat( dstpath , &st ) )
     {
@@ -282 +307 @@
                 goto exit;
         }
+
+#if CMD_CP_DEBUG
+get_cycle( &cycle );
+printf("\n[%s] stats file <%s> done / cycle %d\n",
+__FUNCTION__ , dstpath , (int)cycle );
+#endif
 
         if ( S_ISDIR(st.st_mode ) ) 
@@ -302 +333 @@
                 }
 
+#if CMD_CP_DEBUG
+get_cycle( &cycle );
+printf("\n[%s] %d bytes read from <%s> / cycle %d\n",
+__FUNCTION__ , len, srcpath , (int)cycle );
+#endif
+
                 // write to the destination 
                 if ( write( dst_fd , buf , len ) != len )
@@ -308 +345 @@
                         goto exit;
                 }
+
+#if CMD_CP_DEBUG
+get_cycle( &cycle );
+printf("\n[%s] %d bytes writen to <%s> / cycle %d\n",
+__FUNCTION__ , len, dstpath , (int)cycle );
+#endif
 
                 bytes += len;
@@ -733 +776 @@
         pathname = argv[1];
 
-        printf("  error: not implemented yet\n");
+        mkdir( pathname , 0x777 );
     }
 
@@ -744 +787 @@
 static void cmd_mv( int argc , char **argv )
 {
-
-        if (argc < 3)
-        {
-                printf("  usage : mv src_pathname dst_pathname\n");
+        char * old_path;
+    char * new_path;
+
+        if (argc != 3) 
+    {
+                printf("  usage: mv old_pathname new_pathname\n");
         }
     else
     {
-        printf("  error: not implemented yet\n");
-    }
-    
+        old_path = argv[1];
+        new_path = argv[2];
+
+        // call the relevant syscall
+        if( rename( old_path , new_path ) )
+        {
+            printf("  error: unable to rename <%s> to <%s>\n", old_path, new_path );
+        }
+    }
+
     // release semaphore to get next command
     sem_post( &semaphore );
@@ -996 +1048 @@
 
 
-/* To lauch one application without interactive mode
+// To lauch one command without interactive mode 
    
 if( sem_wait( &semaphore ) )
@@ -1005 +1057 @@
 else
 {
-    printf("\n[ksh] for fft\n");
+    printf("\n[ksh] cp /home/Makefile /home/bloup\n");
 }
 
-strcpy( buf , "load /bin/user/fft.elf" );
+strcpy( buf , "cp /home/Makefile /home/bloup" );
 parse( buf );
 
-*/
+//
 
         enum fsm_states