Index: archivemod.scm ================================================================== --- archivemod.scm +++ archivemod.scm @@ -22,12 +22,12 @@ (declare (uses commonmod)) (module archivemod * -(import scheme chicken data-structures extras) -(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable) +(import scheme (chicken base)) +(import (prefix sqlite3 sqlite3:) typed-records srfi-18 srfi-69 format (chicken port) srfi-1 matchable) (import commonmod) ;; (use (prefix ulex ulex:)) (include "common_records.scm") Index: clientmod.scm ================================================================== --- clientmod.scm +++ clientmod.scm @@ -22,12 +22,12 @@ (declare (uses commonmod)) (module clientmod * -(import scheme chicken data-structures extras) -(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable) +(import scheme (chicken base)) +(import (prefix sqlite3 sqlite3:) typed-records srfi-18 srfi-69 format (chicken port) srfi-1 matchable) (import commonmod) ;; (use (prefix ulex ulex:)) (include "common_records.scm") Index: envmod.scm ================================================================== --- envmod.scm +++ envmod.scm @@ -22,12 +22,12 @@ (declare (uses commonmod)) (module envmod * -(import scheme chicken data-structures extras) -(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable) +(import scheme (chicken base)) +(import (prefix sqlite3 sqlite3:) typed-records srfi-18 srfi-69 format (chicken port) srfi-1 matchable) (import commonmod) ;; (use (prefix ulex ulex:)) (include "common_records.scm") Index: ezstepsmod.scm ================================================================== --- ezstepsmod.scm +++ ezstepsmod.scm @@ -22,12 +22,12 @@ (declare (uses commonmod)) (module ezstepsmod * -(import scheme chicken data-structures extras) -(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable) +(import scheme (chicken base)) +(import (prefix sqlite3 sqlite3:) typed-records srfi-18 srfi-69 format (chicken port) srfi-1 matchable) (import commonmod) ;; (use (prefix ulex ulex:)) (include "common_records.scm") Index: mtargs/mtargs.scm ================================================================== --- mtargs/mtargs.scm +++ mtargs/mtargs.scm @@ -26,12 +26,12 @@ print-args any-defined? help ) -(import scheme chicken data-structures extras posix ports files) -(use srfi-69 srfi-1) +(import scheme (chicken base) (chicken port) (chicken file) (chicken process-context)) +(import srfi-69 srfi-1) (define arg-hash (make-hash-table)) (define help "") (define (get-arg arg . default) Index: mtconfigf/mtconfigf.scm ================================================================== --- mtconfigf/mtconfigf.scm +++ mtconfigf/mtconfigf.scm @@ -72,14 +72,15 @@ realpath find-chicken-lib ) (import scheme (chicken base) (chicken string) (chicken file) (chicken port)) -(import typed-records srfi-18 pathname-expand posix-extras) -(import regex regex-case srfi-69 srfi-1 directory-utils extras srfi-13 ) -(import srfi-69) -(import posix) +(import typed-records srfi-18 pathname-expand) +(import regex regex-case srfi-69 srfi-1 directory-utils srfi-13 ) +(import (chicken io) (chicken condition) (chicken process-context)) +(import (chicken process) (chicken pathname) (chicken pretty-print) (chicken time)) +(import srfi-69 (chicken platform) (chicken sort)) ;; stub debug printers overridden by set-debug-printers (define (debug:print n e . args) (apply print args)) (define (debug:print-info n e . args) @@ -92,19 +93,19 @@ ;; FROM common.scm ;; ;; this plugs a hole in posix-extras in recent chicken versions > 4.9) -(let-values (( (chicken-release-number chicken-major-version) - (apply values - (map string->number - (take - (string-split (chicken-version) ".") - 2))))) - (if (or (> chicken-release-number 4) - (and (eq? 4 chicken-release-number) (> chicken-major-version 9))) - (define ##sys#expand-home-path pathname-expand))) +;;;(let-values (( (chicken-release-number chicken-major-version) +;;; (apply values +;;; (map string->number +;;; (take +;;; (string-split (chicken-version) ".") +;;; 2))))) +;;; (if (or (> chicken-release-number 4) +;;; (and (eq? 4 chicken-release-number) (> chicken-major-version 9))) +;;; (define ##sys#expand-home-path pathname-expand))) ;;(define (set-verbosity v)(debug:set-verbosity v)) (define *default-log-port* (current-error-port)) @@ -216,11 +217,11 @@ (if (and (string? val) (string? key)) (handle-exceptions exn (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val) - (setenv key val)) + (set-environment-variable! key val)) (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val)))) ;; accept an alist or hash table containing envvar/env value pairs (value of #f causes unset) ;; execute thunk in context of environment modified as per this list ;; restore env to prior state then return value of eval'd thunk. @@ -237,26 +238,26 @@ (new-val (let ((tmp (cdr env-pair))) (if (list? tmp) (car tmp) tmp))) (current-val (get-environment-variable env-var)) (restore-thunk (cond - ((not current-val) (lambda () (unsetenv env-var))) + ((not current-val) (lambda () (unset-environment-variable! env-var))) ((not (string? new-val)) #f) ((eq? current-val new-val) #f) (else - (lambda () (setenv env-var current-val)))))) + (lambda () (set-environment-variable! env-var current-val)))))) ;;(when (not (string? new-val)) ;; (debug:print 0 *default-log-port* " PROBLEM: not a string: "new-val"\n from env-alist:\n"delta-env-alist) ;; (pp delta-env-alist) ;; (exit 1)) (cond ((not new-val) ;; modify env here - (unsetenv env-var)) + (unset-environment-variable! env-var)) ((string? new-val) - (setenv env-var new-val))) + (set-environment-variable! env-var new-val))) restore-thunk)) delta-env-alist)))) (let ((rv (thunk))) (for-each (lambda (x) (x)) restore-thunks) ;; restore env to original state rv))) @@ -683,11 +684,11 @@ (configf:script-rx ( x include-script params);; handle-exceptions ;; exn ;; (begin ;; (debug:print '(0 2 9) #f "INFO: include from script " include-script " failed.") ;; (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (if (and (safe-file-exists? include-script)(file-execute-access? include-script)) + (if (and (safe-file-exists? include-script)(file-executable? include-script)) (let* ((local-allow-system (calc-allow-system allow-system curr-section-name sections)) (env-delta (cfgdat->env-alist curr-section-name res local-allow-system)) (new-inp-port (with-env-vars env-delta @@ -819,11 +820,11 @@ (let* ((curr-dir (current-directory)) (configinfo (find-config fname toppath: given-toppath)) (toppath (car configinfo)) (configfile (cadr configinfo))) (if toppath (change-directory toppath)) - (if (and toppath pathenvvar)(setenv pathenvvar toppath)) + (if (and toppath pathenvvar)(set-environment-variable! pathenvvar toppath)) (let ((configdat (if configfile (read-config configfile #f #t environ-patt: environ-patt post-section-procs: (if set-fields (list (cons "^fields$" set-fields) ) '()) #f keep-filenames: keep-filenames)))) @@ -1051,11 +1052,11 @@ ;; returns (list dat msg) (define (read-refdb refdb-path) (let ((sheets-file (conc refdb-path "/sheet-names.cfg"))) (if (not (safe-file-exists? sheets-file)) (list #f (conc "ERROR: no refdb found at " refdb-path)) - (if (not (file-read-access? sheets-file)) + (if (not (file-readable? sheets-file)) (list #f (conc "ERROR: refdb file not readable at " refdb-path)) (let* ((sheets (with-input-from-file sheets-file (lambda () (let loop ((inl (read-line)) (res '()))