Ticket #9: 800_win32_apps.patch

openobex-anoncvs

@@ -36 +36 @@
 #include <config.h>
 #endif
 
+#ifdef _WIN32
+#include <windows.h>
+#define sleep(sec) Sleep(1000*sec)
+#endif
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>

apps/obex_test_client.c

@@ -33 +33 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <libgen.h>
 #include <string.h>
 
+#ifdef _WIN32
+#warning "No implementation for basename() in win32!"
+#define basename(x) (x)
+#else
+#include <libgen.h>
+#endif
+
 #include <openobex/obex.h>
 
 #include "obex_io.h"

apps/obex_test_cable.h

@@ -33 +33 @@
 
 #define CABLE_DEBUG 1
 
-
+#ifdef _WIN32
+#include <windows.h>
+#define tty_desc_t DCB
+#else
 #include <termios.h>
+#define tty_desc_t struct termios
+#endif
 
 #ifdef CABLE_DEBUG
 #define CDEBUG(format, args...) printf("%s(): " format, __FUNCTION__ , ##args)
@@ -47 +52 @@
         const char *portname;
         int ttyfd;
         char inputbuf[500];
-        struct termios oldtio, newtio;
+        tty_desc_t oldtio, newtio;
         int r320;
 };
 

apps/obex_test_cable.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
-#include <sys/ioctl.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
-#include <termios.h>
+
+#ifndef _WIN32
+#include <sys/ioctl.h>
+#endif
 
 #include <openobex/obex.h>
 
@@ -60 +62 @@
 //
 int cobex_do_at_cmd(struct cobex_context *gt, char *cmd, char *rspbuf, int rspbuflen, int timeout)
 {
+#ifdef _WIN32
+#warning "Implementation for win32 is missing!"
+        return -1;
+#else
         fd_set ttyset;
         struct timeval tv;
         int fd;
@@ -151 +157 @@
         strncpy(rspbuf, answer, answer_size);
         rspbuf[answer_size] = 0;
         return 0;
+#endif
 }
 
 //
@@ -158 +165 @@
 //
 static int cobex_init(struct cobex_context *gt)
 {
+#ifdef _WIN32
+#warning "Implementation for win32 is missing!"
+#else
         char rspbuf[200];
 
         CDEBUG("\n");
@@ -214 +224 @@
                 return 1;
 err:
         cobex_cleanup(gt, TRUE);
+#endif
         return -1;
 }
 
@@ -222 +233 @@
 //
 static void cobex_cleanup(struct cobex_context *gt, int force)
 {
+#ifndef _WIN32
         if(force)       {
                 // Send a break to get out of OBEX-mode
 #ifdef TCSBRKP
@@ -236 +248 @@
         }
         close(gt->ttyfd);
         gt->ttyfd = -1;
+#endif
 }
 
 //

openobex-anoncvs

@@ -205 +205 @@
  *    First remove path and add "/tmp/". Then save.
  *
  */
+#ifndef DEFFILEMODE
+#define DEFFILEMODE 0
+#endif
 int safe_save_file(char *name, const uint8_t *buf, int len)
 {
         char *s = NULL;
@@ -222 +225 @@
                 s++;
 
         strncat(filename, s, 250);
-#ifdef _WIN32
-        fd = open(filename, O_RDWR | O_CREAT, 0);
-#else
         fd = open(filename, O_RDWR | O_CREAT, DEFFILEMODE);
-#endif
 
         if ( fd < 0) {
                 perror( filename);

ircp/dirtraverse.c

@@ -40 +40 @@
                 }
                 else {
                         snprintf(t, MAXPATHLEN, "%s/%s", path, dirent->d_name);
+#ifdef _WIN32
+#warning "Do not use symbolic links in Windows Vista or fix this."
+                        if (stat(t, &statbuf) < 0) {
+#else
                         if(lstat(t, &statbuf) < 0) {
+#endif
                                 return -1;
                         }
                         else if(S_ISREG(statbuf.st_mode)) {

openobex-anoncvs

@@ -115 +115 @@
 //
 // Open a file, but do some sanity-checking first.
 //
+#ifndef DEFFILEMODE
+#define DEFFILEMODE 0
+#endif
 int ircp_open_safe(const char *path, const char *name)
 {
         char diskname[MAXPATHLEN];
@@ -169 +172 @@
         }
         if(flags & CD_CREATE) {
                 DEBUG(4, "Will try to create %s\n", newpath);
+#ifdef _WIN32
+                ret = _mkdir(newpath);
+#else
                 ret = mkdir(newpath, DEFFILEMODE | S_IXGRP | S_IXUSR | S_IXOTH);
+#endif
         }
         else {
                 ret = -1;

apps/Makefile.am

@@ -14 +14 @@
         obex_test_server.c obex_test_server.h \
         obex_test_cable.c obex_test_cable.h
 
-obex_test_LDADD = $(top_builddir)/lib/libopenobex.la @BLUETOOTH_LIBS@ libmisc.a
+obex_test_LDADD = libmisc.a $(top_builddir)/lib/libopenobex.la @BLUETOOTH_LIBS@
 
-LDADD = $(top_builddir)/lib/libopenobex.la libmisc.a
+AM_CFLAGS = @OPENOBEX_CFLAGS@
+
+LDADD = libmisc.a $(top_builddir)/lib/libopenobex.la
 
 INCLUDES = @BLUETOOTH_CFLAGS@ -I$(top_builddir)/include
 endif

apps/obex_test.c

@@ -44 +44 @@
 #endif /* _WIN32 */
 
 #ifdef HAVE_BLUETOOTH
-#ifdef HAVE_BLUETOOTH_LINUX
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/rfcomm.h>
-#endif
-#ifdef HAVE_BLUETOOTH_FREEBSD
-#include <bluetooth.h>
-#define sockaddr_rc  sockaddr_rfcomm
-#define rc_family    rfcomm_family
-#define rc_bdaddr    rfcomm_bdaddr
-#define rc_channel   rfcomm_channel
-#define str2ba       bt_aton
-#endif
-#ifdef HAVE_BLUETOOTH_NETBSD
-#define rc_family    bt_family
-#define rc_bdaddr    bt_bdaddr
-#define rc_channel   bt_channel
-#define sockaddr_rc  sockaddr_bt
-#define str2ba       bt_aton
-#include <bluetooth.h>
-#include <netbt/rfcomm.h>
-#endif
+#include "../lib/bluez_compat.h"
 #endif
 
 #include <openobex/obex.h>

ircp/Makefile.am

@@ -11 +11 @@
 
 bin_PROGRAMS = ircp 
 
+AM_CFLAGS = @OPENOBEX_CFLAGS@
+
 LDADD = libircp.a $(top_builddir)/lib/libopenobex.la
 
 INCLUDES = -I$(top_builddir)/include