guile/guile-scsh ChangeLog Makefile.am USAGE aw...

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   00/12/04 15:18:03

Modified files:
        guile-scsh     : ChangeLog Makefile.am USAGE awk.scm 
                         fileinfo.scm filesys.scm fr.scm glob.scm 
                         init.scm netconst.scm network.scm newports.scm 
                         procobj.scm rdelim.scm scsh.scm syntax.scm 
                         syscalls.scm time.scm 
Removed files:
        guile-scsh     : filemtch.scm 

Log message:
        * scsh.scm: define module (scsh scsh).
        (command-line-arguments): define directly here instead of in init.scm.
        (init-scsh-vars): call here instead of in init.scm.
        (exit): removed, use Guile definition.
        
        * syscalls.scm (define-errno-syscall): don't export
        * network.scm: define module (scsh network).
        (define-errno-syscall): copied from syscalls.scm.
        * netconst.scm: define module (scsh netconst).
        (maybe-define, maybe-define-so): export the generated definitions.
        * fr.scm: define module (scsh fr).
        * awk.scm: define module (scsh awk).
        * newports.scm: define module (scsh newports).
        * time.scm: define module (scsh time).
        * filesys.scm: define module (scsh filesys).
        rename-file: use guile primitive rename-file instead of
        %rename-file.
        * filemtch.scm: file removed.  it's deprecated/obsolete/broken.
        * glob.scm: define module (scsh glob).
        * fileinfo.scm: define module (scsh fileinfo).
        * syntax.scm: define module (scsh syntax).
        * init.scm: load new modules.
        * Makefile.am (pkgdata_DATA): filemtch.scm removed.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/ChangeLog.diff?r1=1.46&r2=1.47
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/Makefile.am.diff?r1=1.21&r2=1.22
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/USAGE.diff?r1=1.4&r2=1.5
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/awk.scm.diff?r1=1.2&r2=1.3
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/fileinfo.scm.diff?r1=1.2&r2=1.3
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/filesys.scm.diff?r1=1.2&r2=1.3
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/fr.scm.diff?r1=1.2&r2=1.3
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/glob.scm.diff?r1=1.2&r2=1.3
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/init.scm.diff?r1=1.35&r2=1.36
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/netconst.scm.diff?r1=1.3&r2=1.4
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/network.scm.diff?r1=1.9&r2=1.10
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/newports.scm.diff?r1=1.1&r2=1.2
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/procobj.scm.diff?r1=1.4&r2=1.5
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/rdelim.scm.diff?r1=1.5&r2=1.6
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/scsh.scm.diff?r1=1.9&r2=1.10
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/syntax.scm.diff?r1=1.3&r2=1.4
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/syscalls.scm.diff?r1=1.13&r2=1.14
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/time.scm.diff?r1=1.6&r2=1.7
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/filemtch.scm.diff?r1=1.2&r2=NONE

Patches:
Index: guile/guile-scsh/ChangeLog
diff -u guile/guile-scsh/ChangeLog:1.46 guile/guile-scsh/ChangeLog:1.47
--- guile/guile-scsh/ChangeLog:1.46     Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/ChangeLog  Mon Dec  4 15:18:03 2000
@@ -1,3 +1,29 @@
+2000-12-04  Gary Houston  <address@hidden>
+
+       * scsh.scm: define module (scsh scsh).
+       (command-line-arguments): define directly here instead of in init.scm.
+       (init-scsh-vars): call here instead of in init.scm.
+       (exit): removed, use Guile definition.
+
+       * syscalls.scm (define-errno-syscall): don't export
+       * network.scm: define module (scsh network).
+       (define-errno-syscall): copied from syscalls.scm.
+       * netconst.scm: define module (scsh netconst).
+       (maybe-define, maybe-define-so): export the generated definitions.
+       * fr.scm: define module (scsh fr).
+       * awk.scm: define module (scsh awk).
+       * newports.scm: define module (scsh newports).
+       * time.scm: define module (scsh time).
+       * filesys.scm: define module (scsh filesys).
+       rename-file: use guile primitive rename-file instead of
+       %rename-file.
+       * filemtch.scm: file removed.  it's deprecated/obsolete/broken.
+       * glob.scm: define module (scsh glob).
+       * fileinfo.scm: define module (scsh fileinfo).
+       * syntax.scm: define module (scsh syntax).
+       * init.scm: load new modules.
+       * Makefile.am (pkgdata_DATA): filemtch.scm removed.
+
 2000-12-02  Gary Houston  <address@hidden>
 
        * receive.scm: removed.
