git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
31c4e00
)
Add "b" to calls to fopen() that lack it (for Cygwin's benefit).
exim-4_52
author
Philip Hazel
<ph10@hermes.cam.ac.uk>
Fri, 1 Jul 2005 10:49:01 +0000
(10:49 +0000)
committer
Philip Hazel
<ph10@hermes.cam.ac.uk>
Fri, 1 Jul 2005 10:49:01 +0000
(10:49 +0000)
doc/doc-txt/ChangeLog
patch
|
blob
|
history
src/src/demime.c
patch
|
blob
|
history
src/src/malware.c
patch
|
blob
|
history
src/src/mime.c
patch
|
blob
|
history
src/src/receive.c
patch
|
blob
|
history
src/src/regex.c
patch
|
blob
|
history
src/src/spool_mbox.c
patch
|
blob
|
history
diff --git
a/doc/doc-txt/ChangeLog
b/doc/doc-txt/ChangeLog
index b79d62de5b9cc1f2c8bc619ace4aa4da4e3cd653..dd2e742805942303c0cd9d98418ca58d30e93c3b 100644
(file)
--- a/
doc/doc-txt/ChangeLog
+++ b/
doc/doc-txt/ChangeLog
@@
-1,4
+1,4
@@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.18
0 2005/06/30 10:01:01 steve
Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.18
1 2005/07/01 10:49:01 ph10
Exp $
Change log file for Exim from version 4.21
-------------------------------------------
Change log file for Exim from version 4.21
-------------------------------------------
@@
-246,6
+246,9
@@
SC/10 Eximstats: added histograms for user specified patterns as requested
SC/11 Eximstats: v1.43 - bugfix for pattern histograms with -h0 specified.
SC/11 Eximstats: v1.43 - bugfix for pattern histograms with -h0 specified.
+PH/33 Patch from the Cygwin maintainer to add "b" to all occurences of
+ fopen() in the content-scanning modules that did not already have it.
+
Exim version 4.51
-----------------
Exim version 4.51
-----------------
diff --git
a/src/src/demime.c
b/src/src/demime.c
index 70125a53d34c2bcf5767fc453514f267b7d4335e..1f86407f8a81f6c7b8385215bc6a7eb03205f544 100644
(file)
--- a/
src/src/demime.c
+++ b/
src/src/demime.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/demime.c,v 1.
6 2005/06/27 14:29:43
ph10 Exp $ */
+/* $Cambridge: exim/src/src/demime.c,v 1.
7 2005/07/01 10:49:02
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-256,7
+256,7
@@
int mime_get_dump_file(uschar *extension, FILE **f, uschar *info) {
}
while(result != -1);
}
while(result != -1);
- *f = fopen(CS file_name,"w+");
+ *f = fopen(CS file_name,"w
b
+");
if (*f == NULL) {
/* cannot open new dump file, disk full ? -> soft error */
snprintf(CS info, 1024,"unable to open dump file");
if (*f == NULL) {
/* cannot open new dump file, disk full ? -> soft error */
snprintf(CS info, 1024,"unable to open dump file");
diff --git
a/src/src/malware.c
b/src/src/malware.c
index c137d570f09a54ccc3c32bc7e614037d5a5355c6..a790b284bc7b12e0f9802480d9ced489418622b7 100644
(file)
--- a/
src/src/malware.c
+++ b/
src/src/malware.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/malware.c,v 1.1
0 2005/06/27 14:29:43
ph10 Exp $ */
+/* $Cambridge: exim/src/src/malware.c,v 1.1
1 2005/07/01 10:49:02
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-873,7
+873,7
@@
int malware(uschar **listptr) {
};
snprintf(CS file_name,1024,"%s/scan/%s/%s_scanner_output", spool_directory, message_id, message_id);
};
snprintf(CS file_name,1024,"%s/scan/%s/%s_scanner_output", spool_directory, message_id, message_id);
- scanner_record = fopen(CS file_name,"w");
+ scanner_record = fopen(CS file_name,"w
b
");
if (scanner_record == NULL) {
log_write(0, LOG_MAIN|LOG_PANIC,
if (scanner_record == NULL) {
log_write(0, LOG_MAIN|LOG_PANIC,
@@
-911,7
+911,7
@@
int malware(uschar **listptr) {
malware_name = malware_name_buffer;
/* re-open the scanner output file, look for name match */
malware_name = malware_name_buffer;
/* re-open the scanner output file, look for name match */
- scanner_record = fopen(CS file_name,"r");
+ scanner_record = fopen(CS file_name,"r
b
");
while(fgets(CS linebuffer,32767,scanner_record) != NULL) {
/* try match */
result = pcre_exec(cmdline_regex_re, NULL, CS linebuffer, Ustrlen(linebuffer), 0, 0, ovector, 30);
while(fgets(CS linebuffer,32767,scanner_record) != NULL) {
/* try match */
result = pcre_exec(cmdline_regex_re, NULL, CS linebuffer, Ustrlen(linebuffer), 0, 0, ovector, 30);
diff --git
a/src/src/mime.c
b/src/src/mime.c
index 52c92ca85f7a4f1c5e4a538ebc85a3895d8c5c20..a4ad0f50904bd3a7862101db54b013afd20eebcb 100644
(file)
--- a/
src/src/mime.c
+++ b/
src/src/mime.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/mime.c,v 1.
8 2005/06/27 14:29:43
ph10 Exp $ */
+/* $Cambridge: exim/src/src/mime.c,v 1.
9 2005/07/01 10:49:02
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-244,10
+244,10
@@
FILE *mime_get_decode_file(uschar *pname, uschar *fname) {
if ((pname != NULL) && (fname != NULL)) {
snprintf(CS filename, 2048, "%s/%s", pname, fname);
if ((pname != NULL) && (fname != NULL)) {
snprintf(CS filename, 2048, "%s/%s", pname, fname);
- f = fopen(CS filename,"w+");
+ f = fopen(CS filename,"w
b
+");
}
else if (pname == NULL) {
}
else if (pname == NULL) {
- f = fopen(CS fname,"w+");
+ f = fopen(CS fname,"w
b
+");
}
else if (fname == NULL) {
int file_nr = 0;
}
else if (fname == NULL) {
int file_nr = 0;
@@
-264,7
+264,7
@@
FILE *mime_get_decode_file(uschar *pname, uschar *fname) {
result = stat(CS filename,&mystat);
}
while(result != -1);
result = stat(CS filename,&mystat);
}
while(result != -1);
- f = fopen(CS filename,"w+");
+ f = fopen(CS filename,"w
b
+");
};
/* set expansion variable */
};
/* set expansion variable */
diff --git
a/src/src/receive.c
b/src/src/receive.c
index daa260fff9f281c479308fcdd21760cacb9f1a4b..7fa35878b9abde3609163605a355524e69eea5fd 100644
(file)
--- a/
src/src/receive.c
+++ b/
src/src/receive.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/receive.c,v 1.2
0 2005/06/27 14:29:43
ph10 Exp $ */
+/* $Cambridge: exim/src/src/receive.c,v 1.2
1 2005/07/01 10:49:02
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-1113,7
+1113,7
@@
if (rc == OK) {
closedir(tempdir);
if (entry != NULL) {
closedir(tempdir);
if (entry != NULL) {
- mbox_file = Ufopen(rfc822_file_path,"r");
+ mbox_file = Ufopen(rfc822_file_path,"r
b
");
if (mbox_file == NULL) {
log_write(0, LOG_PANIC,
"acl_smtp_mime: can't open RFC822 spool file, skipping.");
if (mbox_file == NULL) {
log_write(0, LOG_PANIC,
"acl_smtp_mime: can't open RFC822 spool file, skipping.");
diff --git
a/src/src/regex.c
b/src/src/regex.c
index 7383f3c465d31bfd5ea8c7605b64fe59636bd435..63c1c2c1085694a12d4d41bf7013fed06caa01d5 100644
(file)
--- a/
src/src/regex.c
+++ b/
src/src/regex.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/regex.c,v 1.
6 2005/06/27 14:29:43
ph10 Exp $ */
+/* $Cambridge: exim/src/src/regex.c,v 1.
7 2005/07/01 10:49:02
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-210,7
+210,7
@@
int mime_regex(uschar **listptr) {
/* open file */
/* open file */
- f = fopen(CS mime_decoded_filename, "r");
+ f = fopen(CS mime_decoded_filename, "r
b
");
if (f == NULL) {
/* open failed */
log_write(0, LOG_MAIN,
if (f == NULL) {
/* open failed */
log_write(0, LOG_MAIN,
diff --git
a/src/src/spool_mbox.c
b/src/src/spool_mbox.c
index 70926811d0ad79d02388efe62b802bdfa3bc483a..dd5d73b7ae794af5412aaa6945a558e2f096a591 100644
(file)
--- a/
src/src/spool_mbox.c
+++ b/
src/src/spool_mbox.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/spool_mbox.c,v 1.
7 2005/06/27 14:29:44
ph10 Exp $ */
+/* $Cambridge: exim/src/src/spool_mbox.c,v 1.
8 2005/07/01 10:49:02
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-56,7
+56,7
@@
FILE *spool_mbox(unsigned long *mbox_file_size) {
/* open [message_id].eml file for writing */
snprintf(CS mbox_path, 1024, "%s/scan/%s/%s.eml", spool_directory, message_id, message_id);
/* open [message_id].eml file for writing */
snprintf(CS mbox_path, 1024, "%s/scan/%s/%s.eml", spool_directory, message_id, message_id);
- mbox_file = Ufopen(mbox_path,"w");
+ mbox_file = Ufopen(mbox_path,"w
b
");
if (mbox_file == NULL) {
debug_printf("unable to open file for writing: %s\n", mbox_path);
if (mbox_file == NULL) {
debug_printf("unable to open file for writing: %s\n", mbox_path);
@@
-129,7
+129,7
@@
FILE *spool_mbox(unsigned long *mbox_file_size) {
for (i = 0; i < 2; i++) {
message_subdir[0] = (split_spool_directory == (i == 0))? message_id[5] : 0;
sprintf(CS mbox_path, "%s/input/%s/%s-D", spool_directory, message_subdir, message_id);
for (i = 0; i < 2; i++) {
message_subdir[0] = (split_spool_directory == (i == 0))? message_id[5] : 0;
sprintf(CS mbox_path, "%s/input/%s/%s-D", spool_directory, message_subdir, message_id);
- data_file = Ufopen(mbox_path,"r");
+ data_file = Ufopen(mbox_path,"r
b
");
if (data_file != NULL)
break;
};
if (data_file != NULL)
break;
};
@@
-162,7
+162,7
@@
FILE *spool_mbox(unsigned long *mbox_file_size) {
*mbox_file_size = statbuf.st_size;
/* open [message_id].eml file for reading */
*mbox_file_size = statbuf.st_size;
/* open [message_id].eml file for reading */
- mbox_file = Ufopen(mbox_path,"r");
+ mbox_file = Ufopen(mbox_path,"r
b
");
return mbox_file;
}
return mbox_file;
}