Changeset 18 for trunk

Timestamp:

06/29/06 02:00:00 (3 years ago)

Author:

zany

Message:

Release 0.9

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• configure.in (modified) (1 diff)
• fuse/obexautofs.c (modified) (10 diffs)
• fuse/obexfs.c (modified) (14 diffs)

trunk/ChangeLog

@@ +1 @@
+2006-06-12  Christian W. Zuckschwerdt  <zany@triq.net>
+
+        * 64-bit safe printf format (Roberto Pariset)
+
+2006-03-07  Christian W. Zuckschwerdt  <zany@triq.net>
+
+        * added usb support (Stanislav Nikolov)
+        * device/channel code cleanup
+
 2005-09-23  Christian W. Zuckschwerdt  <zany@triq.net>
 

trunk/configure.in

@@ -1 @@
-AC_INIT(ObexFS, 0.8, zany@triq.net)
+AC_INIT(ObexFS, 0.9, zany@triq.net)
 #AC_CONFIG_SRCDIR(src/foo.c)
 AM_INIT_AUTOMAKE

trunk/fuse/obexautofs.c

@@ -34 +34 @@
 #include <stdlib.h>
 #include <unistd.h>
+#include <inttypes.h>
 #include <string.h>
 #include <time.h>
@@ -98 +99 @@
 static int discover_usb(void) { return -1; }
 
-static int discover_tty(char *port) { return -1; }
+static int discover_tty(char *UNUSED(port)) { return -1; }
 
 static int discover_bt(void)
@@ -399 +400 @@
 }
 