Index: guile/guile-scsh/Makefile.am
diff -u guile/guile-scsh/Makefile.am:1.21 guile/guile-scsh/Makefile.am:1.22
--- guile/guile-scsh/Makefile.am:1.21   Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/Makefile.am        Mon Dec  4 15:18:03 2000
@@ -7,7 +7,7 @@
 pkgdata_DATA = alt-syntax.scm ascii.scm awk.scm bitwise.scm \
        char-set.scm define-foreign-syntax.scm \
        defrec.scm ekko.scm errno.scm features.scm \
-       fileinfo.scm filemtch.scm filesys.scm \
+       fileinfo.scm filesys.scm \
        fluid.scm fname.scm fr.scm glob.scm here.scm \
        init.scm jar-defrecord.scm let-opt.scm \
        lib/list-lib.scm lib/string-lib.scm \
Index: guile/guile-scsh/USAGE
diff -u guile/guile-scsh/USAGE:1.4 guile/guile-scsh/USAGE:1.5
--- guile/guile-scsh/USAGE:1.4  Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/USAGE      Mon Dec  4 15:18:03 2000
@@ -119,6 +119,8 @@
 (regexp-fold regexp-fold-right regexp-for-each)
 
 (scsh rx re-syntax)
+;; rx macro generates code that requires
+;; (scsh rx re)
 (sre-form? expand-rx if-sre-form rx)
 
 (scsh rx parse)
Index: guile/guile-scsh/awk.scm
diff -u guile/guile-scsh/awk.scm:1.2 guile/guile-scsh/awk.scm:1.3
--- guile/guile-scsh/awk.scm:1.2        Mon Sep  4 11:37:13 2000
+++ guile/guile-scsh/awk.scm    Mon Dec  4 15:18:03 2000
@@ -1,6 +1,17 @@
 ;;; An awk loop, after the design of David Albertz and Olin Shivers.
 ;;; Copyright (c) 1994 by Olin Shivers. See file COPYING.
 
+(define-module (scsh awk)
+  :use-module (ice-9 receive)
+  :use-module (scsh utilities)
+  :use-module (scsh alt-syntax)
+  :use-module (scsh rx parse)
+  :use-module (scsh rx re-low)
+  :use-module (scsh rx re-high)
+  :use-module (scsh rx re-syntax)
+)
+(export-syntax awk)
+
 ;;; This uses the new RX SRE syntax. Defines a Clinger-Rees expander for
 ;;; the old, pre-SRE syntax AWK, and one for the new SRE-syntax AWK.
 
Index: guile/guile-scsh/fileinfo.scm
diff -u guile/guile-scsh/fileinfo.scm:1.2 guile/guile-scsh/fileinfo.scm:1.3
--- guile/guile-scsh/fileinfo.scm:1.2   Mon Sep  4 11:37:14 2000
+++ guile/guile-scsh/fileinfo.scm       Mon Dec  4 15:18:03 2000
@@ -4,6 +4,26 @@
 ;;; and report on the file it references. chase? = #f means check the actual
 ;;; file itself, even if it's a symlink.
 
+(define-module (scsh fileinfo)
+  :use-module (scsh syscalls)
+  :use-module (scsh scsh-condition)
+  :use-module (scsh bitwise)
+  :use-module (scsh fname)
+  :use-module (scsh let-opt)
+  :use-module (scsh syntax)
+  :use-module (scsh alt-syntax)
+  :use-module (scsh utilities)
+  :use-module (scsh errno)
+)
+(export file-not-readable? file-not-writable? file-not-executable?
+       file-readable? file-writable? file-executable?
+       file-not-exists? file-exists?
+       file-type file-group file-inode file-last-access file-last-mod
+       file-last-status-change file-mode file-nlinks file-owner
+       file-size
+       file-directory? file-fifo? file-regular? file-socket? file-special?
+       file-symlink?)
+
 ;;; (file-not-accessible? perms fd/port/fname)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; PERMS is 3 bits, not 9.
