From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 14 Apr 2018 14:06:05 +0000 (+0300)
Subject: Correctly resolve executables in paths on windows
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~69^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=42f347a5ab92fada99857ce764aa6e75a4ec48e4;p=cargo.git

Correctly resolve executables in paths on windows
---

diff --git a/src/cargo/util/paths.rs b/src/cargo/util/paths.rs
index eeee00ddd..eb5ada5cb 100644
--- a/src/cargo/util/paths.rs
+++ b/src/cargo/util/paths.rs
@@ -4,6 +4,7 @@ use std::fs::{self, File, OpenOptions};
 use std::io;
 use std::io::prelude::*;
 use std::path::{Component, Path, PathBuf};
+use std::iter;
 
 use filetime::FileTime;
 
@@ -88,8 +89,16 @@ pub fn without_prefix<'a>(long_path: &'a Path, prefix: &'a Path) -> Option<&'a P
 pub fn resolve_executable(exec: &Path) -> CargoResult<PathBuf> {
     if exec.components().count() == 1 {
         let paths = env::var_os("PATH").ok_or(format_err!("no PATH"))?;
-        for path in env::split_paths(&paths) {
+        let candidates = env::split_paths(&paths).flat_map(|path| {
             let candidate = PathBuf::from(path).join(&exec);
+            let with_exe = if env::consts::EXE_EXTENSION == "" {
+                None
+            } else {
+                Some(candidate.with_extension(env::consts::EXE_EXTENSION))
+            };
+            iter::once(candidate).chain(with_exe)
+        });
+        for candidate in candidates {
             if candidate.is_file() {
                 // PATH may have a component like "." in it, so we still need to
                 // canonicalize.