summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--doc/ethereal.pod1
-rw-r--r--wiretap/file_access.c9
3 files changed, 8 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 702b5769ba..8c3655a219 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2144,6 +2144,7 @@ And assorted fixes and enhancements by the people listed above and by:
Thomas Palmer <Thomas.Palmer [AT] Gunter.AF.mil>
Jon Oberheide <jon [AT] focalhost.com>
Clinton Work <clinton [AT] scripty.com>
+ Joe Marcus Clarke <marcus [AT] marcuscom.com>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.
diff --git a/doc/ethereal.pod b/doc/ethereal.pod
index 39de95541e..e0ce8b0ec9 100644
--- a/doc/ethereal.pod
+++ b/doc/ethereal.pod
@@ -2251,6 +2251,7 @@ B<http://www.ethereal.com>.
Thomas Palmer <Thomas.Palmer [AT] Gunter.AF.mil>
Jon Oberheide <jon [AT] focalhost.com>
Clinton Work <clinton [AT] scripty.com>
+ Joe Marcus Clarke <marcus [AT] marcuscom.com>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 31118a229d..23ecfd372d 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -1,6 +1,6 @@
/* file_access.c
*
- * $Id: file_access.c,v 1.11 2004/02/11 20:05:16 guy Exp $
+ * $Id: file_access.c,v 1.12 2004/04/28 05:47:33 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -537,9 +537,12 @@ wtap_dumper* wtap_dump_open(const char *filename, int filetype, int encap,
return NULL; /* couldn't allocate it */
/* Empty filename means stdout */
- if (*filename == '\0')
+ if (*filename == '\0') {
+#ifdef _WIN32
+ setmode(fileno(stdout), O_BINARY);
+#endif
wdh->fh = stdout;
- else {
+ } else {
/* In case "fopen()" fails but doesn't set "errno", set "errno"
to a generic "the open failed" error. */
errno = WTAP_ERR_CANT_OPEN;