-static int ofs_readlink (const char *path, char *link, size_t size)
+static int ofs_readlink (const char *path, char *link, size_t UNUSED(size))
 {
         connection_t *conn;
@@ -616 +617 @@
         if (actual > size)
                 actual = size;
-        DEBUG("reading %s at %lld for %d (peek: %02x\n", path, offset, actual, wb->data[offset]);
+        DEBUG("reading %s at %" PRId64 " for %d (peek: %02x\n", path, offset, actual, wb->data[offset]);
         memcpy(buf, wb->data + offset, actual);
 
@@ -626 +627 @@
         data_buffer_t *wb;
         size_t newsize;
-        DEBUG("Writing %s at %lld for %d\n", path, offset, size);
+        DEBUG("Writing %s at %" PRId64 " for %d\n", path, offset, size);
         wb = (data_buffer_t *)fi->fh;
 
@@ -646 +647 @@
         wb->write_mode = 1;
 
-        DEBUG("memcpy to %p (%p) from %p cnt %d\n", wb->data + offset, wb->data, buf, size);
+        DEBUG("memcpy to %p (%p) from %p cnt %zu\n", wb->data + offset, wb->data, buf, size);
         (void) memcpy(&wb->data[offset], buf, size);
 
@@ -663 +664 @@
         DEBUG("Releasing: %s (%p)\n", path, wb);
         if (wb && wb->data && wb->write_mode) {
-                DEBUG("Now writing %s for %d (%02x)\n", path, wb->size, wb->data[0]);
+                DEBUG("Now writing %s for %zu (%02x)\n", path, wb->size, wb->data[0]);
 
                 conn = ofs_find_connection(path, &filepath);
@@ -688 +689 @@
 {
         connection_t *conn;
-        int res;
         int size = 0, free = 0;
 
@@ -737 +737 @@
 }
 
-static void ofs_destroy(void *private_data) {
+static void ofs_destroy(void *UNUSED(private_data)) {
         connection_t *conn;
         
@@ -785 +785 @@
 int main(int argc, char *argv[])
 {
-        int res;
-        
         while (1) {
                 int option_index = 0;

trunk/fuse/obexfs.c

@@ -33 +33 @@
 #include <stdlib.h>
 #include <unistd.h>
+#include <inttypes.h>
 #include <string.h>
 #include <time.h>
@@ -67 +68 @@
 
 static obexftp_client_t *cli = NULL;
-static char *tty = NULL; // "/dev/ttyS0";
 static int transport = 0;
-static char *btaddr = NULL; // "00:11:22:33:44:55";
-static int btchannel = 6; // 10;
+static char *device = NULL; // "00:11:22:33:44:55"; "/dev/ttyS0";
+static int channel = 6; // 10;
 
 static int nonblock = 0;
@@ -96 +96 @@
 
                 /* Connect */
-                if (obexftp_connect (cli, btaddr, btchannel) >= 0)
+                if (obexftp_connect (cli, device, channel) >= 0)
                         return 0;
                 /* Still trying to connect */
@@ -351 +351 @@
         if (actual > size)
                 actual = size;
-        DEBUG("reading %s at %lld for %d (peek: %02x\n", path, offset, actual, wb->data[offset]);
+        DEBUG("reading %s at %" PRId64 " for %d (peek: %02x\n", path, offset, actual, wb->data[offset]);
         memcpy(buf, wb->data + offset, actual);
 
@@ -361 +361 @@
         data_buffer_t *wb;
         size_t newsize;
-        DEBUG("Writing %s at %lld for %d\n", path, offset, size);
+        DEBUG("Writing %s at %" PRId64 " for %d\n", path, offset, size);
         wb = (data_buffer_t *)fi->fh;
 
@@ -381 +381 @@
         wb->write_mode = 1;
 
-        DEBUG("memcpy to %p (%p) from %p cnt %d\n", wb->data + offset, wb->data, buf, size);
+        DEBUG("memcpy to %p (%p) from %p cnt %zu\n", wb->data + offset, wb->data, buf, size);
         (void) memcpy(&wb->data[offset], buf, size);
 
@@ -396 +396 @@
         DEBUG("Releasing: %s (%p)\n", path, wb);
         if (wb && wb->data && wb->write_mode) {
-                DEBUG("Now writing %s for %d (%02x)\n", path, wb->size, wb->data[0]);
+                DEBUG("Now writing %s for %zu (%02x)\n", path, wb->size, wb->data[0]);
 
                 res = ofs_connect();
@@ -426 +426 @@
         /* for S45 */
         (void) obexftp_disconnect (cli);
-        (void) obexftp_connect_uuid (cli, btaddr, btchannel, UUID_S45, sizeof(UUID_S45));
+        (void) obexftp_connect_uuid (cli, device, channel, UUID_S45, sizeof(UUID_S45));
  
         /* Retrieve Infos */
@@ -437 +437 @@
  
         (void) obexftp_disconnect (cli);
-        (void) obexftp_connect (cli, btaddr, btchannel);
+        (void) obexftp_connect (cli, device, channel);
 
         ofs_disconnect();
@@ -458 +458 @@
 }
 
-static void ofs_destroy(void *private_data) {
+static void ofs_destroy(void *UNUSED(private_data)) {
         fprintf(stderr, "terminating...\n");
         cli_close();
@@ -504 +504 @@
                         {"bluetooth",   required_argument, NULL, 'b'},
                         {"channel",     required_argument, NULL, 'B'},
+                        {"usb",         required_argument, NULL, 'u'},
                         {"tty",         required_argument, NULL, 't'},
+                        {"network",     required_argument, NULL, 'n'},
                         {"nonblock",    no_argument, NULL, 'N'},
                         {"help",        no_argument, NULL, 'h'},
@@ -511 +513 @@
                 };
                 
-                c = getopt_long (argc, argv, "+ib:B:t:Nh",
+                c = getopt_long (argc, argv, "+ib:B:u:t:n:Nh",
                                  long_options, &option_index);
                 if (c == -1)
@@ -520 +522 @@
                 case 'i':
                         transport = OBEX_TRANS_IRDA;
+                        if (device != NULL)
+                                free(device);
+                        device = NULL;
+                        channel = 0;
                         break;
                 
                 case 'b':
                         transport = OBEX_TRANS_BLUETOOTH;
-                        if (btaddr != NULL)
-                                free (btaddr);
-                        btaddr = optarg;
+                        if (device != NULL)
+                                free (device);
+                        device = optarg;
                         break;
                         
                 case 'B':
-                        btchannel = atoi(optarg);
+                        channel = atoi(optarg);
+                        break;
+                        
+                case 'u':
+                        if (geteuid() != 0)
+                                fprintf(stderr, "If USB doesn't work setup permissions in udev or run as superuser.\n");
+                        transport = OBEX_TRANS_USB;
+                        if (device != NULL)
+                                free(device);
+                        device = NULL;
+                        channel = atoi(optarg);
                         break;
                 
                 case 't':
                         transport = OBEX_TRANS_CUSTOM;
-                        if (tty != NULL)
-                                free (tty);
-                        tty = NULL;
+                        if (device != NULL)
+                                free(device);
+                        device = NULL;
+                        channel = 0;
 
                         if (strcasecmp(optarg, "irda"))
-                                tty = optarg;
+                                device = optarg;
+                        break;
+                        
+                case 'n':
+                        transport = OBEX_TRANS_INET;
+                        if (device != NULL)
+                                free(device);
+                        device = optarg;
+                        channel = 650;
+                        {
+                                int n;
+                                if (sscanf(optarg, "%d.%d.%d.%d", &n, &n, &n, &n) != 4)
+                                        fprintf(stderr, "Please use dotted quad notation.\n");
+                        }
                         break;
                         
@@ -556 +586 @@
                                 " -b, --bluetooth <device>    connect to this bluetooth device\n"
                                 " -B, --channel <number>      use this bluetooth channel when connecting\n"
-                                " -t, --tty <device>          connect to this tty using a custom transport\n\n"
+                                " -u, --usb <interface>       connect to this usb interface number\n"
+                                " -t, --tty <device>          connect to this tty using a custom transport\n"
+                                " -n, --network <device>      connect to this network host\n\n"
                                 " -N, --nonblock              nonblocking mode\n\n"
                                 " -h, --help, --usage         this help text\n\n"