From 3cf67008080eb20ba867634e27c46474d6dd07f2 Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sun, 23 Jan 2022 19:46:06 +0100
Subject: [PATCH] Revert "Default symlink mode from CYGWIN env var"

This reverts commit 62ab80bfc963d9841b30790ba3ad70ff88e8c3bb.

# Conflicts:
#	main.cc
---
 main.cc | 45 +--------------------------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/main.cc b/main.cc
index cf9e323..bf11c54 100644
--- a/main.cc
+++ b/main.cc
@@ -313,7 +313,6 @@ WinMain (HINSTANCE h,
     /* Check if we have to elevate. */
     bool elevate = !output_only && OSMajorVersion () >= 6
 		   && !NoAdminOption && !nt_sec.isRunAsAdmin ();
-    std::string elevate_extra_args;
 
     if (unattended_mode || output_only || !elevate)
       set_cout ();
@@ -395,47 +394,7 @@ WinMain (HINSTANCE h,
     /* Set default DACL and Group. */
     nt_sec.setDefaultSecurity ();
 
-    /*
-       If --symlink-type option isn't given, look for winsymlinks in CYGWIN
-       env var for a default
-
-       Since the current environment doesn't get passed to the process started
-       with with ShellExecuteEx, we need to convert the env var into an option
-       for that elevated instance.
-    */
-    if (!SymlinkTypeOption.isPresent()) {
-      std::string cygwin;
-      DWORD len = GetEnvironmentVariable ("CYGWIN", &cygwin[0], 0);
-      cygwin.resize(len);
-      GetEnvironmentVariable ("CYGWIN", &cygwin[0], len);
-
-      if (cygwin.find("winsymlinks:native") != std::string::npos)
-        {
-          symlinkType = SymlinkTypeNative;
-          elevate_extra_args.append("--symlink-type native");
-        }
-      else if (cygwin.find("winsymlinks:wsl") != std::string::npos)
-        {
-          symlinkType = SymlinkTypeWsl;
-          elevate_extra_args.append("--symlink-type wsl");
-        }
-      else if (cygwin.find("winsymlinks:sys") != std::string::npos)
-        {
-          symlinkType = SymlinkTypeMagic;
-          elevate_extra_args.append("--symlink-type sys");
-        }
-      else if (cygwin.find("winsymlinks:lnk") != std::string::npos)
-        {
-          // Ignore CYGWIN=winsymlinks:lnk, as '--symlink-type lnk' is not implemented
-          // symlinkType = SymlinkTypeShortcut;
-          // elevate_extra_args.append("--symlink-type lnk");
-        }
-      }
-    else
-      {
-        symlinkType = (SymlinkTypeEnum)(int)SymlinkTypeOption;
-      }
-
+    symlinkType = (SymlinkTypeEnum)(int)SymlinkTypeOption;
     if (symlinkType == SymlinkTypeWsl)
       {
         VersionInfo v = GetVer();
@@ -484,8 +443,6 @@ WinMain (HINSTANCE h,
 	std::string command_line_cs (command_line);
 	command_line_cs += " -";
 	command_line_cs += NoAdminOption.shortOption();
-	command_line_cs += " ";
-	command_line_cs += elevate_extra_args;
 	sei.lpParameters = command_line_cs.c_str ();
 
 	if (ShellExecuteEx(&sei))
-- 
2.11.4.GIT