Changeset e314db in git

Timestamp:

Mar 4, 2016, 11:08:31 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fb24e814923417fdd0141344e491a098207148f9

Parents:

93e3ef8d65a31285cdb950111efb60f28f8998a7

Message:

fix: omFindExec for CYGWIN

File:

• resources/omFindExec.c (modified) (6 diffs)

resources/omFindExec.c

@@ -39 +39 @@
   char *search;
   char *p;
-#ifdef WINNT
-  char *extra = NULL;
-#endif
   char tbuf[MAXPATHLEN];
 
@@ -50 +47 @@
       {
         strcpy(executable, name);
-#ifdef __CYGWIN__
-        strcat(executable, ".exe");
-#endif
         return executable;
       }
@@ -75 +69 @@
       {
         strcpy(executable, tbuf);
-#ifdef __CYGWIN__
-        strcat(executable, ".exe");
-#endif
         return executable;
       }
@@ -85 +76 @@
     search = getenv("PATH");
 /* for winnt under msdos, cwd is implictly in the path */
-#ifdef WINNT
-    p = getenv("SHELL");
-    if (p == NULL || strlen(p) < 2)
-    {
-      char *extra = NULL;
-      /* we are under msdos display */
-      extra = (char*) malloc((search != NULL ? strlen(search) : 0) + 3);
-      strcpy(extra, ".:");
-      if (search != NULL) strcat(extra, search);
-      search = extra;
-    }
-#endif
     p = search;
 
@@ -129 +108 @@
         if (! access (tbuf, F_OK))
         {
-#ifdef WINNT
-          if (extra != NULL)
-            free(extra);
-#endif
           strcpy(executable, tbuf);
-#ifdef __CYGWIN__
-          strcat(executable, ".exe");
-#endif
           return executable;
         }
@@ -219 +191 @@
 }
 
-#ifdef WINNT
+#ifdef __CYGWIN__
+/* for windows, serch first for .exe */
 char * _omFindExec (const char *name, char* exec);
-/* for windows, serch first for .exe */
 char* omFindExec(const char *name, char* exec)
 {