Revert "Create DOS device only when needed"

This reverts commit c774a50.

Author: phst

elisp/private/tools/emacs.cc

@@ -54,25 +54,16 @@ static absl::StatusOr<int> RunEmacs(
   if (kWindows && release) {
     const absl::StatusOr<FileName> root = runfiles->Resolve(install);
     if (!root.ok()) return root.status();
-    // The longest filename in the Emacs release archive has 140 characters.
-    // Round up to 150 for some buffer and the directory separator.
-    constexpr std::size_t kMaxEntry = 150;
-    const std::size_t max_filename = MaxFilename();
-    CHECK_GT(max_filename, kMaxEntry);
-    const std::size_t max_root = max_filename - kMaxEntry;
-    if (root->string().length() > max_root) {
-      // The filenames in the released Emacs archive are too long.  Create a
-      // drive letter to shorten them.
-      absl::StatusOr<DosDevice> device = DosDevice::Create(*root);
-      if (!device.ok()) return device.status();
-      absl::StatusOr<FileName> program = FileName::FromString(
-          device->name() + RULES_ELISP_NATIVE_LITERAL("\\bin\\emacs.exe"));
-      if (!program.ok()) return program.status();
-      emacs = *std::move(program);
-      dos_device = *std::move(device);
-    }
-  }
-  if (!dos_device.has_value()) {
+    // The filenames in the released Emacs archive are too long.  Create a
+    // drive letter to shorten them.
+    absl::StatusOr<DosDevice> device = DosDevice::Create(*root);
+    if (!device.ok()) return device.status();
+    absl::StatusOr<FileName> program = FileName::FromString(
+        device->name() + RULES_ELISP_NATIVE_LITERAL("\\bin\\emacs.exe"));
+    if (!program.ok()) return program.status();
+    emacs = *std::move(program);
+    dos_device = *std::move(device);
+  } else {
     absl::StatusOr<FileName> binary = runfiles->Resolve(
         absl::StrCat(install, release ? "/bin/emacs.exe" : "/emacs.exe"));
     if (!binary.ok()) return binary.status();

elisp/private/tools/system.cc

@@ -186,16 +186,6 @@ absl::StatusOr<FileName> FileName::Join(const NativeStringView descendant) const
   return this->Join(*name);
 }
 
-static constexpr std::size_t kMaxFilename{
-#ifdef _WIN32
-    MAX_PATH
-#else
-    PATH_MAX
-#endif
-};
-
-std::size_t MaxFilename() { return kMaxFilename; }
-
 absl::Status MakeErrorStatus(const std::error_code& code,
                              const std::string_view function,
                              const std::string_view args) {

elisp/private/tools/system.h

@@ -132,8 +132,6 @@ class FileName final {
   NativeString string_;
 };
 
-std::size_t MaxFilename();
-
 absl::Status MakeErrorStatus(const std::error_code& code,
                              std::string_view function, std::string_view args);