diff options
| author | James LewisMoss <dres@debian.org> | 2001-07-27 23:45:29 -0400 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@robocracy.org> | 2017-02-20 00:05:29 -0800 |
| commit | f559c149c83da84d0b1c285f0298c84aec564af9 (patch) | |
| tree | f1c91bcb9bb5e6dad87b643127c3f878d80d89ee /nclients.scm | |
| parent | c394920caedf3dac1981bb6b10eeb47fd6e4bb21 (diff) | |
| parent | 87b82b5822ca54228cfa6df29be3ad9d4bc47d16 (diff) | |
| download | slib-f559c149c83da84d0b1c285f0298c84aec564af9.tar.gz slib-f559c149c83da84d0b1c285f0298c84aec564af9.zip | |
Import Debian changes 2d2-1debian/2d2-1
slib (2d2-1) unstable; urgency=low
* New upstream version
* Revert back to free. Is now so.
slib (2d1-1) unstable; urgency=low
* New upstream version.
* Move to non-free. FSF pointed out license doesn't allow modified
versions to be distributed.
* Get a complete list of copyrights that apply to the source into
copyright file.
* Remove setup for guile 1.3.
* Remove postrm. Just calling install-info (lintian) Move install-info
call to prerm since doc-base doesn't do install-info.
slib (2c9-3) unstable; urgency=low
* Change info location to section "The Algorithmic Language Scheme" to
match up with where guile puts it's files.
* Postinst is running slibconfig now. (Closes: #75891)
slib (2c9-2) unstable; urgency=low
* Stop installing slibconfig (for guile).
* In postinst if /usr/sbin/slibconnfig exists call it (Close: #75843
#75891).
slib (2c9-1) unstable; urgency=low
* New upstream (Closes: #74760)
* replace string-index with strsrch:string-index in http-cgi.scm.
* Add doc-base support (Closes: #31163)
Diffstat (limited to 'nclients.scm')
| -rw-r--r-- | nclients.scm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nclients.scm b/nclients.scm index 96c36c9..8b778b8 100644 --- a/nclients.scm +++ b/nclients.scm @@ -1,9 +1,9 @@ ;;; "nclients.scm" Interface to net-client programs. ; Copyright 1997, 1998 Aubrey Jaffer ; -;Permission to copy this software, to redistribute it, and to use it -;for any purpose is granted, subject to the following restrictions and -;understandings. +;Permission to copy this software, to modify it, to redistribute it, +;to distribute modified versions, and to use it for any purpose is +;granted, subject to the following restrictions and understandings. ; ;1. Any copy made of this software must include this copyright notice ;in full. @@ -226,11 +226,11 @@ ;;@item ;;remote-directory ;;@end enumerate -(define (parse-ftp-address url) +(define (parse-ftp-address uri) (define length? (lambda (len lst) (and (eqv? len (length lst)) lst))) (cond - ((not url) #f) - ((length? 1 (scanf-read-list " ftp://%s %s" url)) + ((not uri) #f) + ((length? 1 (scanf-read-list " ftp://%s %s" uri)) => (lambda (host) (let ((login #f) (path #f) (dross #f)) (sscanf (car host) "%[^/]/%[^@]%s" login path dross) @@ -248,7 +248,7 @@ (list path)))))) (else (let ((user@site #f) (colon #f) (path #f) (dross #f)) - (case (sscanf url " %[^:]%[:]%[^@] %s" user@site colon path dross) + (case (sscanf uri " %[^:]%[:]%[^@] %s" user@site colon path dross) ((2 3) (let ((user #f) (site #f)) (cond ((or (eqv? 2 (sscanf user@site "/%[^@/]@%[^@]%s" @@ -260,7 +260,7 @@ (list #f #f site path)) (else (list #f #f user@site path))))) (else - (let ((site (scanf-read-list " %[^@/] %s" url))) + (let ((site (scanf-read-list " %[^@/] %s" uri))) (and (length? 1 site) (list #f #f (car site) #f))))))))) ;;@body @@ -364,8 +364,8 @@ 2)) ;;@body -;;Returns a URL-string for @1 on the local host. -(define (path->url path) +;;Returns a URI-string for @1 on the local host. +(define (path->uri path) (if (absolute-path? path) (sprintf #f "file:%s" path) (sprintf #f "file:%s/%s" (current-directory) path))) |