Changeset 39d6b4 in git

Timestamp:

May 20, 1998, 3:22:21 PM (25 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

69d99e7fda7f7dc17d1c56b4a0ec52a8fb60e9ae

Parents:

5a5c1677300fb827a08b15c78a4921fd8b09e9dd

Message:

Added followup-symlinks to find_executable


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

File:

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

Singular/find_exec.c

@@ -63 +63 @@
       if (! access (name, X_OK)) {
         struct stat stat_temp;
+        char buf[MAXPATHLEN];
+        int ret;
 
         if (stat (name, &stat_temp))
           return 0;
 
+#ifdef HAVE_READLINK
+        if( (ret=readlink(name, buf, MAXPATHLEN))>0) {
+          char *p = strrchr(name, '/');
+          if(p!=NULL) *(p+1)='\0';
+          buf[ret]='\0';
+          if(buf[0]=='/') return(find_executable(buf));
+          strcat(name, buf);
+          return(find_executable(name));
+        }
+#endif /* HAVE_READLINK */
 #ifndef STAT_MACROS_BROKEN
         if (! S_ISREG(stat_temp.st_mode))
           return 0;
 #endif
+        
         return copy_of (name);
       }
@@ -175 +188 @@
       if (! access (tbuf, X_OK)) {
         struct stat stat_temp;
+        char buf[MAXPATHLEN];
+        int ret;
 
         if (stat (tbuf, &stat_temp))
           continue;
 
+#ifdef HAVE_READLINK
+        if( (ret=readlink(tbuf, buf, MAXPATHLEN))>0) {
+          char *p = strrchr(tbuf, '/');
+          if(p!=NULL) *(p+1)='\0';
+          buf[ret]='\0';
+          if(buf[0]=='/') return(find_executable(buf));
+          strcat(tbuf, buf);
+          return(find_executable(tbuf));
+        }
+#endif /* HAVE_READLINK */
 #ifndef STAT_MACROS_BROKEN
         if (! S_ISREG(stat_temp.st_mode))