Changeset a70441f in git for Singular/LIB/general.lib

Timestamp:

Apr 27, 2000, 12:07:30 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

e5f8ae07e0b41bb1b0e5aaaac2dad244e619d563

Parents:

eec9b2d2a332c04f20d743bdd4ccc107766fbc61

Message:

Windows and gcc 2.95 porting


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

File:

• Singular/LIB/general.lib (modified) (3 diffs)

Singular/LIB/general.lib

@@ -1 @@
-// $Id: general.lib,v 1.25 2000-01-13 12:15:54 obachman Exp $
+// $Id: general.lib,v 1.26 2000-04-27 10:07:13 obachman Exp $
 //GMG, last modified 18.6.99
 ///////////////////////////////////////////////////////////////////////////////
 
-version="$Id: general.lib,v 1.25 2000-01-13 12:15:54 obachman Exp $";
+version="$Id: general.lib,v 1.26 2000-04-27 10:07:13 obachman Exp $";
 info="
 LIBRARY:  general.lib   PROCEDURES OF GENERAL TYPE
@@ -980 +980 @@
    int rs;
    int i;
-   string fn = "/tmp/which_" + string(system("pid"));
+   string fn = "which_" + string(system("pid"));
    string pn;
+   string cmd;
    if( typeof(command) != "string")
    {
      return (pn);
    }
-   i = system("sh", "which " + command + " > " + fn);
+   if (system("uname") != "ix86-Win")
+   {
+     cmd = "which ";
+   }
+   else
+   {
+     // unfortunately, it does not take -path
+     cmd = "type ";
+   }
+   i = system("sh", cmd + command + " > " + fn);
    pn = read(fn);
-   pn[size(pn)] = "";
-   i = 1;
-   while ((pn[i] != " ") and (pn[i] != ""))
-   {
-     i = i+1;
-   }
-   if (pn[i] == " ") {pn[i] = "";}
-   rs = system("sh", "ls " + pn + " > " + fn + " 2>&1 ");
+   if (system("uname") != "ix86-Win")
+   {
+     // TBC: Hmm... should parse output to get rid of 'command is '
+     pn[size(pn)] = "";
+     i = 1;
+     while ((pn[i] != " ") and (pn[i] != ""))
+     {
+       i = i+1;
+     }
+     if (pn[i] == " ") {pn[i] = "";}
+     rs = system("sh", "ls " + pn + " > " + fn + " 2>&1 ");
+   }
+   else
+   {
+     rs = 0;
+   }
    i = system("sh", "rm " + fn);
    if (rs == 0) {return (pn);}
@@ -1006 +1024 @@
 example
 {  "EXAMPLE:"; echo = 2;
-    which("Singular");
-}
-///////////////////////////////////////////////////////////////////////////////
+    which("sh");
+}
+///////////////////////////////////////////////////////////////////////////////