fixup! src: use basename(argv0) for --trace-uncaught suggestion

src/node_errors.cc

@@ -378,8 +378,10 @@ static void ReportFatalException(Environment* env,
       std::string argv0;
       if (!env->argv().empty()) argv0 = env->argv()[0];
       if (argv0.empty()) argv0 = "node";
-      FPrintF(stderr, "(Use `%s --trace-uncaught ...` to show "
-                      "where the exception was thrown)\n", fs::Basename(argv0));
+      FPrintF(stderr,
+              "(Use `%s --trace-uncaught ...` to show where the exception "
+              "was thrown)\n",
+              fs::Basename(argv0, ".exe"));
     }
   }
 

src/node_file.cc

@@ -82,10 +82,20 @@ constexpr char kPathSeparator = '/';
 const char* const kPathSeparator = "\\/";
 #endif
 
-std::string Basename(const std::string& str) {
-  std::string::size_type pos = str.find_last_of(kPathSeparator);
-  if (pos == std::string::npos) return str;
-  return str.substr(pos + 1);
+std::string Basename(const std::string& str, const std::string& extension) {
+  std::string ret = str;
+
+  // Remove everything leading up to and including the final path separator.
+  std::string::size_type pos = ret.find_last_of(kPathSeparator);
+  if (pos != std::string::npos) ret = ret.substr(pos + 1);
+
+  // Strip away the extension, if any.
+  if (ret.size() >= extension.size() &&
+      ret.substr(ret.size() - extension.size()) == extension) {
+    ret = ret.substr(0, ret.size() - extension.size());
+  }
+
+  return ret;
 }
 
 inline int64_t GetOffset(Local<Value> value) {

src/node_internals.h

@@ -397,7 +397,7 @@ BaseObjectPtr<AsyncWrap> CreateHeapSnapshotStream(
 }  // namespace heap
 
 namespace fs {
-std::string Basename(const std::string& str);
+std::string Basename(const std::string& str, const std::string& extension);
 }  // namespace fs
 
 }  // namespace node