Changeset e5295a in git

Timestamp:

Nov 6, 1999, 4:49:45 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

c53894fdfe805579de2fbdddd799c04fc841c494

Parents:

698457f6f46700a65e8096f211292da37a6d4278

Message:

* follow symbolic links up to level MAX_LINK_LEVEL (10)


git-svn-id: file:///usr/local/Singular/svn/trunk@3812 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/find_exec.c (modified) (2 diffs)

Singular/find_exec.c

@@ -150 +150 @@
 
 #ifdef HAVE_READLINK
+
+#define MAX_LINK_LEVEL 10
+/* similar to readlink (cf. man readlink), except that symbolic links are 
+   followed up to MAX_LINK_LEVEL
+*/
+
+int full_readlink(const char* name, char* buf, size_t bufsize)
+{
+  int ret;
+  
+  if ((ret=readlink(name, buf, bufsize)) > 0)
+  {
+    char buf2[MAXPATHLEN];
+    int ret2, i = 0;
+    
+    do
+    {
+      buf[ret] = '\0';
+      if ((ret2 = readlink(buf, buf2, MAXPATHLEN)) > 0)
+      {
+        i++;
+        buf2[ret2] = '\0';
+        strcpy(buf, buf2);
+        ret = ret2;
+      }
+      else
+      {
+        return ret;
+      }
+    }
+    while (i<MAX_LINK_LEVEL);
+  }
+  return -1;
+}
+  
+  
 char * find_executable (const char *name)
 {
@@ -156 +192 @@
   int ret;
 
-  if (link == NULL && (ret=readlink(name, buf, MAXPATHLEN)) > 0)
+  if (link == NULL && (ret=full_readlink(name, buf, MAXPATHLEN)) > 0)
   {
     buf[ret] ='\0';
     link = find_executable_link(buf);
   }
-  if (link != NULL && (ret=readlink(link, buf, MAXPATHLEN)) > 0)
-  {
+  if (link != NULL && (ret=full_readlink(link, buf, MAXPATHLEN)) > 0)
+  {
+    /* follow link further until you reach the end of it, or unitl 
+       MAX_SYMBOLIC_LINKS are encountered */
     char *p = strrchr(link, '/');
     char *executable;