Changeset 608 for trunk/user

Timestamp:

Dec 3, 2018, 12:24:13 PM (6 years ago)

Author:

alain

Message:

Introduce cat, rm, cp commands in ksh.

File:

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

trunk/user/ksh/ksh.c

@@ -56 +56 @@
 #define MAIN_DEBUG          0
 #define CMD_LOAD_DEBUG      0
-#define CMD_CAT_DEBUG       1
+#define CMD_CAT_DEBUG       0
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -226 +226 @@
         int    size;          // source file size
         int    bytes;         // number of transfered bytes
-        char   buf[1024];
+        char   buf[4096];
         stat_t st;
 
@@ -293 +293 @@
         while (bytes < size)
         {
-                int rlen = ((size - bytes) < 1024) ? (size - bytes) : 1024;
-                int wlen;
-                int ret;
+                int len = ((size - bytes) < 4096) ? (size - bytes) : 4096;
 
                 // read the source 
-                ret = read( src_fd , buf , rlen );
-                if (ret == -1) 
+                if ( read( src_fd , buf , len ) != len )
         {
                         printf("  error: cannot read from file %s\n", srcpath);
@@ -305 +302 @@
                 }
 
-                rlen = (int)ret;
-
                 // write to the destination 
-                ret = write( dst_fd , buf , rlen );
-                if (ret == -1)
+                if ( write( dst_fd , buf , len ) != len )
         {
                         printf("  error: cannot write to file %s\n", dstpath);
@@ -315 +309 @@
                 }
 
-                wlen = (int)ret;
-
-                // check 
-                if (wlen != rlen) 
-        {
-                        printf("  error: cannot write on device\n");
-                        goto exit;
-                }
-
-                bytes += rlen;
+                bytes += len;
         }
 
@@ -848 +833 @@
             pathname = argv[1];
 
-        printf("  error: not implemented yet\n");
+        if ( unlink( pathname ) )
+        {
+                    printf("  error: unable to remove %s\n", pathname );
+            }
     }