[setup - the official Cygwin setup program] branch master, updated. release_2.914

[Jon TURNEY]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=85789118355984ebb98d709aedd6a219bedec250

commit 85789118355984ebb98d709aedd6a219bedec250
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Dec 19 21:22:55 2021 +0000

    When in unattended mode, ignore attempts to close via GUI
    
    Perhaps this should be controlled by a separate option, but making setup
    non-interactive seems like a reasonable fit with the intent of
    '--quiet-mode'.
    
    This doesn't stop the installer being killed by TerminateProcess().
    
    Addresses: https://cygwin.com/pipermail/cygwin/2021-November/250079.html

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=aa80df6c582065d16ff0b39bdb46539cf8412a7e

commit aa80df6c582065d16ff0b39bdb46539cf8412a7e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Jan 7 15:18:02 2022 +0000

    Further fix symlinks to absolute paths made for ' --symlink-type native'
    
    After using 'to' with NtOpenFile(), convert it back to Win322
    filenamespace form before using it with CreateSymbolicLinkW(), so that
    the symlink works with native tools.
    
    https://cygwin.com/pipermail/cygwin/2022-January/250398.html


Diff:
---
 mklink2.cc   | 3 +++
 propsheet.cc | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/mklink2.cc b/mklink2.cc
index ac3ab005..190b74d5 100644
--- a/mklink2.cc
+++ b/mklink2.cc
@@ -279,6 +279,9 @@ mknativesymlink (const char *from, const char *to)
   if (to[0] == '/')
     {
       wto = wabsto;
+      // convert back from nt namespace to win32 file namespace to use with
+      // CreateSymbolicLinkW()
+      wabsto[1] = '\\';
     }
   else
     {
diff --git a/propsheet.cc b/propsheet.cc
index 00b2ad81..742e5dab 100644
--- a/propsheet.cc
+++ b/propsheet.cc
@@ -161,6 +161,8 @@ static LRESULT CALLBACK PropSheetWndProc (HWND hwnd, UINT uMsg,
       if (wParam != 2)
 	break;
     areyousure:
+      if (unattended_mode == unattended)
+        return 0;
       if (mbox(hwnd, IDS_CONFIRM_EXIT, MB_YESNO) == IDNO)
 	return 0;
       break;