Overview
| Comment: | Ensure that strings passed to setenv are not junk and let user know |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
c13908f9935a80f590d2cc2fc7d0f23c |
| User & Date: | matt on 2013-11-24 10:30:16 |
| Other Links: | manifest | tags |
Context
|
2013-11-27
| ||
| 08:39 | fix handling of setenv in configf and merge bug in db.scm check-in: b17dd1edec user: mrwellan tags: trunk | |
|
2013-11-24
| ||
| 13:46 | Conservative manual merge of refactor-db into new dev, inmem-per-run-db check-in: 4327ddb4aa user: matt tags: inmem-per-run-db | |
| 10:30 | Ensure that strings passed to setenv are not junk and let user know check-in: c13908f993 user: matt tags: trunk | |
|
2013-11-23
| ||
| 22:52 | Merged from v1.55 check-in: 0e5db02276 user: matt tags: trunk | |
Changes
Modified configf.scm from [13e344a884] to [59f66d81cc].
| ︙ | ︙ | |||
202 203 204 205 206 207 208 | " output: " cmdres) (exit 1))) (if (null? res) "" (string-intersperse res " ")))))) (hash-table-set! res curr-section-name (config:assoc-safe-add alist | | | | > | > | 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 | " output: " cmdres) (exit 1))) (if (null? res) "" (string-intersperse res " ")))))) (hash-table-set! res curr-section-name (config:assoc-safe-add alist key (case allow-system ((return-procs) val-proc) ((return-string) cmd) (else (val-proc))))) (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) (loop (configf:read-line inp res allow-system) curr-section-name #f #f))) (configf:key-val-pr ( x key unk1 val unk2 ) (let* ((alist (hash-table-ref/default res curr-section-name '())) (envar (and environ-patt (string-search (regexp environ-patt) curr-section-name))) (realval (if envar (config:eval-string-in-environment val) val))) (debug:print-info 6 "read-config env setting, envar: " envar " realval: " realval " val: " val " key: " key " curr-section-name: " curr-section-name) (if (and envar (string? realval) (not (string-search (integer->char 0) realval))) ;; (debug:print-info 4 "read-config key=" key ", val=" val ", realval=" realval) (setenv key realval) (debug:print 0 "ERROR: bad value for setenv, key=" key ", value=" realval)) (hash-table-set! res curr-section-name (config:assoc-safe-add alist key realval)) (loop (configf:read-line inp res allow-system) curr-section-name key #f))) (configf:key-no-val ( x key val) (let* ((alist (hash-table-ref/default res curr-section-name '()))) (hash-table-set! res curr-section-name (config:assoc-safe-add alist key #t)) (loop (configf:read-line inp res allow-system) curr-section-name key #f))) |
| ︙ | ︙ |