Update for new MIME-type abstraction.

diff --git a/v7/src/edwin/sendmail.scm b/v7/src/edwin/sendmail.scm
index 1ebb178d63e20dcf562f8175be5e8b4c46c420cd..280f77cfbf73f62219fd350f87e34516feb4d99c 100644 (file)
--- a/v7/src/edwin/sendmail.scm
+++ b/v7/src/edwin/sendmail.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: sendmail.scm,v 1.82 2004/10/22 04:48:13 cph Exp $
+$Id: sendmail.scm,v 1.83 2004/10/28 19:40:07 cph Exp $
 
 Copyright 1991,1992,1993,1994,1995,1996 Massachusetts Institute of Technology
 Copyright 1997,1998,2000,2001,2003,2004 Massachusetts Institute of Technology
@@ -1558,7 +1558,9 @@ Otherwise, the MIME type is determined from the file's suffix;
            (cond (entry
                   (finish (cadr entry) (caddr entry)))
                  ((pathname-mime-type pathname)
-                  => (lambda (t.s) (finish (car t.s) (cdr t.s))))
+                  => (lambda (t)
+                       (finish (mime-type/top-level t)
+                               (mime-type/subtype t))))
                  (else
                   (let loop ()
                     (case (prompt-for-char

diff --git a/v7/src/ssp/mod-lisp.scm b/v7/src/ssp/mod-lisp.scm
index 7c4391b921397289be0f54c46d27fdf199277ad1..1b6532104232fc6e3fdbce42cd8ad6e5f1cc1487 100644 (file)
--- a/v7/src/ssp/mod-lisp.scm
+++ b/v7/src/ssp/mod-lisp.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: mod-lisp.scm,v 1.3 2004/10/27 20:04:07 cph Exp $
+$Id: mod-lisp.scm,v 1.4 2004/10/28 19:41:18 cph Exp $
 
 Copyright 2003,2004 Massachusetts Institute of Technology
 
@@ -277,9 +277,11 @@ USA.
   (or (let ((extension (pathname-type pathname)))
        (and (string? extension)
             (hash-table/get mime-extensions extension #f)))
-      (let ((p (pathname-mime-type pathname)))
-       (and p
-            (symbol (car p) '/ (cdr p))))))
+      (let ((t (pathname-mime-type pathname)))
+       (and t
+            (symbol (mime-type/top-level t)
+                    '/
+                    (mime-type/subtype t))))))
 
 (define (get-mime-handler type)
   (hash-table/get mime-handlers type #f))