show: Handle multiple values correctly.

[lisp] / unix.lisp

diff --git a/unix.lisp b/unix.lisp
index 3a01dd27de3d0290ce7bdfb123be5f431fa7608a..b4d020845f9e168827200c3358de26270961076f 100644 (file)
--- a/unix.lisp
+++ b/unix.lisp
@@ -1,4 +1,4 @@
-;;; -*-lisp-*0
+;;; -*-lisp-*-

 ;;;
 ;;; $Id$
 ;;;
 ;;;
 ;;; $Id$
 ;;;


@@ -24,7 +24,7 @@
 ;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 (defpackage #:mdw.unix
 ;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 (defpackage #:mdw.unix

-  (:use #:common-lisp #:mdw.base #:mdw.collect)
+  (:use #:common-lisp #:mdw.base #:collect)

   (:export #:unix-error #:errno-value #:with-errno-handlers
           #:syscall #:syscall*
           #:stat #:sys-stat
   (:export #:unix-error #:errno-value #:with-errno-handlers
           #:syscall #:syscall*
           #:stat #:sys-stat


@@ -37,7 +37,7 @@ (in-package #:mdw.unix)
 
 (defmacro with-buffer ((var len) &body body)
   "Evaluate BODY with VAR bound to a pointer (a SAP, if you must know) to a
 
 (defmacro with-buffer ((var len) &body body)
   "Evaluate BODY with VAR bound to a pointer (a SAP, if you must know) to a

-buffer of LEN bytes."
+   buffer of LEN bytes."

   (with-gensyms lenvar
     `(let ((,lenvar ,len)
           (,var nil))
   (with-gensyms lenvar
     `(let ((,lenvar ,len)
           (,var nil))


@@ -69,8 +69,8 @@ (defmacro with-errno-handlers ((&key cond
                                     errstring)
                               form &rest clauses)
   "Evaluate FORM but trap Unix errors according to CLAUSES.  Each clause has
                                     errstring)
                               form &rest clauses)
   "Evaluate FORM but trap Unix errors according to CLAUSES.  Each clause has

-the form of a `case' clause, but may contain symbolic errno names as well as
-numbers."
+   the form of a `case' clause, but may contain symbolic errno names as well
+   as numbers."

   (flet ((fix (sw)
           (cond ((eq sw t) 't)
                 ((atom sw) (list (errno-value sw)))
   (flet ((fix (sw)
           (cond ((eq sw t) 't)
                 ((atom sw) (list (errno-value sw)))


@@ -111,7 +111,7 @@ (defmacro with-errno-handlers ((&key cond
 
 (defun syscall* (name func &rest args)
   "Call Unix system call FUNC, passing it ARGS.  If it returns an error,
 
 (defun syscall* (name func &rest args)
   "Call Unix system call FUNC, passing it ARGS.  If it returns an error,

-signal the unix-error condition, with NAME and ARGS."
+   signal the unix-error condition, with NAME and ARGS."

   (multiple-value-call (lambda (rc &rest stuff)
                         (unless rc
                           (error 'unix-error
   (multiple-value-call (lambda (rc &rest stuff)
                         (unless rc
                           (error 'unix-error


@@ -122,8 +122,9 @@ (defun syscall* (name func &rest args)
                       (apply func args)))
 (defmacro syscall (func &rest args)
   "Call Unix system call FUNC, passing it ARGS.  If it returns an error,
                       (apply func args)))
 (defmacro syscall (func &rest args)
   "Call Unix system call FUNC, passing it ARGS.  If it returns an error,

-signal the unix-error condition, with FUNC and ARGS."
-  `(syscall* ',func ,func ,@args))
+   signal the unix-error condition, with FUNC and ARGS."
+  `(syscall* ',func
+   #',func ,@args))

 
 (macrolet ((doit (doc slots)
             `(defstruct (stat (:predicate statp)
 
 (macrolet ((doit (doc slots)
             `(defstruct (stat (:predicate statp)


@@ -132,12 +133,12 @@ (macrolet ((doit (doc slots)
                ,doc
                ,@slots)))
   (doit
                ,doc
                ,@slots)))
   (doit

-   "Structure representing all the useful information `stat' returns about
-a file."
+   "Structure representing all the useful information `stat' returns about a
+   file."

    (dev ino mode nlink uid gid rdev size atime mtime ctime blksize blocks)))
 (defun sys-stat (file)
   "Return information about FILE in a structure rather than as inconvenient
    (dev ino mode nlink uid gid rdev size atime mtime ctime blksize blocks)))
 (defun sys-stat (file)
   "Return information about FILE in a structure rather than as inconvenient

-multiple values."
+   multiple values."

   (multiple-value-call
       (lambda (rc &rest results)
        (unless rc
   (multiple-value-call
       (lambda (rc &rest results)
        (unless rc


@@ -164,8 +165,8 @@   (defsys open close read write
 
 (defmacro with-unix-open ((fd file how &optional (mode #o666)) &body body)
   "Evaluate BODY with FD bound to a file descriptor obtained from a Unix
 
 (defmacro with-unix-open ((fd file how &optional (mode #o666)) &body body)
   "Evaluate BODY with FD bound to a file descriptor obtained from a Unix

-`open' syscall with arguments FILE, HOW and MODE.  Close the file descriptor
-when BODY is done."
+   `open' syscall with arguments FILE, HOW and MODE.  Close the file
+   descriptor when BODY is done."

   `(let (,fd)
      (unwind-protect
         (progn
   `(let (,fd)
      (unwind-protect
         (progn


@@ -175,8 +176,8 @@ (defmacro with-unix-open ((fd file how &optional (mode #o666)) &body body)
 
 (defun copy-file (from to &optional (how 0))
   "Make a copy of the file FROM called TO.  The copy has the same permissions
 
 (defun copy-file (from to &optional (how 0))
   "Make a copy of the file FROM called TO.  The copy has the same permissions

-and timestamps (except for ctime) and attempts to have the same owner and
-group as the original."
+   and timestamps (except for ctime) and attempts to have the same owner and
+   group as the original."

   (let ((st (sys-stat from)))
     (with-unix-open (in from unix:O_RDONLY)
       (with-unix-open (out
   (let ((st (sys-stat from)))
     (with-unix-open (in from unix:O_RDONLY)
       (with-unix-open (out