[commit] r2357 - sqGetFilenameFromString handles relative symlinks properly

 
Author: piumarta
Date: 2011-01-23 17:31:57 -0800 (Sun, 23 Jan 2011)
New Revision: 2357

Modified:
   trunk/platforms/unix/ChangeLog
   trunk/platforms/unix/vm/sqUnixMain.c
Log:
sqGetFilenameFromString handles relative symlinks properly

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog 2011-01-23 09:56:18 UTC (rev 2356)
+++ trunk/platforms/unix/ChangeLog 2011-01-24 01:31:57 UTC (rev 2357)
@@ -1,3 +1,7 @@
+2011-01-24  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>
+
+ * vm/sqUnixMain.c (sqGetFilenameFromString): Handle relative symlinks properly.
+
 2011-01-23  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>
 
  * plugins/UUIDPlugin/sqUnixUUID.c (MakeUUID): NetBSD has

Modified: trunk/platforms/unix/vm/sqUnixMain.c
===================================================================
--- trunk/platforms/unix/vm/sqUnixMain.c 2011-01-23 09:56:18 UTC (rev 2356)
+++ trunk/platforms/unix/vm/sqUnixMain.c 2011-01-24 01:31:57 UTC (rev 2357)
@@ -27,7 +27,7 @@
 
 /* Author: Ian Piumarta <[hidden email]>
  *
- * Last edited: 2010-04-01 13:43:17 by piumarta on emilia-2.local
+ * Last edited: 2011-01-24 10:31:12 by piumarta on emilia.local
  */
 
 #include "sq.h"
@@ -1481,25 +1481,37 @@
       {
  if (!lstat(aCharBuffer, &st) && S_ISLNK(st.st_mode)) /* symlink */
   {
+    char linkBuffer[MAXPATHLEN], *linkPart= 0;
+
     if (++numLinks > MAXSYMLINKS)
       return -1; /* too many levels of indirection */
 
-    filenameLength= readlink(aCharBuffer, aCharBuffer, MAXPATHLEN);
+    filenameLength= readlink(aCharBuffer, linkBuffer, MAXPATHLEN);
     if ((filenameLength < 0) || (filenameLength >= MAXPATHLEN))
       return -1; /* link unavailable or path too long */
 
-    aCharBuffer[filenameLength]= 0;
+    linkBuffer[filenameLength]= 0;
+
+    if ((linkBuffer[0] == '/') || (!(linkPart= strrchr(aCharBuffer, '/'))))
+      linkPart= aCharBuffer; /* target is absolute or source is relative: target replaces entire source */
+    else
+      linkPart += 1; /* target is relative: target replaces basename component of source */
+
+    if (linkPart - aCharBuffer + 1 + filenameLength + 1 >= MAXPATHLEN)
+      return -1; /* result path too long */
+
+    strcpy(linkPart, linkBuffer);
     continue;
   }
 
-#    if defined(DARWIN)
+#      if defined(DARWIN)
  if (isMacAlias(aCharBuffer))
   {
     if ((++numLinks > MAXSYMLINKS) || !resolveMacAlias(aCharBuffer, aCharBuffer, MAXPATHLEN))
-      return -1; /* too many levels or bad alias */
+      return -1; /* too many levels or bad alias */
     continue;
   }
-#    endif
+#      endif
 
  break; /* target is no longer a symlink or alias */
       }