Define HEADER-FIELD-LENGTH.

diff --git a/v7/src/imail/imail-core.scm b/v7/src/imail/imail-core.scm
index 36fb31763b69de94bed7a338ce555cc88af4240f..917c9bfd18eb626752cea03232e2ed0fc8395417 100644 (file)
--- a/v7/src/imail/imail-core.scm
+++ b/v7/src/imail/imail-core.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-core.scm,v 1.107 2000/06/20 19:45:37 cph Exp $
+;;; $Id: imail-core.scm,v 1.108 2000/06/20 19:48:42 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -642,14 +642,13 @@
       (guarantee-header-field-value value 'MAKE-HEADER-FIELD)
       (constructor name value))))
 
-(define (copy-header-field header)
-  (record-copy header))
+(define (guarantee-header-field-name object procedure)
+  (if (not (header-field-name? object))
+      (error:wrong-type-argument object "header-field name" procedure)))
 
-(define (->header-fields object)
-  (cond ((or (pair? object) (null? object)) object)
-       ((message? object) (message-header-fields object))
-       ((string? object) (string->header-fields object))
-       (else (error:wrong-type-argument object "header fields" #f))))
+(define (guarantee-header-field-value object procedure)
+  (if (not (header-field-value? object))
+      (error:wrong-type-argument object "header-field value" procedure)))
 
 (define (header-field-name? object)
   (and (string? object)
@@ -665,13 +664,19 @@
                      (char-lwsp? (string-ref object (fix:+ nl 1)))
                      (loop (fix:+ nl 2)))))))))
 
-(define (guarantee-header-field-name object procedure)
-  (if (not (header-field-name? object))
-      (error:wrong-type-argument object "header-field name" procedure)))
+(define (copy-header-field header)
+  (record-copy header))
 
-(define (guarantee-header-field-value object procedure)
-  (if (not (header-field-value? object))
-      (error:wrong-type-argument object "header-field value" procedure)))
+(define (->header-fields object)
+  (cond ((or (pair? object) (null? object)) object)
+       ((message? object) (message-header-fields object))
+       ((string? object) (string->header-fields object))
+       (else (error:wrong-type-argument object "header fields" #f))))
+
+(define (header-field-length header)
+  (+ (string-length (header-field-name header))
+     (string-length (header-field-value header))
+     2))
 \f
 (define (get-first-header-field headers name error?)
   (let loop ((headers (->header-fields headers)))

diff --git a/v7/src/imail/imail-file.scm b/v7/src/imail/imail-file.scm
index b843c7d48fee1fa6acea31bebe4d20afc3606152..9cd89efd9e02a3e02cce195d6869b41cff04eb54 100644 (file)
--- a/v7/src/imail/imail-file.scm
+++ b/v7/src/imail/imail-file.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-file.scm,v 1.46 2000/06/20 19:47:05 cph Exp $
+;;; $Id: imail-file.scm,v 1.47 2000/06/20 19:48:46 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -284,16 +284,11 @@
   (%set-message-flags! message flags))
 
 (define-method message-length ((message <file-message>))
-  (+ (apply +
-           (map (lambda (header)
-                  (+ (string-length (header-field-name header))
-                     (string-length (header-field-value header))
-                     2))
-                (message-header-fields message)))
+  (+ (apply + (map header-field-length (message-header-fields message)))
      1
      (string-length (file-message-body message))))
 
-(define-method message-internal-time ((message <message>))
+(define-method message-internal-time ((message <file-message>))
   (let loop ((headers (get-all-header-fields message "received")) (winner #f))
     (if (pair? headers)
        (loop (cdr headers)