From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from re-prd-fep-041.btinternet.com (mailomta9-re.btinternet.com [213.120.69.102]) by sourceware.org (Postfix) with ESMTPS id DC706388E803 for ; Sun, 23 May 2021 18:28:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DC706388E803 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=dronecode.org.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=jon.turney@dronecode.org.uk Received: from re-prd-rgout-001.btmx-prd.synchronoss.net ([10.2.54.4]) by re-prd-fep-041.btinternet.com with ESMTP id <20210523182852.LVHN30450.re-prd-fep-041.btinternet.com@re-prd-rgout-001.btmx-prd.synchronoss.net>; Sun, 23 May 2021 19:28:52 +0100 Authentication-Results: btinternet.com; none X-SNCR-Rigid: 5ED9BDD0344BA987 X-Originating-IP: [86.140.112.109] X-OWM-Source-IP: 86.140.112.109 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-VadeSecure-score: verdict=clean score=0/300, class=clean X-RazorGate-Vade: gggruggvucftvghtrhhoucdtuddrgeduledrvdejjedgjeejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuueftkffvkffujffvgffngfevqffopdfqfgfvnecuuegrihhlohhuthemuceftddunecunecujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeflohhnucfvuhhrnhgvhicuoehjohhnrdhtuhhrnhgvhiesughrohhnvggtohguvgdrohhrghdruhhkqeenucggtffrrghtthgvrhhnpeefieduveehgfffffeuueehleefgeevfedvffeljeefheduteelteelvdettefhvdenucfkphepkeeirddugedtrdduuddvrddutdelnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehhvghloheplhhotggrlhhhohhsthdrlhhotggrlhguohhmrghinhdpihhnvghtpeekiedrudegtddrudduvddruddtledpmhgrihhlfhhrohhmpeeojhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukheqpdhrtghpthhtohepoegthihgfihinhdqrghpphhssegthihgfihinhdrtghomheqpdhrtghpthhtohepoehjohhnrdhtuhhrnhgvhiesughrohhnvggtohguvgdrohhrghdruhhkqe X-RazorGate-Vade-Verdict: clean 0 X-RazorGate-Vade-Classification: clean Received: from localhost.localdomain (86.140.112.109) by re-prd-rgout-001.btmx-prd.synchronoss.net (5.8.340) (authenticated as jonturney@btinternet.com) id 5ED9BDD0344BA987; Sun, 23 May 2021 19:28:51 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 2/2] Add a command line option to choose symlink type used Date: Sun, 23 May 2021 19:27:37 +0100 Message-Id: <20210523182738.14292-3-jon.turney@dronecode.org.uk> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210523182738.14292-1-jon.turney@dronecode.org.uk> References: <20210523182738.14292-1-jon.turney@dronecode.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1198.3 required=5.0 tests=BAYES_00, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: cygwin-apps@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin package maintainer discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 May 2021 18:28:54 -0000 The default is 'magic', the historical behaviour of setup. --- main.cc | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/main.cc b/main.cc index b3854a8..d4ec0d2 100644 --- a/main.cc +++ b/main.cc @@ -63,6 +63,7 @@ #include "getopt++/GetOption.h" #include "getopt++/BoolOption.h" #include "getopt++/StringOption.h" +#include "mklink2.h" #include "Exception.h" #include @@ -95,6 +96,8 @@ static BoolOption HelpOption (false, 'h', "help", "Print help"); static BoolOption VersionOption (false, 'V', "version", "Show version"); static StringOption SetupBaseNameOpt ("setup", 'i', "ini-basename", "Use a different basename, e.g. \"foo\", instead of \"setup\"", false); BoolOption UnsupportedOption (false, '\0', "allow-unsupported-windows", "Allow old, unsupported Windows versions"); +static StringOption SymlinkTypeOption ("magic", '\0', "symlink-type", "Symlink type (magic, shortcut, native, wsl)", false); + std::string SetupBaseName; static void inline @@ -258,6 +261,32 @@ WinMain (HINSTANCE h, exit (1); } + if (((std::string)SymlinkTypeOption).size()) + { + if (((std::string)SymlinkTypeOption).compare("wsl") == 0) + { + VersionInfo v = GetVer(); + if ((v.major() < 10) || + ((v.major() == 10) && (v.buildNumber() < 14393))) + { + fprintf (stderr, "*** --symlink-type wsl requires Windows 10 1607 or later\n"); + exit(1); + } + else + symlinkType = SymlinkTypeWsl; + } + else if (((std::string)SymlinkTypeOption).compare("magic") == 0) + symlinkType = SymlinkTypeMagic; + else + { + char buff[80 + ((std::string)SymlinkTypeOption).size()]; + sprintf (buff, "Invalid choice for --symlink-type option: \"%s\"", + ((std::string)SymlinkTypeOption).c_str()); + fprintf (stderr, "*** %s\n", buff); + exit(1); + } + } + unattended_mode = PackageManagerOption ? chooseronly : (UnattendedOption ? unattended : attended); -- 2.31.1