Changeset 4 for trunk

Timestamp:

01/15/04 01:00:00 (5 years ago)

Author:

zany

Message:

Release 0.2

Location:

trunk

Files:

• configure.in (modified) (1 diff)
• fuse/Makefile.am (modified) (1 diff)
• fuse/obexfs.c (modified) (14 diffs)

trunk/configure.in

@@ -1 +1 @@
 AC_INIT(fuse/obexfs.c)
-AM_INIT_AUTOMAKE(obexfs, 0.1)
+AM_INIT_AUTOMAKE(obexfs, 0.2)
 AM_CONFIG_HEADER(config.h)
 

trunk/fuse/Makefile.am

@@ -2 +2 @@
 
 LDADD =                         -lfuse -lpthread \
-                                -lopenobex -lobexftp \
-                                -lcobexbfb -lbfb -lcobexpe
+                                -lopenobex -lbluetooth \
+                                -L/var/tmp/y/usr/local/lib -lobexftp -lcobexbfb -lbfb
 
 obexfs_SOURCES =                obexfs.c

trunk/fuse/obexfs.c

@@ -2 +2 @@
  *  obexfs.c: FUSE Filesystem to access OBEX
  *
- *  Copyright (c) 2003 Christian W. Zuckschwerdt <zany@triq.net>
+ *  Copyright (c) 2003-2004 Christian W. Zuckschwerdt <zany@triq.net>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -37 +37 @@
 #include <errno.h>
 #include <sys/statfs.h>
+#include <getopt.h>
 
 #include <obexftp/obexftp.h>
 #include <obexftp/client.h>
 #include <cobexbfb/cobex_bfb.h>
