Changeset 138f0c in git for Singular/febase.cc

Timestamp:

Nov 15, 1999, 1:53:28 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

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

Children:

d9909c94593c093ae99a6b1884d5343aba29fbb3

Parents:

8f0190b06443e3b86ce8a435044847907447e7a9

Message:

* feFopen: recognize "~obachman/..."


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

File:

• Singular/febase.cc (modified) (3 diffs)

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.83 1999-09-21 14:44:58 obachman Exp $ */
+/* $Id: febase.cc,v 1.84 1999-11-15 12:53:28 obachman Exp $ */
 /*
 * ABSTRACT: i/o system
@@ -18 +18 @@
 #ifdef NeXT
 #include <sys/file.h>
+#endif
+
+#ifdef HAVE_PWD_H
+#include "pwd.h"
 #endif
 
@@ -102 +106 @@
   if (path[0]=='~')
   {
-    char* home = getenv("HOME");
-    if (home != NULL)
-    {
-      strcpy(longpath, home);
-      strcat(longpath, &(path[1]));
-      path = longpath;
-    }
+    if (path[1] == DIR_SEP)
+    {
+      char* home = getenv("HOME");
+      if (home != NULL)
+      {
+        strcpy(longpath, home);
+        strcat(longpath, &(path[1]));
+        path = longpath;
+      }
+    }
+#if defined(HAVE_PWD_H) && defined(HAVE_GETPWNAM)
+    else
+    {
+      char* dir_sep;
+      struct passwd *pw_entry;
+      strcpy (longpath, path);
+      dir_sep = strchr(longpath, DIR_SEP);
+      *dir_sep = '\0';
+      pw_entry = getpwnam(&longpath[1]);
+      if (pw_entry != NULL)
+      {
+        strcpy(longpath, pw_entry->pw_dir);
+        dir_sep = strchr(path, DIR_SEP);
+        strcat(longpath, dir_sep);
+        path = longpath;
+      }
+    }
+#endif
   }
   FILE * f=NULL;