Version 0.2 of the program.

[attachcheck] / attachcheck

diff --git a/attachcheck b/attachcheck
old mode 100644 (file)
new mode 100755 (executable)
index ebcd6be..20e16c8
--- a/attachcheck
+++ b/attachcheck
@@ -3,20 +3,30 @@
 # AttachCheck -- A MTA wrapper to help check outgoing email for
 # forgotten attachments.
 
-# (c) 2005 -- Benjamin Mako Hill <mako@bork.hampshire.edu>
-# Author/Software Homepage at: http://mako.cc
+# (c) 2004-2009 -- Benjamin Mako Hill <mako@atdot.cc>
+# Software Homepage at: http://mako.cc/projects/attachcheck
 
-# This software comes with ABSOLUTELY NO WARRANTY.
-# This is free software and is licensed under the GNU GPL.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 
-__copyright__ = "Copyright (c) 2004 Benjamin Mako Hill"
-__author__ = "Benjamin Mako Hill <mako@debian.org>" 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+__copyright__ = "Copyright (c) 2004-2009 Benjamin Mako Hill"
+__author__ = "Benjamin Mako Hill <mako@atdot.cc>" 
 
 ### Configuration Options
 ###########################################
 
 # location of the sendmail binary
-sendmail = "/usr/sbin/sendmail -oi"
+sendmail = "/usr/sbin/sendmail"
 
 # list of mimetype which are, for the sake of this program, not
 # attachments
@@ -42,7 +52,7 @@ def send_message():
     global sendmail
     sendmail = sendmail + " " + " ".join( sys.argv[1:] )
    
-    mailpipe = os.popen("%s -t" % sendmail_with_args, 'w')
+    mailpipe = os.popen("%s" % sendmail, 'w')
     mailpipe.write( message_string )
     sys.exit( mailpipe.close() )
 
@@ -115,7 +125,7 @@ if attachment_expected:
         # check for the confirmation
 
         if re.search( r'Subject: CONFIRM', message_string ):
-            message_string = re.sub( r'(Subject: )(CONFIRM )(.*?)\n',
+            message_string = re.sub( r'(Subject: )(CONFIRM)(.*?)\n',
                                      r'\1\3\n', message_string )
             send_message()