;;; Global constants
-(define scratchy-version "1.3.0")
+(define scratchy-version "1.4.1")
(define scratchy-footer
(conc "\n"
(serve-selector selector config)))
(print "... served selector '" selector "'. Closing connection."))
(o (exn)
- (print-error-message o out-port)
(print-error-message o)
+ (print "Invalid selector.")
(print "Error while attempting to serve selector " selector "."))))
(begin
(print "Connection from blacklisted IP. Closing.")
(if (legal-script-filename? filename config)
(let* ((sexp (with-input-from-file filename read))
(script-result (with-selector-dir
- selector config
+ (pathname-directory selector) config
(lambda ()
(apply (eval sexp) arguments)))))
(when (pair? script-result)
dir-selector config))
((type display-string selector)
(serve-record (list type display-string
- (make-pathname dir-selector selector)
+ (normalize-pathname (make-pathname dir-selector selector))
(config-host config) (config-port config))
dir-selector config))
((display-string selector)
(define (main)
(let* ((progname (pathname-file (car (argv))))
(config (make-config '() '() 70 #t '() '() '() '())))
- (if (null? (cdr (argv)))
+ (if (null? (command-line-arguments))
(print-usage progname)
- (let loop ((args (cdr (argv))))
+ (let loop ((args (command-line-arguments)))
(let ((this-arg (car args))
(rest-args (cdr args)))
(if (string-prefix? "-" this-arg)