Procházet zdrojové kódy

file: Output directory when path is a directory

Before file would output 'text/html' when the path was a directory.
Arjan Zuidema před 4 roky
rodič
revize
c7bc1f59d8
1 změnil soubory, kde provedl 11 přidání a 6 odebrání
  1. 11 6
      Userland/Utilities/file.cpp

+ 11 - 6
Userland/Utilities/file.cpp

@@ -120,12 +120,17 @@ int main(int argc, char** argv)
             all_ok = false;
             continue;
         }
-        // Read accounts for longest possible offset + signature we currently match against.
-        auto bytes = file->read(0x9006);
-        auto file_name_guess = Core::guess_mime_type_based_on_filename(path);
-        auto mime_type = Core::guess_mime_type_based_on_sniffed_bytes(bytes.bytes()).value_or(file_name_guess);
-        auto human_readable_description = get_description_from_mime_type(mime_type, String(path)).value_or(mime_type);
-        outln("{}: {}", path, flag_mime_only ? mime_type : human_readable_description);
+
+        if (file->is_directory()) {
+            outln("{}: directory", path);
+        } else {
+            // Read accounts for longest possible offset + signature we currently match against.
+            auto bytes = file->read(0x9006);
+            auto file_name_guess = Core::guess_mime_type_based_on_filename(path);
+            auto mime_type = Core::guess_mime_type_based_on_sniffed_bytes(bytes.bytes()).value_or(file_name_guess);
+            auto human_readable_description = get_description_from_mime_type(mime_type, String(path)).value_or(mime_type);
+            outln("{}: {}", path, flag_mime_only ? mime_type : human_readable_description);
+        }
     }
 
     return all_ok ? 0 : 1;