-#include <cobexpe/cobex_pe.h>
-
-/* we do not want to include <linux/msdos_fs.h> */
-#define MSDOS_SUPER_MAGIC     0x4d44
-
-#if __GNUC__
-#define UNUSED __attribute__((unused))
-#else
-#define UNUSED
-#endif
+
+#define UNUSED(x) x __attribute__((unused))
 
 typedef struct {
@@ -69 +62 @@
 
 static obexftp_client_t *cli = NULL;
-static char *tty = "/dev/ttyS0";
-static char *transport = "siemens";
+static char *tty = NULL; // "/dev/ttyS0";
+static int transport = 0;
+static char *btaddr = NULL; // "00:11:22:33:44:55";
+static int btchannel = 5; // 10;
 
 static int info;
@@ -137 +132 @@
 
         if (tty != NULL) {
-                if ((transport != NULL) && !strcasecmp(transport, "ericsson")) {
-                        /* Custom transport set to 'Ericsson' */
-                        ctrans = cobex_pe_ctrans (tty);
-                } else {
-                        /* Custom transport set to 'Siemens' */
-                        ctrans = cobex_ctrans (tty);
-                }
+                /* Custom transport Siemens/Ericsson */
+                ctrans = cobex_ctrans (tty);
         }
         else {
@@ -151 +141 @@
 
         /* Open */
-        cli = obexftp_cli_open (ofs_info_cb, ctrans, NULL);
+        cli = obexftp_cli_open (transport, ctrans, ofs_info_cb, NULL);
         if(cli == NULL) {
                 /* Error opening obexftp-client */
@@ -160 +150 @@
 
                 /* Connect */
-                if (obexftp_cli_connect (cli) >= 0)
+                if (obexftp_cli_connect (cli, btaddr, btchannel) >= 0)
                         return 0;
                 /* Still trying to connect */
+                sleep(1);
         }
 
@@ -303 +294 @@
                         for (dir = cache[i].dir; dir && dir->name; dir++) {
                                 if (strcmp(p, dir->name) == 0) {
+                                        printf("found entry %s\n", dir->name);
                                         stbuf->st_mode = dir->mode;
                                         stbuf->st_nlink = 1;
@@ -346 +338 @@
         cache_ptr++;
 
+        printf("<<<<%s>>>>\n", path);
         ofs_disconnect();
         return 0;
@@ -373 +366 @@
                 }
 
-                (void) obexftp_setpath(cli, p, 0);
+                (void) obexftp_setpath(cli, p);
         }
 
@@ -413 +406 @@
 static int ofs_truncate(const char *path, off_t size)
 {
-        printf("Truncating %s to %ld\n", path, size);
+        printf("Truncating %s to %lld\n", path, size);
 
         return 0;
@@ -442 +435 @@
                 ofs_disconnect();
         }
-        printf("reading %s at %ld for %d\n", path, offset, size);
+        printf("reading %s at %lld for %d\n", path, offset, size);
         memcpy(buf, xfer_data + offset, size);
 
@@ -452 +445 @@
 static int ofs_write(const char *path, const char *UNUSED(buf), size_t size, off_t offset)
 {
-        printf("Writing %s at %ld for %d\n", path, offset, size);
-
-        return 0;
-}
-
-static int ofs_statfs(struct statfs *fst)
+        printf("Writing %s at %lld for %d\n", path, offset, size);
+
+        return 0;
+}
+
+static int ofs_statfs(struct fuse_statfs *fst)
 {
         int res;
         int size, free;
 
-        memset(fst, 0, sizeof(struct statfs));
+        memset(fst, 0, sizeof(struct fuse_statfs));
 
         res = ofs_connect();
@@ -476 +469 @@
         ofs_disconnect();
 
-        /* fst->f_type;     / * type of filesystem (see below) */
-        fst->f_bsize = 1;    /* optimal transfer block size */
-        fst->f_blocks = size;   /* total data blocks in file system */
-        fst->f_bfree = free;    /* free blocks in fs */
-        fst->f_bavail = free;   /* free blocks avail to non-superuser */
-
-        /* long    f_files;    / * total file nodes in file system */
-        /* long    f_ffree;    / * free file nodes in fs */
-        /* fsid_t  f_fsid;     / * file system id */
-        /* fst->f_namelen;  / * maximum length of filenames */
+        fst->block_size = 1;    /* optimal transfer block size */
+        fst->blocks = size;   /* total data blocks in file system */
+        fst->blocks_free = free;    /* free blocks in fs */
+
+        /* fst->files;    / * total file nodes in file system */
+        /* fst->files_free;    / * free file nodes in fs */
+        /* fst->namelen;  / * maximum length of filenames */
 
         return 0;
@@ -509 +499 @@
         write:          ofs_write,
         statfs:         ofs_statfs,
+        release:        NULL,
+        fsync:          NULL
+                
 };
 
 int main(int argc, char *argv[])
 {
-        fuse_main(argc, argv, &ofs_oper);
-        return 0;
-}
+        while (1) {
+                int option_index = 0;
+                int c;
+                static struct option long_options[] = {
+                        {"irda",        no_argument, NULL, 'i'},
+                        {"bluetooth",   required_argument, NULL, 'b'},
+                        {"channel",     required_argument, NULL, 'B'},
+                        {"tty",         required_argument, NULL, 't'},
+                        {"help",        no_argument, NULL, 'h'},
+                        {"usage",       no_argument, NULL, 'u'},
+                        {0, 0, 0, 0}
+                };
+                
+                c = getopt_long (argc, argv, "+ib:B:t:h",
+                                 long_options, &option_index);
+                if (c == -1)
+                        break;
+
+                switch (c) {
+                
+                case 'i':
+                        transport = OBEX_TRANS_IRDA;
+                        break;
+                
+                case 'b':
+                        transport = OBEX_TRANS_BLUETOOTH;
+                        if (btaddr != NULL)
+                                free (btaddr);
+                        btaddr = optarg;
+                        break;
+                        
+                case 'B':
+                        btchannel = atoi(optarg);
+                        break;
+                
+                case 't':
+                        transport = OBEX_TRANS_CUSTOM;
+                        if (tty != NULL)
+                                free (tty);
+
+                        if (!strcasecmp(optarg, "irda"))
+                                tty = NULL;
+                        else
+                                tty = optarg;
+                        break;
+
+                case 'h':
+                case 'u':
+                        printf("Usage: %s [-i | -b <dev> [-B <chan>] | -t <dev>] [-- <fuse options>]\n"
+                                "Transfer files from/to Mobile Equipment.\n"
+                                "Copyright (c) 2002-2004 Christian W. Zuckschwerdt\n"
+                                "\n"
+                                " -i, --irda                  connect using IrDA transport\n"
+                                " -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"
+                                " -h, --help, --usage         this help text\n\n"
+                                "Options to fusermount need to be preceeded by two dashes (--).\n"
+                                "\n",
+                                argv[0]);
+                        exit(0);
+                        break;
+
+                default:
+                        printf("Try `%s --help' for more information.\n",
+                                 argv[0]);
+                        exit(0);
+                }
+        }
+
+        if (transport == 0) {
+                fprintf(stderr, "No device selected. Use --help for help.\n");
+                exit(0);
+        }
+
+        argv[optind-1] = argv[0];
+        fuse_main(argc-optind+1, &argv[optind-1], &ofs_oper);
+        return 0;
+}