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

[Jon TURNEY <jturney@sourceware.org>]

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

commit 7c273e254a5f0f3d358d16e112b1be9fedd3e53e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Jan 4 16:56:12 2022 +0000

    Update displayed copyright to 2022

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

commit 3eff9155081466b4fdec5269c4eb0c50fb03cdee
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Thu Jan 6 15:38:17 2022 +0000

    Fix symlinks to absolute paths made for ' --symlink-type native'
    
    As currently written, we go to the trouble of making absto, and then
    don't use it, which isn't right at all...


Diff:
---
 mklink2.cc | 11 +++++------
 splash.cc  |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/mklink2.cc b/mklink2.cc
index 6e7a0020..ac3ab005 100644
--- a/mklink2.cc
+++ b/mklink2.cc
@@ -274,17 +274,16 @@ mknativesymlink (const char *from, const char *to)
   wfrom[1] = '?';
 
   size_t tlen = strlen (to) + 7;
-  wchar_t wto[tlen];
+  wchar_t wrelto[tlen];
+  wchar_t *wto;
   if (to[0] == '/')
     {
-      absto = get_root_dir();
-      absto.append(to);
-      mklongpath (wto, to, tlen);
-      wto[1] = '?';
+      wto = wabsto;
     }
   else
     {
-      mklongrelpath (wto, to, tlen);
+      mklongrelpath (wrelto, to, tlen);
+      wto = wrelto;
     }
 
   DWORD flags = isdir ? SYMBOLIC_LINK_FLAG_DIRECTORY : 0;
diff --git a/splash.cc b/splash.cc
index 450ccc04..67731f57 100644
--- a/splash.cc
+++ b/splash.cc
@@ -22,7 +22,7 @@
 #include "ini.h"
 
 #define SPLASH_URL "https://cygwin.com"
-#define SPLASH_COPYRIGHT "Copyright 2000-2021"
+#define SPLASH_COPYRIGHT "Copyright 2000-2022"
 
 static ControlAdjuster::ControlInfo SplashControlsInfo[] = {
   { IDC_SPLASH_TEXT,        CP_STRETCH,   CP_STRETCH },