Changeset 75f460 in git for Singular/run.c

Timestamp:

Dec 16, 2014, 3:43:21 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

fce947c9e6c3e8c6d5a622c7f6b0d724580993cc

Parents:

a2e4470c6e9a666de8ab7b706370c15e13092f76

Message:

format

File:

• Singular/run.c (modified) (19 diffs)

Singular/run.c

@@ -20 +20 @@
  * This program is based on the runemacs.c distributed with XEmacs 21.0
  *
- * Simple program to start gnu-win32 X11 programs (and native XEmacs) 
+ * Simple program to start gnu-win32 X11 programs (and native XEmacs)
  * with its console window hidden.
  *
  * This program is provided purely for convenience, since most users will
  * use XEmacs in windowing (GUI) mode, and will not want to have an extra
- * console window lying around. Ditto for desktop shortcuts to gnu-win32 
+ * console window lying around. Ditto for desktop shortcuts to gnu-win32
  * X11 executables.
  */
@@ -170 +170 @@
            ((p2 = strrchr(p, '/')) && stricmp(p2, "/bin") == 0) )
       {
-         *p2 = '\0';   
+         *p2 = '\0';
 #if defined(__CYGWIN__)
          CYGWIN_CONV_TO_POSIX_PATH((exec2,tmp));
@@ -202 +202 @@
    if (char_cnt > MAX_ARGS*MAX_PATH) /* then we ran out of room */
       error("command line too long -\n%s",new_cmdline);
-   
+
    strcpy(new_cmdline,exec);
    for (i = first_arg; i < argc; i++)
@@ -229 +229 @@
  *  5) convert to cygwin-style path to resolve symlinks within the pathspec
  *  6) check filename: if it's a symlink, resolve it by peeking inside
- *  7) convert to win32-style path+filename since we're using Windows 
+ *  7) convert to win32-style path+filename since we're using Windows
  *       createProcess() to launch
  */
@@ -242 +242 @@
 
    int len = 0;
-   /* 
-    * STARTS WITH / or \ 
+   /*
+    * STARTS WITH / or \
     * execpath NOT used
     */
@@ -250 +250 @@
 #if defined(__CYGWIN__)
       strcpy(exec_tmp,execname);
-#else    
+#else
       exec_tmp[0] = ((char) (_getdrive() + ((int) 'A') - 1));
       exec_tmp[1] = ':';
@@ -268 +268 @@
       Trace((exec_tmp2));
    }
-   /* 
+   /*
     * STARTS WITH x:\ or x:/
     * execpath NOT used
@@ -276 +276 @@
        ((execname[2] == '\\') || (execname[2] == '/')))
    {
-      strcpy(exec_tmp,execname);       
+      strcpy(exec_tmp,execname);
       Trace(("x: -\nexec_tmp\t%s\nexecname\t%s\nexecpath\t%s\n",
              exec_tmp,execname,execpath));
@@ -289 +289 @@
       Trace((exec_tmp2));
    }
-   /* 
+   /*
     * STARTS WITH ./ or .\
     */
@@ -321 +321 @@
       orig_pathlist = getenv("PATH");
       if ((pathlist = malloc (strlen(orig_pathlist)
-                              + strlen(".") 
+                              + strlen(".")
                               + strlen(execpath)+ 3)) == NULL)
          error("internal error - out of memory");
@@ -369 +369 @@
       CYGWIN_CONV_TO_POSIX_PATH((exec_tmp,sym_link_name));
       Trace((sym_link_name));
-      
+
       if (lstat(sym_link_name, &stbuf) == 0)
       {
@@ -378 +378 @@
             else
             {
-                // if realname starts with '/' it's a rootpath 
+                // if realname starts with '/' it's a rootpath
                 if (real_name[0] == '/')
                     strcpy(exec_tmp2,real_name);
@@ -397 +397 @@
    }
    CYGWIN_CONV_TO_FULL_WIN32_PATH((exec_tmp2,exec));
-#else                                   
+#else
    strcpy (exec, exec_tmp2);
-#endif  
+#endif
 }
 int endsWith(const char* s1, const char* s2)
@@ -510 +510 @@
  *   additionally, backslash escapes next character, even if that
  *   next character is a delimiter. Or a double quote.
- *   WARNING: this means that backslash may NOT be a delimiter 
+ *   WARNING: this means that backslash may NOT be a delimiter
  */
 char* my_strtok(char* s, const char* delim, char** lasts)
@@ -517 +517 @@
    int c, sc;
    char *tok;
-   
+
    if ((s == NULL) && ((s = *lasts) == NULL))
       return NULL;
@@ -562 +562 @@
          c = *s++; /* otherwise, skip the escaped character */
       }
-#endif   
+#endif
       spanp = (char *)delim;
       do {
@@ -628 +628 @@
     char *recursive_name;
     int foundit = FALSE;
-    
+
     returnval[0] = '\0';
 
@@ -652 +652 @@
     return retval;
 }
-int fileExistsMulti(char* fullname, const char* path, 
+int fileExistsMulti(char* fullname, const char* path,
                     const char* name_noext, const char* exts[],
                     const int extcnt)
@@ -689 +689 @@
    else
       work[0]='\0';
-   
+
    strcat(work, name);
 #if defined(__CYGWIN__)
-   CYGWIN_CONV_TO_POSIX_PATH((work, work2)); 
+   CYGWIN_CONV_TO_POSIX_PATH((work, work2));
 #else
    strcpy(work2,work);