From c91003e34b7b98c828da68e205312dd81f5aaa7b Mon Sep 17 00:00:00 2001 From: Nikolay Puzanov Date: Sun, 4 Dec 2022 19:53:56 +0300 Subject: [PATCH] Replace string-trim (left only trim) by string-trim-both --- _web_server/server/playground-server.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/_web_server/server/playground-server.scm b/_web_server/server/playground-server.scm index 0780b0d..88eda9c 100755 --- a/_web_server/server/playground-server.scm +++ b/_web_server/server/playground-server.scm @@ -454,7 +454,7 @@ ;;; Get storage dir from URI ;;; (define (get-storage-dir uri root-path) - (string-trim + (string-trim-both (substring (uri-path uri) (string-length root-path)) #\/)) @@ -570,6 +570,7 @@ ""))) (logger LOG-VERBOSE "Request ~a:~a" (request-method request) path) + (logger LOG-VERBOSE "Request query:~a" (uri-query (request-uri request))) (logger LOG-DBG " stor:'~a' len:~a/~a" ref-stor-dir (request-content-length request) @@ -728,7 +729,7 @@ (define (string-trim-if-string str) (if (string? str) - (string-trim str) + (string-trim-both str) str)) (define (main args) @@ -752,20 +753,20 @@ '(("log-level") required) '(("help" #\h) none)))) - (let ((addr (string-trim (or (option-get opts "addr") "127.0.0.1"))) - (port (string->number (string-trim (or (option-get opts "port") "8080")))) - (host (string-trim (or (option-get opts "host") "http://127.0.0.1:8080"))) - (root (string-trim (or (option-get opts "root") ""))) + (let ((addr (string-trim-both (or (option-get opts "addr") "127.0.0.1"))) + (port (string->number (string-trim-both (or (option-get opts "port") "8080")))) + (host (string-trim-both (or (option-get opts "host") "http://127.0.0.1:8080"))) + (root (string-trim-both (or (option-get opts "root") ""))) (vvp-wrap (string-trim-if-string (option-get opts "vvp-wrap"))) (iverilog-wrap (string-trim-if-string (option-get opts "iverilog-wrap"))) (verilator-wrap (string-trim-if-string (option-get opts "verilator-wrap"))) (verilator-sim-wrap (string-trim-if-string (option-get opts "verilator-sim-wrap"))) - (verilator-build-jobs (string->number (string-trim (or (option-get opts "verilator-build-jobs") "0")))) - (max-code-size (string->number (string-trim (or (option-get opts "max-len") "0")))) + (verilator-build-jobs (string->number (string-trim-both (or (option-get opts "verilator-build-jobs") "0")))) + (max-code-size (string->number (string-trim-both (or (option-get opts "max-len") "0")))) (sanitize (not (option-get opts "dont-sanitize"))) - (work-base (string-trim (or (option-get opts "work-base") "./"))) - (stor-base (string-trim (or (option-get opts "stor-base") "./"))) - (log-level (string->number (string-trim (or (option-get opts "log-level") "1"))))) + (work-base (string-trim-both (or (option-get opts "work-base") "./"))) + (stor-base (string-trim-both (or (option-get opts "stor-base") "./"))) + (log-level (string->number (string-trim-both (or (option-get opts "log-level") "1"))))) (cond (err