[slime-cvs] CVS slime

[heller]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv13398

Modified Files:
	ChangeLog swank-abcl.lisp 
Log Message:
* swank-abcl.lisp (getpid): Return '0' in case of error.
Apparently needed bacause $PPID isn't not a standard feature.
"[T]his is not a disentanglement from, but a progressive knotting
into."

(Patch from Mark Evenson.)


--- /project/slime/cvsroot/slime/ChangeLog	2008/02/22 14:24:52	1.1298
+++ /project/slime/cvsroot/slime/ChangeLog	2008/02/22 14:38:39	1.1299
@@ -1,8 +1,15 @@
+2008-02-22  Mark Evenson <mark.evenson at gmx.at>
+
+	* swank-abcl.lisp (getpid): Return '0' in case of error.
+	Apparently needed bacause $PPID isn't not a standard feature.
+	"[T]his is not a disentanglement from, but a progressive knotting
+	into."
+
 2008-02-22  Mark Harig <idirectscm at aim.com>
 
 	Fix typos: "contribs" -> "contrib".
 
-	* slime-autoloads.el (slime-setup-contribs): 
+	* slime-autoloads.el (slime-setup-contribs):
 	* slime.el (slime-setup):
 
 2008-02-22  Mark Harig <idirectscm at aim.com>
--- /project/slime/cvsroot/slime/swank-abcl.lisp	2008/02/09 18:47:05	1.47
+++ /project/slime/cvsroot/slime/swank-abcl.lisp	2008/02/22 14:38:39	1.48
@@ -143,8 +143,7 @@
   (funcall fn))
 
 (defimplementation getpid ()
-  (if (not (find :unix *features*))
-      0
+  (handler-case 
       (let* ((runtime 
               (java:jstatic "getRuntime" "java.lang.Runtime"))
              (command
@@ -153,8 +152,8 @@
              (runtime-exec-jmethod 		
               ;; Complicated because java.lang.Runtime.exec() is
               ;; overloaded on a non-primitive type (array of
-              ;; java.lang.String), so we have to use the actual parameter
-              ;; instance to get java.lang.Class
+              ;; java.lang.String), so we have to use the actual
+              ;; parameter instance to get java.lang.Class
               (java:jmethod "java.lang.Runtime" "exec" 
                             (java:jcall 
                              (java:jmethod "java.lang.Object" "getClass")
@@ -162,19 +161,19 @@
              (process 
               (java:jcall runtime-exec-jmethod runtime command))
              (output 
-              (java:jcall (java:jmethod "java.lang.Process" "getInputStream") 
+              (java:jcall (java:jmethod "java.lang.Process" "getInputStream")
                           process)))
-        (java:jcall (java:jmethod "java.lang.Process" "waitFor") process)
-        (loop 
-         :with b
-         :do (setq b 
-                   (java:jcall (java:jmethod "java.io.InputStream" "read")
-                               output))
-         :until (member b '(-1 #x0a))	; Either EOF or LF
-         :collecting (code-char b) :into result
-         :finally (return 
-                    (values 
-                     (parse-integer (coerce result 'string))))))))
+         (java:jcall (java:jmethod "java.lang.Process" "waitFor")
+                     process)
+	 (loop :with b :do 
+	    (setq b 
+		  (java:jcall (java:jmethod "java.io.InputStream" "read")
+			      output))
+	    :until (member b '(-1 #x0a))	; Either EOF or LF
+	    :collecting (code-char b) :into result
+	    :finally (return 
+		       (parse-integer (coerce result 'string)))))
+    (t () 0))) 
 
 (defimplementation lisp-implementation-type-name ()
   "armedbear")