From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-apps@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH setup 11/11] Default symlink mode from CYGWIN env var
Date: Tue, 10 Aug 2021 18:02:28 +0100 [thread overview]
Message-ID: <20210810170228.1690-12-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20210810170228.1690-1-jon.turney@dronecode.org.uk>
---
main.cc | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/main.cc b/main.cc
index 023d505..f4756c7 100644
--- a/main.cc
+++ b/main.cc
@@ -284,6 +284,7 @@ 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 ();
@@ -334,7 +335,46 @@ WinMain (HINSTANCE h,
/* Set default DACL and Group. */
nt_sec.setDefaultSecurity ((root_scope == IDC_ROOT_SYSTEM));
- symlinkType = (SymlinkTypeEnum)(int)SymlinkTypeOption;
+ /*
+ 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)
+ {
+ symlinkType = SymlinkTypeShortcut;
+ elevate_extra_args.append("--symlink-type lnk");
+ }
+ }
+ else
+ {
+ symlinkType = (SymlinkTypeEnum)(int)SymlinkTypeOption;
+ }
+
if (symlinkType == SymlinkTypeWsl)
{
VersionInfo v = GetVer();
@@ -376,6 +416,8 @@ 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.32.0
next prev parent reply other threads:[~2021-08-10 17:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-10 17:02 [PATCH setup 00/11] Add options to choose symlink type (v2) Jon Turney
2021-08-10 17:02 ` [PATCH setup 01/11] Add support for creating WSL symlinks Jon Turney
2021-08-10 17:02 ` [PATCH setup 02/11] Add support for creating native symlinks Jon Turney
2021-08-10 17:02 ` [PATCH setup 03/11] Factor out the iteration over archive files to install Jon Turney
2021-08-10 17:02 ` [PATCH setup 04/11] Add seek() method to archive and compress file classes Jon Turney
2021-08-10 17:02 ` [PATCH setup 05/11] Add separate symlink-creation phase when extracting archive Jon Turney
2021-08-10 17:02 ` [PATCH setup 06/11] Enable SeCreateSymbolicLink privilege Jon Turney
2021-08-11 8:46 ` Corinna Vinschen
2021-09-14 11:53 ` Jon Turney
2021-08-10 17:02 ` [PATCH setup 07/11] Add symlink capabilities to user-agent telemetry Jon Turney
2021-08-10 17:02 ` [PATCH setup 08/11] Factor out StringChoiceOption Jon Turney
2021-08-10 17:02 ` [PATCH setup 09/11] Add a command line option to choose symlink type used Jon Turney
2021-08-10 17:02 ` [PATCH setup 10/11] Propagate --symlink-type setting to post-install scripts Jon Turney
2021-08-10 17:02 ` Jon Turney [this message]
2021-09-14 11:53 ` [PATCH setup 00/11] Add options to choose symlink type (v2) Jon Turney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210810170228.1690-12-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).