Changeset 3df5b10 in git for omalloc/omFindExec.c

Timestamp:

Aug 14, 2000, 2:08:48 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

9d605984360cf5d30bdf13e295d63c41ae1bc952

Parents:

ecf4ca6ad75f235385946daeae249f3bc6fd13c8

Message:

* update


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

File:

• omalloc/omFindExec.c (modified) (9 diffs)

omalloc/omFindExec.c

@@ -4 +4 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omFindExec.c,v 1.2 2000-05-31 13:34:31 obachman Exp $
+ *  Version: $Id: omFindExec.c,v 1.3 2000-08-14 12:08:45 obachman Exp $
  *******************************************************************/
 
@@ -20 +20 @@
 #define MAXPATHLEN 1024
 #endif
-
 
 /* ABSOLUTE_FILENAME_P (fname): True if fname is an absolute filename */
@@ -36 +35 @@
 char * omFindExec (const char *name, char* executable)
 #else
-char * omFindExec_link (const char *name, char* executable)
+static char * omFindExec_link (const char *name, char* executable)
 #endif
 {
   char *search;
   char *p;
+#ifdef WINNT
+  char *extra = NULL;
+#endif
   char tbuf[MAXPATHLEN];
 
@@ -84 +86 @@
       char *extra = NULL;
       /* we are under msdos display */
-      FIX ME
-        extra = (char*) AllocL((search != NULL ? strlen(search) : 0) + 3);
+      extra = (char*) omAlloc((search != NULL ? strlen(search) : 0) + 3);
       strcpy(extra, ".:");
       if (search != NULL) strcat(extra, search);
@@ -125 +126 @@
 #ifdef WINNT
           if (extra != NULL)
-            FreeL(extra);
+            omFree(extra);
 #endif
           strcpy(executable, tbuf);
@@ -142 +143 @@
     }
   }
-    
-    return NULL;
-  }
+  return NULL;
+}
 
 #ifdef HAVE_READLINK
+/* similar to readlink, but dont' mess up absolute pathnames */
+static int my_readlink(const char* name, char* buf, size_t bufsize)
+{
+  char buf2[MAXPATHLEN];
+  int ret;
+  
+  if ((ret = readlink(name, buf2, bufsize)) > 0)
+  {
+    buf2[ret] = 0;
+    if (*name == '/' && *buf2 != '/')
+    {
+      char* last = strrchr(name, '/');
+      int i = 0;
+      while (&(name[i]) != last)
+      {
+        buf[i] = name[i];
+        i++;
+      }
+      buf[i] = '/';
+      i++;
+      strcpy(&(buf[i]), buf2);
+      return i + ret;
+    }
+    else
+    {
+      strcpy(buf, buf2);
+    }
+  }
+  return ret;
+}
 
 #define MAX_LINK_LEVEL 10
@@ -152 +182 @@
    followed up to MAX_LINK_LEVEL
 */
-int full_readlink(const char* name, char* buf, size_t bufsize)
+static int full_readlink(const char* name, char* buf, size_t bufsize)
 {
   int ret;
   
-  if ((ret=readlink(name, buf, bufsize)) > 0)
+  if ((ret=my_readlink(name, buf, bufsize)) > 0)
   {
     char buf2[MAXPATHLEN];
@@ -164 +194 @@
     {
       buf[ret] = '\0';
-      if ((ret2 = readlink(buf, buf2, MAXPATHLEN)) > 0)
+      if ((ret2 = my_readlink(buf, buf2, MAXPATHLEN)) > 0)
       {
         i++;
@@ -195 +225 @@
   if (link != NULL && (ret=full_readlink(link, buf, MAXPATHLEN)) > 0)
   {
+    char *p = strrchr(link, '/');
+
+
+    if(p!=NULL) *(p+1)='\0';
     buf[ret]='\0';
-    return omFindExec_link(buf, exec);
+
+    if (buf[0] != '/')
+    {
+      strcpy(exec, link);
+      strcat(exec, buf);
+    }
+    else
+    {
+      strcpy(exec, buf);
+    }
+
+    return exec;
   }
   return link;