diff --git a/scheme/packages.scm b/scheme/packages.scm index 07527eb..bb00f70 100644 --- a/scheme/packages.scm +++ b/scheme/packages.scm @@ -418,22 +418,26 @@ ;; Net protocols and formats (define-structure parse-html-forms parse-html-forms-interface - (open scsh + (open scheme-with-scsh scsh-utilities let-opt srfi-13 receiving - uri - scheme) + uri) (files (lib parse-forms))) (define-structure htmlout htmlout-interface - (open scsh scsh-utilities srfi-13 formats ascii receiving scheme) + (open scheme-with-scsh + scsh-utilities + srfi-13 + formats + ascii + receiving) (files (lib htmlout))) (define-structure smtp smtp-interface - (open scsh ; write-string read-string/partial force-output + (open scheme-with-scsh ; user-login-name and sockets (subset srfi-1 (filter-map)) crlf-io ; read-crlf-line write-crlf @@ -441,11 +445,12 @@ let-opt ; let-optionals error-package ; error dns ; SYSTEM-FQDN - scheme) + ) (files (lib smtp))) (define-structure rfc822 rfc822-interface - (open receiving ; MV return (RECEIVE and VALUES) + (open scheme-with-scsh + receiving ; MV return (RECEIVE and VALUES) scsh-utilities ; index srfi-13 srfi-1 ; fold @@ -453,36 +458,34 @@ crlf-io ; read-crlf-line ascii ; ascii->char error-package ; error - scsh ; string-join - scheme) + ) (files (lib rfc822))) (define-structure uri uri-interface - (open scsh-utilities + (open scheme-with-scsh srfi-13 let-opt receiving ascii srfi-14 bitwise - field-reader-package - scheme) + field-reader-package) (files (lib uri))) (define-structure url url-interface - (open defrec-package + (open scheme-with-scsh + scsh-utilities + defrec-package receiving srfi-13 srfi-14 uri - scsh-utilities - httpd-error - scheme) + httpd-error) (files (lib url))) (define-structure ftp ftp-interface - (open netrc - scsh + (open scheme-with-scsh + netrc defrec-package receiving handle @@ -492,13 +495,11 @@ srfi-13 let-opt sunet-utilities - crlf-io - scheme) + crlf-io) (files (lib ftp))) (define-structure ftp-obsolete ftp-obsolete-interface - (open scsh - scheme + (open scheme ftp) (begin (define ftp:connect ftp-connect) @@ -522,36 +523,31 @@ (define ftp:append ftp-append) (define ftp:quot ftp-quot))) - - (define-structure netrc netrc-interface - (open defrec-package + (open scheme-with-scsh + defrec-package records - scsh error-package srfi-13 conditions signals handle sunet-utilities - let-opt - scheme) + let-opt) (files (lib netrc))) (define-structure pop3 pop3-interface - (open netrc - scsh + (open scheme-with-scsh + netrc defrec-package handle conditions signals srfi-13 let-opt - crlf-io - scheme) + crlf-io) (files (lib pop3))) (define-structure pop3-obsolete pop3-obsolete-interface - (open scsh - scheme + (open scheme pop3) (begin (define pop3:connect pop3-connect) @@ -565,21 +561,18 @@ (define pop3:quit pop3-quit))) (define-structure nettime nettime-interface - (open scsh - scheme) + (open scheme-with-scsh) (files (lib nettime))) (define-structure nettime-obsolete nettime-obsolete-interface - (open scsh - scheme + (open scheme nettime) (begin (define net:time net-time) (define net:daytime net-daytime))) (define-structure dns dns-interface - (open scheme - scsh + (open scheme-with-scsh big-util tables ascii @@ -596,10 +589,9 @@ (files (lib dns))) (define-structure cgi-script cgi-script-interface - (open scsh + (open scheme-with-scsh error-package - parse-html-forms - scheme) + parse-html-forms) (files (lib cgi-script))) ;; Utility libraries @@ -612,31 +604,29 @@ (files (lib rate-limit))) (define-structure crlf-io crlf-io-interface - (open ascii ; ascii->char - scsh ; read-line write-string force-output + (open scheme-with-scsh + ascii ; ascii->char receiving ; MV return (RECEIVE and VALUES) let-opt ; let-optionals threads ; sleep - scheme) + ) (files (lib crlf-io))) (define-structure ls ls-interface - (open scheme handle + (open scheme-with-scsh + handle big-scheme bitwise fluids - crlf-io - scsh) + crlf-io) (files (lib ls))) (define-structure format-net format-net-interface - (open scsh - scheme - let-opt) ; :optional + (open scheme-with-scsh + let-opt) (files (lib format-net))) (define-structure sunet-utilities sunet-utilities-interface - (open scsh - scheme + (open scheme-with-scsh format-net sigevents let-opt @@ -674,8 +664,8 @@ ;; Web server (define-structure httpd-core httpd-core-interface - (open thread-fluids ; fork-thread - scsh + (open scheme-with-scsh + thread-fluids ; fork-thread receiving ; receive crlf-io ; write-crlf, read-crlf-line rfc822 ; read-rfc822-headers @@ -703,7 +693,6 @@ httpd-responses sunet-version - scheme srfi-1) ; find (files (httpd core))) @@ -714,13 +703,13 @@ (files (httpd options))) (define-structure httpd-access-control httpd-access-control-interface - (open big-scheme + (open scheme-with-scsh + big-scheme httpd-responses httpd-requests httpd-error srfi-13 ; STRING-MAP - scsh - scheme) + ) (files (httpd access-control))) (define-structure httpd-error httpd-error-interface @@ -728,7 +717,8 @@ (files (httpd error))) (define-structure httpd-logging httpd-logging-interface - (open httpd-read-options + (open scheme-with-scsh + httpd-read-options i/o ; make-null-output-port locks ; make-lock obtain-lock release-lock receiving ; receive @@ -744,15 +734,14 @@ dns ; dns-lookup-ip defrec-package ; define-record thread-fluids ; make-preserved-fluid et al. - - scsh - scheme) + ) (files (httpd logging))) (define-structure httpd-requests httpd-requests-interface - (open define-record-types ;; define-record-discloser + (open scheme + define-record-types ;; define-record-discloser defrec-package ;; define-record - scheme) + ) (files (httpd request))) (define-structure httpd-responses httpd-responses-interface @@ -768,7 +757,7 @@ (files (httpd response))) (define-structure httpd-basic-handlers httpd-basic-handlers-interface - (open scheme scsh + (open scheme-with-scsh rfc822 httpd-requests ; REQUEST record type, v0.9-request srfi-1 ; FOLD-RIGHT @@ -778,7 +767,7 @@ (files (httpd handlers))) (define-structure httpd-file-directory-handlers httpd-file-directory-handlers-interface - (open scheme scsh + (open scheme-with-scsh httpd-core httpd-requests httpd-responses @@ -796,7 +785,7 @@ (files (httpd file-dir-handler))) (define-structure seval-handler seval-handler-interface - (open scsh ; syscalls & INDEX + (open scheme-with-scsh ; syscalls & INDEX httpd-error httpd-requests ; v0.9-request httpd-responses @@ -805,17 +794,18 @@ htmlout ; Formatted HTML output error-package ; ERROR pp ; Pretty-printer - srfi-13 ; STRING-SKIP + srfi-13 ; STRING-SKIP rfc822 toothless-eval ; EVAL-SAFELY handle ; IGNORE-ERROR parse-html-forms ; PARSE-HTML-FORM-QUERY threads ; SLEEP - scheme) + ) (files (httpd seval))) (define-structure info-gateway info-gateway-interface - (open big-scheme + (open scheme-with-scsh + big-scheme srfi-13 conditions signals handle htmlout @@ -824,13 +814,12 @@ httpd-error url uri - scsh - handle-fatal-error - scheme) + handle-fatal-error) (files (httpd info-gateway))) (define-structure rman-gateway rman-gateway-interface - (open httpd-responses + (open scheme-with-scsh + httpd-responses httpd-requests httpd-error conditions @@ -839,15 +828,14 @@ htmlout httpd-basic-handlers handle-fatal-error - scsh let-opt sunet-utilities - srfi-13 - scheme) + srfi-13) (files (httpd rman-gateway))) (define-structure cgi-server cgi-server-interface - (open srfi-13 + (open scheme-with-scsh + srfi-13 rfc822 crlf-io ; WRITE-CRLF uri @@ -860,13 +848,12 @@ httpd-file-directory-handlers ; dot-dot-check, copy-inport->outport sunet-version scsh-utilities ; INDEX - scsh ; syscalls formats ; format format-net ; FORMAT-INTERNET-HOST-ADDRESS sunet-utilities ; host-name-or-empty let-opt ; let-optionals handle-fatal-error - scheme) + ) (files (httpd cgi-server))) (define-structure loser (export loser) @@ -890,12 +877,12 @@ (define scheme-report-environment (loser "scheme-report-environment")))) (define-structure toothless-eval toothless-eval-interface - (open evaluation ; eval + (open scheme package-commands-internal ; config-package, get-reflective-tower packages ; structure-package, make-simple-package environments ; environment-ref handle ; ignore-errors - scheme) + ) (access toothless) ; Force it to be loaded. (begin