Ls: Support multiple files

1 files changed, 27 insertions, 11 deletions

diff --git a/Userland/ls.cpp b/Userland/ls.cpp
index 05d59c2e9e..02a538b0bc 100644
--- a/Userland/ls.cpp
+++ b/Userland/ls.cpp
@@ -38,21 +38,37 @@ int main(int argc, char** argv)
             flag_show_inode = true;
             break;
         default:
-            fprintf(stderr, "usage: ls [-%s] [path]\n", valid_option_characters);
+            fprintf(stderr, "usage: ls [-%s] [paths...]\n", valid_option_characters);
             return 1;
         }
     }
 
-    const char* path;
-
-    if (optind >= argc)
-        path = ".";
-    else
-        path = argv[optind];
-
-    if (flag_long)
-        return do_dir(path);
-    return do_dir_short(path);
+    int status;
+    if (optind >= argc) {
+      if (flag_long) {
+          status = do_dir(".");
+      } else {
+          status = do_dir_short(".");
+      }
+      return status;
+    } else {
+        bool show_names = !(optind+1 >= argc);
+
+        for (; optind < argc; optind++) {
+          if (show_names) {
+            printf("%s:\n", argv[optind]);
+          }
+          if (flag_long) {
+              status = do_dir(argv[optind]);
+          } else {
+              status = do_dir_short(argv[optind]);
+          }
+          if (status != 0) {
+            return status;
+          }
+        }
+    }
+    return 0;
 }
 
 void get_geometry(int& rows, int& columns)