From d7dc00720606c7a5164bfa5e4dd75933e2991e44 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 6 Oct 2010 10:27:06 -0500 Subject: [PATCH] Clean up a few lines of resolv.conf parser --- extra/resolv-conf/resolv-conf.factor | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/extra/resolv-conf/resolv-conf.factor b/extra/resolv-conf/resolv-conf.factor index 8b38f49116..4ee0366f45 100644 --- a/extra/resolv-conf/resolv-conf.factor +++ b/extra/resolv-conf/resolv-conf.factor @@ -30,17 +30,18 @@ CONSTRUCTOR: resolv.conf ( -- resolv.conf ) : trim-blanks ( string -- string' ) [ blank? ] trim ; -: parse-nameserver ( resolv.conf string -- resolv.conf ) +: split-line ( resolv.conf string -- resolv.conf seq resolv.conf ) trim-blanks " " split - [ trim-blanks ] map harvest over nameserver>> push-all ; + [ trim-blanks ] map harvest over ; + +: parse-nameserver ( resolv.conf string -- resolv.conf ) + split-line nameserver>> push-all ; : parse-domain ( resolv.conf string -- resolv.conf ) - trim-blanks " " split - [ trim-blanks ] map harvest over domain>> push-all ; + split-line domain>> push-all ; : parse-search ( resolv.conf string -- resolv.conf ) - trim-blanks " " split - [ trim-blanks ] map harvest over search>> push-all ; + split-line search>> push-all ; : parse-sortlist ( resolv.conf string -- resolv.conf ) trim-blanks " " split