Megatest

Diff
Login

Differences From Artifact [fd7443cd26]:

To Artifact [ee796a94b9]:


146
147
148
149
150
151
152
153


154
155
156


157
158
159
160
161
162
163
164
165
166
167
168
169
170
		(close-input-port inp)
		(hash-table-delete! res "") ;; we are using "" as a dumping ground and must remove it before returning the ht
		res)
	      (regex-case 
	       inl 
	       (configf:comment-rx _                  (loop (configf:read-line inp res allow-system) curr-section-name #f #f))
	       (configf:blank-l-rx _                  (loop (configf:read-line inp res allow-system) curr-section-name #f #f))
	       (configf:include-rx ( x include-file ) (if (file-exists? include-file)


							  (let ((curr-dir (current-directory))
								(conf-dir (pathname-directory include-file))
								(incfname (pathname-strip-directory include-file))) 


							    (push-directory conf-dir)
							    (read-config incfname res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections)
							    (pop-directory)
							    (loop (configf:read-line inp res allow-system) curr-section-name #f #f))
							  (begin
							    (debug:print 0 "INFO: include file " include-file " not found (called from " path ")")
							    (loop (configf:read-line inp res allow-system) curr-section-name #f #f))))
	       (configf:section-rx ( x section-name ) (loop (configf:read-line inp res allow-system)
							    ;; if we have the sections list then force all settings into "" and delete it later?
							    (if (or (not sections) 
								    (member section-name sections))
								section-name "") ;; stick everything into ""
							    #f #f))
	       (configf:key-sys-pr ( x key cmd      ) (if allow-system







|
>
>
|
|
|
>
>
|
|
|
|
|
|
|







146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
		(close-input-port inp)
		(hash-table-delete! res "") ;; we are using "" as a dumping ground and must remove it before returning the ht
		res)
	      (regex-case 
	       inl 
	       (configf:comment-rx _                  (loop (configf:read-line inp res allow-system) curr-section-name #f #f))
	       (configf:blank-l-rx _                  (loop (configf:read-line inp res allow-system) curr-section-name #f #f))
	       (configf:include-rx ( x include-file ) (let* ((curr-dir  (current-directory))
							     (full-conf (if (absolute-pathname? include-file)
									    include-file
									    (conc curr-dir "/" include-file)))
							     (conf-dir (pathname-directory include-file))
							     (incfname (pathname-strip-directory include-file))) 
							(if (file-exists? full-conf)
							    (begin
							      ;; (push-directory conf-dir)
							      (read-config full-conf res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections)
							      ;; (pop-directory)
							      (loop (configf:read-line inp res allow-system) curr-section-name #f #f))
							    (begin
							      (debug:print 0 "INFO: include file " include-file " not found (called from " path ")")
							      (loop (configf:read-line inp res allow-system) curr-section-name #f #f)))))
	       (configf:section-rx ( x section-name ) (loop (configf:read-line inp res allow-system)
							    ;; if we have the sections list then force all settings into "" and delete it later?
							    (if (or (not sections) 
								    (member section-name sections))
								section-name "") ;; stick everything into ""
							    #f #f))
	       (configf:key-sys-pr ( x key cmd      ) (if allow-system