Commit: c06df1ad78a7247b9df3713f87d0e26e52ac8b75 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Révision: c06df1ad78a7247b9df3713f87d0e26e52ac8b75 (tree)
• l'heure: 2013-09-20 17:43:04
• Auteur: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Message de Log

Force canonical comparison of shell links; (cf. MinGW-Bug #2054)

Change Summary

• modified: ChangeLog
• modified: scripts/libexec/unlink.js

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Force canonical comparison of shell links; (cf. MinGW-Bug #2054)
+
+	* scripts/libexec/unlink.js [FileExists(filename) && (chklink != "")]:
+	The value of 'chklink' may not be canonical; instantiate an (unsaved)
+	link reference from it, then compare the canonicalized reference from
+	within it, to the reference within 'filename', thus avoiding possible
+	lexical mismatch between canonical and non-canonical forms.
+
 2013-09-19  Keith Marshall  <[e-mail]>
 
 	Correct LUA_PATH assignment for GUI; (cf. MinGW-Bug #2052)

--- a/scripts/libexec/unlink.js
+++ b/scripts/libexec/unlink.js
@@ -40,7 +40,7 @@
  * This file is a component of mingw-get.
  *
  * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2012, MinGW Project
+ * Copyright (C) 2012, 2013, MinGW.org Project
  *
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -222,11 +222,12 @@ for( i = 0; i < argv.length; i++ )
        */
       if( chklink != "" )
       {
-	/* ...but when "--if-linked is in effect, we must verify
-	 * that the link target is matched, before...
+	/* ...but when "--if-linked is in effect, we must verify that
+	 * the link target is matched (case-insensitively), before...
 	 */
 	var ref = WinShell.CreateShortcut( filename );
-	if( ref.TargetPath.toLowerCase() == chklink.toLowerCase() )
+	var chk = WinShell.CreateShortcut( filename ); chk.TargetPath = chklink;
+	if( ref.TargetPath.toLowerCase() == chk.TargetPath.toLowerCase() )
 	  /*
 	   * ...we may proceed with deletion.
 	   */