Index: guile/guile-scsh/filesys.scm
diff -u guile/guile-scsh/filesys.scm:1.2 guile/guile-scsh/filesys.scm:1.3
--- guile/guile-scsh/filesys.scm:1.2    Mon Sep  4 11:37:14 2000
+++ guile/guile-scsh/filesys.scm        Mon Dec  4 15:18:03 2000
@@ -2,6 +2,17 @@
 ;;; create-{directory,fifo,hard-link,symlink}
 ;;; Copyright (c) 1993 by Olin Shivers. See file COPYING.
 
+(define-module (scsh filesys)
+  :use-module (scsh scsh-condition)
+  :use-module (scsh syscalls)
+  :use-module (scsh let-opt)
+  :use-module (scsh fileinfo)
+  :use-module (scsh errno)
+  :use-module (scsh scsh)
+)
+(export delete-filesys-object create-directory create-fifo create-hard-link
+       create-symlink rename-file)
+
 ;;; This procedure nukes FNAME, whatever it may be: directory, file, fifo,
 ;;; symlink.
 ;;;
@@ -102,6 +113,9 @@
 ;;; do the rename, we could end up overriding it, when the user asked
 ;;; us not to. That's life in the food chain.
 
+(if (not (defined? 'guile-rename-file))
+    (define guile-rename-file rename-file))
+
 (define (rename-file old-fname new-fname . maybe-override?)
   (let ((override? (:optional maybe-override? #f)))
     (if (or (and override? (not (eq? override? 'query)))
@@ -109,4 +123,4 @@
            (and override?
                 (y-or-n? (string-append "rename-file:" new-fname
                                         " already exists. Delete"))))
-       (%rename-file old-fname new-fname))))
+       (guile-rename-file old-fname new-fname))))
Index: guile/guile-scsh/fr.scm
diff -u guile/guile-scsh/fr.scm:1.2 guile/guile-scsh/fr.scm:1.3
--- guile/guile-scsh/fr.scm:1.2 Mon Sep  4 11:37:14 2000
+++ guile/guile-scsh/fr.scm     Mon Dec  4 15:18:03 2000
@@ -7,6 +7,19 @@
 ;;; - Should I change the field-splitters to return lists? It's the
 ;;;   right thing, and costs nothing in terms of efficiency.
 
+(define-module (scsh fr)
+  :use-module (ice-9 receive)
+  :use-module (scsh let-opt)
+  :use-module (scsh char-set)
+  :use-module (scsh rdelim)
+  :use-module (scsh rx re)
+  :use-module (scsh rx re-low)
+  :use-module (scsh rx re-high)
+  :use-module (scsh rx re-syntax)
+)
+(export field-splitter infix-splitter suffix-splitter sloppy-suffix-splitter
+       record-reader field-reader)
+
 ;;; Looping primitives:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; It is nicer for loops that loop over a bunch of different things
Index: guile/guile-scsh/glob.scm
diff -u guile/guile-scsh/glob.scm:1.2 guile/guile-scsh/glob.scm:1.3
--- guile/guile-scsh/glob.scm:1.2       Mon Sep  4 11:37:14 2000
+++ guile/guile-scsh/glob.scm   Mon Dec  4 15:18:03 2000
@@ -8,6 +8,19 @@
 ;;; so long as you don't charge money for it, remove this notice, or
 ;;; hold us liable for any results of its use.  --enjoy.
 
+(define-module (scsh glob)
+  :use-module (ice-9 receive)
+  :use-module (scsh fname)
+  :use-module (scsh fileinfo)
+  :use-module (scsh rx re-high)
+  :use-module (scsh rx re)
+  :use-module (scsh utilities)
+  :use-module (scsh char-set)
+  :use-module (scsh scsh-condition)
+  :use-module (scsh syscalls)
+)
+(export glob glob-quote maybe-directory-files)
+
 ;;; Usage:     (glob pattern-list)
 ;;;                 pattern-list := a list of glob-pattern strings
 
Index: guile/guile-scsh/init.scm
diff -u guile/guile-scsh/init.scm:1.35 guile/guile-scsh/init.scm:1.36
--- guile/guile-scsh/init.scm:1.35      Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/init.scm   Mon Dec  4 15:18:03 2000
@@ -37,7 +37,11 @@
             (scsh rx oldfuns)
             (scsh rx re-subst)
             (scsh rx re-fold)
+
+            ;; rx macro generates code that requires
+            ;; (scsh rx re)
             (scsh rx re-syntax)
+
             (scsh rx parse)
             (scsh rx rx-lib)
 
@@ -64,20 +68,31 @@
             ;; map map-in-order for-each member assoc iota list-index
             ;; delete delete!
             (scsh lib list-lib)
-)
+
+            ;; define-simple-syntax generates code that requires
+            ;; (scsh alt-syntax).
+            (scsh syntax)
+
+            (scsh fileinfo)
+            (scsh glob)
 
-(load-from-path "scsh/syntax.scm")
-(load-from-path "scsh/fileinfo.scm")
-(load-from-path "scsh/glob.scm")
-(load-from-path "scsh/filemtch.scm")
-(load-from-path "scsh/filesys.scm")
-(load-from-path "scsh/time.scm")
-(load-from-path "scsh/newports.scm")
-(load-from-path "scsh/awk.scm")
-(load-from-path "scsh/fr.scm")
-(load-from-path "scsh/netconst.scm")
-(load-from-path "scsh/network.scm")
-(load-from-path "scsh/scsh.scm")
+            ;; replaces rename-file.
+            (scsh filesys)
+            
+            (scsh time)
+            (scsh newports)
+
+            (scsh fr)
+
+            ;; the awk macro generates code that reqiures:
+            ;; (scsh rx re-syntax)
+            ;; (scsh rx re)
+            ;; (scsh rx re-high)
+            (scsh awk)
 
-(init-scsh-vars #f)
-(set! command-line-arguments (cdr (command-line)))
+            ;; also exports symbols such as address-family/unspecified.
+            (scsh netconst)
+
+            (scsh network)
+            (scsh scsh)
+)
Index: guile/guile-scsh/netconst.scm
diff -u guile/guile-scsh/netconst.scm:1.3 guile/guile-scsh/netconst.scm:1.4
--- guile/guile-scsh/netconst.scm:1.3   Sat Jan 18 10:13:34 1997
+++ guile/guile-scsh/netconst.scm       Mon Dec  4 15:18:03 2000
@@ -1,14 +1,20 @@
+(define-module (scsh netconst))
+(export options/boolean options/value options/linger
+       shutdown/receives shutdown/sends shutdown/sends+receives)
+;; more generated exports below.
+
 (defmacro maybe-define (name value)
-  `(if (defined? ',value)
-       (define ,name ,value)))
+  `(cond ((defined? ',value)
+         (define ,name ,value)
+         (export ,name))))
 
 (defmacro maybe-define-so (name value type)
   (let ((type-var (string->symbol (string-append "options/"
                                                 (symbol->string type)))))
-    `(if (defined? ',value)
-        (begin
-          (define ,name ,value)
-          (set! ,type-var (cons ,value ,type-var))))))
+    `(cond ((defined? ',value)
+           (define ,name ,value)
+           (export ,name)
+           (set! ,type-var (cons ,value ,type-var))))))
 
 (maybe-define address-family/unspecified       AF_UNSPEC)
 (maybe-define address-family/unix              AF_UNIX)
@@ -50,6 +56,3 @@
 (define shutdown/receives      0)
 (define shutdown/sends         1)
 (define shutdown/sends+receives        2)
-
-(undefine maybe-define)
-(undefine maybe-define-so)
Index: guile/guile-scsh/network.scm
diff -u guile/guile-scsh/network.scm:1.9 guile/guile-scsh/network.scm:1.10
--- guile/guile-scsh/network.scm:1.9    Mon Sep  4 11:37:14 2000
+++ guile/guile-scsh/network.scm        Mon Dec  4 15:18:03 2000
@@ -3,6 +3,40 @@
 ;;; Copyright (c) 1994 by Olin Shivers.
 ;;; See file COPYING.
 
+(define-module (scsh network)
+  :use-module (ice-9 receive)
+  :use-module (scsh define-foreign-syntax)
+  :use-module (scsh netconst)
+  :use-module (scsh let-opt)
+  :use-module (scsh errno)
+  :use-module (scsh rw)
+  :use-module (scsh defrec)
+)
+(export bind-listen-accept-loop
+       socket? socket:family socket:inport socket:outport
+       socket-address? socket-address:address socket-address:family
+       internet-address->socket-address socket-address->internet-address
+       create-socket close-socket bind-socket connect-socket
+       listen-socket accept-connection socket-remote-address
+       socket-local-address shutdown-socket create-socket-pair
+       receive-message receive-message!
+       receive-message/partial receive-message!/partial
+       send-message send-message/partial
+       socket-option set-socket-option
+       host-info host-info?
+       host-info:name host-info:aliases host-info:addresses
+       network-info network-info?
+       network-info:name network-info:aliases network-info:net
+       service-info service-info?
+       service-info:name service-info:aliases service-info:port
+       service-info:protocol
+       protocol-info protocol-info?
+       protocol-info:name protocol-info:aliases protocol-info:number
+)
+
+;; noop for Guile.
+(defmacro define-errno-syscall args #f)
+
 ;;; Scheme48 implementation.
 
 (foreign-source
Index: guile/guile-scsh/newports.scm
diff -u guile/guile-scsh/newports.scm:1.1 guile/guile-scsh/newports.scm:1.2
--- guile/guile-scsh/newports.scm:1.1   Mon Jul 28 19:23:29 1997
+++ guile/guile-scsh/newports.scm       Mon Dec  4 15:18:03 2000
@@ -5,6 +5,20 @@
 ;;; Guile version omits the Unix file port system and has other
 ;;; modifications.
 
+(define-module (scsh newports)
+  :use-module (ice-9 receive)
+  :use-module (scsh syntax)
+  :use-module (scsh alt-syntax)
+)
+(export fdport? set-port-buffering 
+       bufpol/block bufpol/line bufpol/none
+       call/fdes close-after
+       with-current-input-port* with-current-output-port*
+       with-current-error-port*
+       with-current-input-port with-current-output-port
+       with-current-error-port
+       set-current-input-port! set-current-output-port!
+       set-current-error-port!)
 
 (define (fdport? x)
   (and (or (input-port? x)
Index: guile/guile-scsh/procobj.scm
diff -u guile/guile-scsh/procobj.scm:1.4 guile/guile-scsh/procobj.scm:1.5
--- guile/guile-scsh/procobj.scm:1.4    Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/procobj.scm        Mon Dec  4 15:18:03 2000
@@ -17,10 +17,11 @@
   :use-module (scsh let-opt)
   :use-module (scsh sighandlers)
   :use-module (scsh weak)
+  :use-module (scsh errno)
 )
 (export proc:pid proc? pid->proc autoreap-policy reap-zombies
        new-child-proc wait/poll wait/stopped-children wait wait-any
-       wait-process-group)
+       wait-process-group reaped-procs)
 
 ;;; Process objects
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Index: guile/guile-scsh/rdelim.scm
diff -u guile/guile-scsh/rdelim.scm:1.5 guile/guile-scsh/rdelim.scm:1.6
--- guile/guile-scsh/rdelim.scm:1.5     Sun Oct 29 11:53:23 2000
+++ guile/guile-scsh/rdelim.scm Mon Dec  4 15:18:03 2000
@@ -9,6 +9,7 @@
   :use-module (scsh rx re-high)
   :use-module (scsh rx re)
   :use-module (scsh rx re-syntax)
+  :use-module (scsh errno)
 )
 
 (export read-line read-paragraph read-delimited read-delimited! skip-char-set)
Index: guile/guile-scsh/scsh.scm
diff -u guile/guile-scsh/scsh.scm:1.9 guile/guile-scsh/scsh.scm:1.10
--- guile/guile-scsh/scsh.scm:1.9       Mon Sep  4 11:37:14 2000
+++ guile/guile-scsh/scsh.scm   Mon Dec  4 15:18:03 2000
@@ -3,6 +3,45 @@
 ;;; Copyright (c) 1994 by Brian D. Carlstrom.
 ;;; See file COPYING.
 
+(define-module (scsh scsh)
+  :use-module (ice-9 receive)
+  :use-module (scsh utilities)
+  :use-module (scsh syscalls)
+  :use-module (scsh syntax)
+  :use-module (scsh alt-syntax)
+  :use-module (scsh bitwise)
+  :use-module (scsh fluid)
+  :use-module (scsh let-opt)
+  :use-module (scsh newports)
+  :use-module (scsh scsh-condition)
+  :use-module (scsh stringcoll)
+  :use-module (scsh fileinfo)
+  :use-module (scsh fname)
+  :use-module (scsh rw)
+  :use-module (scsh sighandlers)
+  :use-module (scsh procobj)
+)
+(export call-terminally fork/pipe %fork/pipe tail-pipe tail-pipe+
+       alist-update alist-compress add-before add-after
+       with-env* with-total-env* with-cwd* with-umask*
+       create-temp-file temp-file-channel
+       run/collecting* run/port+proc*
+       run/port* run/file* run/string* run/strings* run/sexp*
+       run/sexps*
+       port->string port->string-list port->sexp-list
+       port->list port-fold
+       char-filter string-filter y-or-n?
+       stdio->stdports with-stdio-ports* stdports->stdio
+       command-line-arguments arg* arg argv
+       home-directory exec-path-list suspend
+       exec/env exec-path/env exec-path exec
+       fork %fork
+)
+(export-syntax with-cwd with-umask with-env with-total-env
+              run/port run/file run/string run/strings run/sexp run/sexps
+              with-stdio-ports
+)
+
 ;;; Call THUNK, then die.
 ;;; A clever definition in a clever implementation allows the caller's stack
 ;;; and dynamic env to be gc'd away, since this procedure never returns.
@@ -604,7 +643,8 @@
 
 ;;; Some globals.
 ;;(define %command-line '())           ; Includes program.
-(define command-line-arguments #f)     ; Doesn't include program.
+(define command-line-arguments         ; Doesn't include program.
+  (cdr (command-line)))
 
 ;; not implemented in Guile.
 ;;(define (set-command-line-args! args)
@@ -726,11 +766,11 @@
             (lambda () proc)))))))
 
 
-(define (exit . maybe-status)
-  (flush-all-ports)
-  (primitive-exit (:optional  maybe-status 0))
-  (display "The evil undead walk the earth." 2)
-  (error "(exit) returned."))
+;(define (exit . maybe-status)
+;  (flush-all-ports)
+;  (primitive-exit (:optional  maybe-status 0))
+;  (display "The evil undead walk the earth." 2)
+;  (error "(exit) returned."))
 
 
 ;;; The classic T 2.0 primitive.
@@ -763,6 +803,8 @@
              (else (if (not quietly?)
                        (warn "Starting up with no path ($PATH)."))
                    '()))))
+
+(init-scsh-vars #f)
 
 ; SIGTSTP blows s48 away. ???
 (define (suspend) (signal-process 0 signal/stop))
Index: guile/guile-scsh/syntax.scm
diff -u guile/guile-scsh/syntax.scm:1.3 guile/guile-scsh/syntax.scm:1.4
--- guile/guile-scsh/syntax.scm:1.3     Mon Sep  4 11:37:14 2000
+++ guile/guile-scsh/syntax.scm Mon Dec  4 15:18:03 2000
@@ -2,6 +2,16 @@
 ;;; Translating process forms into Scheme code.
 ;;; Copyright (c) 1993 by Olin Shivers. See file COPYING.
 
+(define-module (scsh syntax)
+  :use-module (scsh alt-syntax)
+  :use-module (scsh syntax-helpers)
+  :use-module (scsh procobj)
+  :use-module (scsh scsh)
+)
+(export-syntax define-simple-syntax exec-epf & run || && run-collecting
+              run/port+proc run/port run/strings run/file run/string
+              run/sexp run/sexps)
+
 (define-syntax define-simple-syntax
   (syntax-rules ()
     ((define-simple-syntax (name . pattern) result)
@@ -60,8 +70,8 @@
 (define-simple-syntax (run/sexps . epf)
   (run/sexps* (lambda () (exec-epf . epf))))
 
-(define-simple-syntax (run/pty . epf)
-  (run/pty* (lambda () (exec-epf . epf))))
+;(define-simple-syntax (run/pty . epf)
+;  (run/pty* (lambda () (exec-epf . epf))))
 
 ;(define (expand-mac transformer form)
 ;  (transformer form (lambda (x) x) eq?))
Index: guile/guile-scsh/syscalls.scm
diff -u guile/guile-scsh/syscalls.scm:1.13 guile/guile-scsh/syscalls.scm:1.14
--- guile/guile-scsh/syscalls.scm:1.13  Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/syscalls.scm       Mon Dec  4 15:18:03 2000
@@ -13,6 +13,7 @@
   :use-module (scsh fname)
   :use-module (scsh defrec)
   :use-module (scsh procobj)
+  :use-module (scsh errno)
 )
 (export %exec %%fork cwd user-gid user-effective-gid set-gid
        user-supplementary-gids user-uid user-effective-uid set-uid
@@ -39,8 +40,6 @@
        open/no-control-tty fdflags/close-on-exec
        sleep sleep-until
        system-name)
-
-(export-syntax define-errno-syscall)
 
 (foreign-source
   "#include <sys/signal.h>"
Index: guile/guile-scsh/time.scm
diff -u guile/guile-scsh/time.scm:1.6 guile/guile-scsh/time.scm:1.7
--- guile/guile-scsh/time.scm:1.6       Mon Sep  4 11:37:14 2000
+++ guile/guile-scsh/time.scm   Mon Dec  4 15:18:03 2000
@@ -1,6 +1,59 @@
 ;;; Time interface for scsh.
 ;;; Copyright (c) 1994 by Olin Shivers. See file COPYING.
 
+(define-module (scsh time)
+  :use-module (scsh define-foreign-syntax)
+  :use-module (scsh defrec)
+  :use-module (scsh let-opt)
+  :use-module (scsh utilities)
+  :use-module (ice-9 receive)
+)
+(export make-date
+       date?
+
+       date:seconds
+       date:minute     
+       date:hour       
+       date:month-day  
+       date:month      
+       date:year       
+       date:tz-name    
+       date:tz-secs    
+       date:summer?    
+       date:week-day   
+       date:year-day
+
+       set-date:seconds
+       set-date:minute 
+       set-date:hour           
+       set-date:month-day      
+       set-date:month          
+       set-date:year           
+       set-date:tz-name        
+       set-date:tz-secs        
+       set-date:summer?        
+       set-date:week-day       
+       set-date:year-day
+
+       modify-date:seconds
+       modify-date:minute      
+       modify-date:hour        
+       modify-date:month-day   
+       modify-date:month       
+       modify-date:year        
+       modify-date:tz-name     
+       modify-date:tz-secs     
+       modify-date:summer?     
+       modify-date:week-day    
+       modify-date:year-day
+
+       time+ticks
+       ticks/sec
+       time
+       date
+       date->string
+       format-date)
+
 ;;; Should I have a (FILL-IN-DATE! date) procedure that fills in
 ;;; the redundant info in a date record?
 ;;; - month-day & month defined -> week-day & year-day filled in.