Move resolvconf back into tree.

resolvconf.scm → dns/resolvconf.scm

-(define-module (resolvconf)
+(define-module (dns resolvconf)
   :use-module (ice-9 regex)
   :use-module (ice-9 rdelim)
-  :use-module (srfi srfi-88)
   :export (resolvconf))
 
 
-(define (read-all port) (read-delimited "" port))
-(define (read-file fname) (call-with-input-file fname read-all))
-
-
 (define (regexp-exec/all rx str)
   (let loop ((start 0))
     (cond ((regexp-exec rx str start)
@@ -17,6 +12,7 @@
 
 
 (define rx (make-regexp "^nameserver\\s+(\\S+)\\s*$" regexp/newline))
-(define* (resolvconf optional: (file "/etc/resolv.conf"))
-  (map (lambda (m) (match:substring m 1)) (regexp-exec/all rx (read-file file))))
+(define* (resolvconf #:optional (fname "/etc/resolv.conf"))
+  (map (lambda (m) (match:substring m 1))
+       (regexp-exec/all rx (call-with-input-file fname read-string))))
 

main.scm

@@ -106,11 +106,11 @@
 
   (define dns-server-address
     (or (option-ref options 'server #f)
-        (car ((@ (resolvconf) resolvconf)))))
 
   ;; (highlight-record (format #f "~s~%" msg))
   (call-with-values (lambda () ((bytes->dns-message (run dns-server-address msg)) 0))
     (lambda (resp _) (format-everything msg resp)))
+        (car ((@ (dns resolvconf) resolvconf)))))
 
   (newline)
   (format #t ";; Server: ~a (UDP)~%" dns-server-address))