projects
/
smailq.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug: treat mails as binary files, not as utf-8
[smailq.git]
/
smailq
diff --git
a/smailq
b/smailq
index 7d5286ac122f3cf6d838d20e5f60c9a5917e24a4..def0a0a9c312d490727d2f455104d416f2a4e5e6 100755
(executable)
--- a/
smailq
+++ b/
smailq
@@
-163,8
+163,8
@@
class MailQueue:
info['to'] = ""
info['subject'] = ""
info['to'] = ""
info['subject'] = ""
- with open(mailfn, "r") as f:
- mail = f.readlines()
+ with open(mailfn, "r
b
") as f:
+ mail = f.read
().decode('utf8', 'replace').split
lines()
for l in mail:
if l.startswith("Subject:"):
for l in mail:
if l.startswith("Subject:"):
@@
-234,7
+234,7
@@
class MailQueue:
# Read the mail
mailfn = self.conf.getmailfn(id)
# Read the mail
mailfn = self.conf.getmailfn(id)
- mailf = open(mailfn, "r")
+ mailf = open(mailfn, "r
b
")
# Read the options
msaargsfn = self.conf.getmsaargsfn(id)
# Read the options
msaargsfn = self.conf.getmsaargsfn(id)
@@
-284,7
+284,7
@@
class MailQueue:
# Write the mail
mailfn = self.conf.getmailfn(id)
# Write the mail
mailfn = self.conf.getmailfn(id)
- with open(mailfn, "w") as f:
+ with open(mailfn, "w
b
") as f:
f.write(mail)
# Write the options
f.write(mail)
# Write the options
@@
-458,7
+458,7
@@
if __name__ == "__main__":
mq = MailQueue(conf)
if cmd == "--send":
mq = MailQueue(conf)
if cmd == "--send":
- mail = sys.stdin.read()
+ mail = sys.stdin.
buffer.
read()
mq.sendmail(mail, nooptargs)
elif cmd == "--list":
mq.listqueue()
mq.sendmail(mail, nooptargs)
elif cmd == "--list":
mq.listqueue()