use do_open() instead of open() in several places to help the WinXX port
authorAndrew Tridgell <tridge@samba.org>
Mon, 25 Oct 1999 22:04:09 +0000 (22:04 +0000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 25 Oct 1999 22:04:09 +0000 (22:04 +0000)
and O_BINARY

checksum.c
generator.c
receiver.c
sender.c
util.c

index 194d899..0ce7259 100644 (file)
@@ -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);
index bbc328d..8afc8f7 100644 (file)
@@ -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));
index 6361d21..6eb9aca 100644 (file)
@@ -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) {
index 623d995..3a44346 100644 (file)
--- 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 2d1989d..947caa7 100644 (file)
--- 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));