Changeset 4435

Timestamp:

10/17/03 17:30:50 (18 years ago)

Author:

piso

Message:

isPlatformUnix(), getFile()

File:

• trunk/j/src/org/armedbear/lisp/Utilities.java (modified) (3 diffs)

trunk/j/src/org/armedbear/lisp/Utilities.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Utilities.java,v 1.3 2003-09-28 15:58:48 piso Exp $
+ * $Id: Utilities.java,v 1.4 2003-10-17 17:30:50 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -22 +22 @@
 package org.armedbear.lisp;
 
-public final class Utilities
+import java.io.File;
+
+public final class Utilities extends Lisp
 {
-    private static final boolean isPlatformWindows =
-        System.getProperty("os.name").startsWith("Windows");
+    private static final boolean isPlatformUnix;
+    private static final boolean isPlatformWindows;
+
+    static {
+        String osName = System.getProperty("os.name");
+        isPlatformUnix = osName.startsWith("Linux") ||
+            osName.startsWith("Mac OS X") || osName.startsWith("Solaris") ||
+            osName.startsWith("SunOS") || osName.startsWith("AIX");
+        isPlatformWindows = osName.startsWith("Windows");
+    }
+
+    public static boolean isPlatformUnix()
+    {
+        return isPlatformUnix;
+    }
 
     public static boolean isPlatformWindows()
@@ -59 +74 @@
     }
 
+    public static File getFile(LispObject pathspec) throws ConditionThrowable
+    {
+        String namestring;
+        if (pathspec instanceof LispString)
+            namestring = ((LispString)pathspec).getValue();
+        else if (pathspec instanceof Pathname)
+            namestring = ((Pathname)pathspec).getNamestring();
+        else
+            throw new ConditionThrowable(new TypeError(pathspec,
+                                                       "pathname designator"));
+        if (isFilenameAbsolute(namestring)) {
+            if (isPlatformUnix()) {
+                if (namestring.length() > 0 && namestring.charAt(0) == '~') {
+                    namestring =
+                        System.getProperty("user.home").concat(namestring.substring(1));
+                }
+            }
+            return new File(namestring);
+        }
+        return new File(
+            LispString.getValue(_DEFAULT_PATHNAME_DEFAULTS_.symbolValue()),
+            namestring);
+    }
+
     public static final char toUpperCase(char c)
     {