Changeset 177 for trunk

Timestamp:

07/11/07 19:55:59 (17 months ago)

Author:

zany

Message:

binary file mode on win32

Files:

• trunk/obexftp/client.c (modified) (3 diffs)

trunk/obexftp/client.c

@@ -42 +42 @@
 #include <winsock2.h>
 #define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
-#define S_IRGRP 0
-#define S_IROTH 0
+#define O_BINARY (_O_BINARY)
+#define CREATE_MODE_FILE (S_IRUSR|S_IWUSR)
 #else
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
+#define O_BINARY (0)
+#define CREATE_MODE_FILE (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)
 #endif /* _WIN32 */
 
@@ -362 +364 @@
                                 int fd;
                                 //fd = open_safe("", cli-> target_fn);
-                                fd = creat(cli-> target_fn,
-                                           S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+                                fd = creat(cli-> target_fn, CREATE_MODE_FILE);
                                 if(fd > 0) {
                                         (void) write(fd, body_data, body_len);
@@ -987 +988 @@
         }
         
-        cli->fd = open(filename, O_RDONLY, 0);
+        cli->fd = open(filename, O_RDONLY | O_BINARY, 0);
         if(cli->fd < 0)
                 ret = -1;