Changeset 612 for trunk/user

Timestamp:

Jan 11, 2019, 6:35:07 PM (6 years ago)

Author:

alain

Message:

Fix several bugs in vfs.c, fatfs.c, and devfs.c to support
the <.> and <..> directory entries.

File:

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

trunk/user/ksh/ksh.c

@@ -758 +758 @@
     DIR            * dir;
 
-        if (argc != 2 )
+        if (argc > 2 )
     {
                 printf("  usage: ls [path]\n");
@@ -764 +764 @@
     else
     {
-
-// handle case with no argument
-// TODO if ( argc == 1 ) path = ".";
+        // handle case with no argument
 
         // get target directory path
-        pathname = argv[1];
+        if ( argc == 1 ) strcpy( pathname , "." );
+        else             pathname = argv[1];
 
         // open target directory
@@ -788 +787 @@
         while ( (entry = readdir(dir)) != NULL )
             {
-                    printf(" - %s\n", entry->d_name);
+                    printf("%s\n", entry->d_name);
             }