From 9e9b309c56637a7d416960d34a1401ceb3aa3185 Mon Sep 17 00:00:00 2001 From: John Clements Date: Tue, 30 Oct 2001 05:46:44 +0000 Subject: [PATCH] ... original commit: 174863d28b9cd14141603df73aee0334ffd7c2b0 --- collects/mzlib/process.ss | 2 +- collects/net/dns-unit.ss | 25 +++++++++++++------------ collects/net/url-sig.ss | 3 ++- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/collects/mzlib/process.ss b/collects/mzlib/process.ss index 2b8e20e..bffd294 100644 --- a/collects/mzlib/process.ss +++ b/collects/mzlib/process.ss @@ -13,7 +13,7 @@ (define (shell-path/args who argstr) (case (system-type) - ((unix) (append '("/bin/sh" "-c") (list argstr))) + ((unix macosx) (append '("/bin/sh" "-c") (list argstr))) ((windows) (let ([cmd (let ([d (find-system-path 'sys-dir)]) (let ([cmd (build-path d "cmd.exe")]) diff --git a/collects/net/dns-unit.ss b/collects/net/dns-unit.ss index e58fbf6..fa09d72 100644 --- a/collects/net/dns-unit.ss +++ b/collects/net/dns-unit.ss @@ -285,17 +285,18 @@ (define (dns-find-nameserver) (case (system-type) - [(unix) (with-handlers ([void (lambda (x) #f)]) - (with-input-from-file "/etc/resolv.conf" - (lambda () - (let loop () - (let ([l (read-line)]) - (or (and (string? l) - (let ([m (regexp-match - (format "nameserver[ ~a]+([0-9]+[.][0-9]+[.][0-9]+[.][0-9]+)" #\tab) - l)]) - (and m (cadr m)))) - (and (not (eof-object? l)) - (loop))))))))] + [(unix macosx) + (with-handlers ([void (lambda (x) #f)]) + (with-input-from-file "/etc/resolv.conf" + (lambda () + (let loop () + (let ([l (read-line)]) + (or (and (string? l) + (let ([m (regexp-match + (format "nameserver[ ~a]+([0-9]+[.][0-9]+[.][0-9]+[.][0-9]+)" #\tab) + l)]) + (and m (cadr m)))) + (and (not (eof-object? l)) + (loop))))))))] [else #f]))))) diff --git a/collects/net/url-sig.ss b/collects/net/url-sig.ss index 06e4d8b..c4ae7bf 100644 --- a/collects/net/url-sig.ss +++ b/collects/net/url-sig.ss @@ -14,4 +14,5 @@ call/input-url ;; url x (url -> in-port) x ;; (in-port -> T) ;; [x list (str)] -> T - combine-url/relative))) ;; url x str -> url + combine-url/relative ;; url x str -> url + url-exception?))) ;; T -> boolean