From 8c9fd200f9061cbb68b00fd3d58cacdbb46e2d23 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 25 Oct 1999 22:04:09 +0000
Subject: [PATCH] use do_open() instead of open() in several places to help the
 WinXX port and O_BINARY

---
 checksum.c  | 2 +-
 generator.c | 2 +-
 receiver.c  | 4 ++--
 sender.c    | 2 +-
 util.c      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/checksum.c b/checksum.c
index 194d899a..0ce7259d 100644
--- a/checksum.c
+++ b/checksum.c
@@ -93,7 +93,7 @@ void file_checksum(char *fname,char *sum,OFF_T size)
 	
 	memset(sum,0,MD4_SUM_LENGTH);
 	
-	fd = open(fname,O_RDONLY);
+	fd = do_open(fname, O_RDONLY, 0);
 	if (fd == -1) return;
 	
 	buf = map_file(fd,size);
diff --git a/generator.c b/generator.c
index bbc328df..8afc8f72 100644
--- a/generator.c
+++ b/generator.c
@@ -340,7 +340,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 	}
 
 	/* open the file */  
-	fd = open(fnamecmp,O_RDONLY);
+	fd = do_open(fnamecmp, O_RDONLY, 0);
 
 	if (fd == -1) {
 		rprintf(FERROR,"failed to open %s : %s\n",fnamecmp,strerror(errno));
diff --git a/receiver.c b/receiver.c
index 6361d21b..6eb9acab 100644
--- a/receiver.c
+++ b/receiver.c
@@ -358,14 +358,14 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 		fnamecmp = fname;
 
 		/* open the file */  
-		fd1 = open(fnamecmp,O_RDONLY);
+		fd1 = do_open(fnamecmp, O_RDONLY, 0);
 
 		if ((fd1 == -1) && (compare_dest != NULL)) {
 			/* try the file at compare_dest instead */
 			slprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",
 						compare_dest,fname);
 			fnamecmp = fnamecmpbuf;
-			fd1 = open(fnamecmp,O_RDONLY);
+			fd1 = do_open(fnamecmp, O_RDONLY, 0);
 		}
 
 		if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
diff --git a/sender.c b/sender.c
index 623d995d..3a443468 100644
--- a/sender.c
+++ b/sender.c
@@ -160,7 +160,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 			return;
 		}
 	  
-		fd = open(fname,O_RDONLY);
+		fd = do_open(fname, O_RDONLY, 0);
 		if (fd == -1) {
 			io_error = 1;
 			rprintf(FERROR,"send_files failed to open %s: %s\n",
diff --git a/util.c b/util.c
index 2d1989d4..947caa7c 100644
--- a/util.c
+++ b/util.c
@@ -282,7 +282,7 @@ int copy_file(char *source, char *dest, mode_t mode)
 	char buf[1024 * 8];
 	int len;   /* Number of bytes read into `buf'. */
 
-	ifd = open(source, O_RDONLY);
+	ifd = do_open(source, O_RDONLY, 0);
 	if (ifd == -1) {
 		rprintf(FERROR,"open %s: %s\n",
 			source,strerror(errno));
-- 
2.34.1