Always load mailutils module

(sieve-main): Use (mu-mail-directory) instead of mu-path-maildir.

 ;;;; GNU Mailutils -- a suite of utilities for electronic mail
 ;;;; GNU Mailutils -- a suite of utilities for electronic mail
-;;;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+;;;; Copyright (C) 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
 ;;;;
 ;;;;
 ;;;; GNU Mailutils is free software; you can redistribute it and/or modify
 ;;;; GNU Mailutils is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
 ;;;; it under the terms of the GNU General Public License as published by
@@ -17,6 +17,9 @@
 
 
 ;;;; This module provides core functionality for the sieve scripts.
 ;;;; This module provides core functionality for the sieve scripts.
 
 
+(set! %load-path (append %load-path (list sieve-libdir)))
+(use-modules (mailutils))
+
 ;;; The email address for originator of error messages. Should be <>
 ;;; The email address for originator of error messages. Should be <>
 ;;; but current mailutils API is unable to parse and handle it.
 ;;; but current mailutils API is unable to parse and handle it.
 ;;; Site administrators are supposed to replace it with the
 ;;; Site administrators are supposed to replace it with the
@@ -173,7 +176,7 @@
 		 ;; FIXME: This is very inefficient, but I have to use this
 		 ;; FIXME: This is very inefficient, but I have to use this
 		 ;; provided (string-index str (string-ref key 0)) may not
 		 ;; provided (string-index str (string-ref key 0)) may not
 		 ;; work...
 		 ;; work...
-		 ((comp (make-shared-substring str index (+ index key-len))
+		 ((comp (substring str index (+ index key-len))
 			key)
 			key)
 		  (xx #t))
 		  (xx #t))
 		 (else
 		 (else
@@ -434,14 +437,11 @@
 (define (sieve-main)
 (define (sieve-main)
   (cond
   (cond
    ((not (guimb?))
    ((not (guimb?))
-;    (DEBUG 1 "Loading mailutils")
-    (set! %load-path (append %load-path (list sieve-libdir)))
-    (use-modules (mailutils))
     (let* ((cl (sieve-command-line))
     (let* ((cl (sieve-command-line))
 	   (name (if (and (not (null? (cdr cl)))
 	   (name (if (and (not (null? (cdr cl)))
 			  (string? (cadr cl)))
 			  (string? (cadr cl)))
 		     (cadr cl)
 		     (cadr cl)
-		     (string-append mu-path-maildir "/"
+		     (string-append (mu-mail-directory) "/"
 				    (passwd:name (mu-getpwuid (getuid)))))))
 				    (passwd:name (mu-getpwuid (getuid)))))))
 ;      (DEBUG 2 "mailbox name " name)
 ;      (DEBUG 2 "mailbox name " name)
       (set! sieve-mailbox (mu-mailbox-open name "rw"))
       (set! sieve-mailbox (mu-mailbox-open name "rw"))