Hello community,
here is the log from the commit of package obexfs
checked in at Sun Aug 6 21:56:34 CEST 2006.
--------
--- obexfs/obexfs.changes 2006-04-23 23:30:51.000000000 +0200
+++ obexfs/obexfs.changes 2006-08-04 17:14:42.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Aug 4 17:14:09 CEST 2006 - cthiel@suse.de
+
+- update to version 0.10
+ * Removed statfs (caused problems on all but Siemens)
+ * 64-bit safe printf format
+ * added usb support
+ * device/channel code cleanup
+
+-------------------------------------------------------------------
Old:
----
obexfs-0.8.tar.bz2
New:
----
obexfs-0.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obexfs.spec ++++++
--- /var/tmp/diff_new_pack.akM1xJ/_old 2006-08-06 21:56:28.000000000 +0200
+++ /var/tmp/diff_new_pack.akM1xJ/_new 2006-08-06 21:56:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package obexfs (Version 0.8)
+# spec file for package obexfs (Version 0.10)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,8 +13,8 @@
Name: obexfs
BuildRequires: fuse-devel glib2-devel obexftp-devel openobex-devel
Summary: FUSE based filesystem using ObexFTP
-Version: 0.8
-Release: 2
+Version: 0.10
+Release: 1
License: GPL
Group: System/Filesystems
Source: %{name}-%{version}.tar.bz2
@@ -52,5 +52,11 @@
%{_bindir}/*
%changelog -n obexfs
+* Fri Aug 04 2006 - cthiel@suse.de
+- update to version 0.10
+ * Removed statfs (caused problems on all but Siemens)
+ * 64-bit safe printf format
+ * added usb support
+ * device/channel code cleanup
* Sun Apr 23 2006 - cthiel@suse.de
- initial package (version 0.8)
++++++ obexfs-0.8.tar.bz2 -> obexfs-0.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/obexfs-0.8/ChangeLog new/obexfs-0.10/ChangeLog
--- old/obexfs-0.8/ChangeLog 2005-09-23 19:20:20.000000000 +0200
+++ new/obexfs-0.10/ChangeLog 2006-07-04 19:23:12.000000000 +0200
@@ -1,3 +1,16 @@
+2006-07-03 Christian W. Zuckschwerdt
+
+ * Removed statfs (caused problems on all but Siemens)
+
+2006-06-12 Christian W. Zuckschwerdt
+
+ * 64-bit safe printf format (Roberto Pariset)
+
+2006-03-07 Christian W. Zuckschwerdt
+
+ * added usb support (Stanislav Nikolov)
+ * device/channel code cleanup
+
2005-09-23 Christian W. Zuckschwerdt
* rewrite for multiple devices auto scanning
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/obexfs-0.8/configure new/obexfs-0.10/configure
--- old/obexfs-0.8/configure 2006-02-08 22:19:30.000000000 +0100
+++ new/obexfs-0.10/configure 2006-07-04 19:21:36.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for ObexFS 0.8.
+# Generated by GNU Autoconf 2.59 for ObexFS 0.10.
#
# Report bugs to .
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='ObexFS'
PACKAGE_TARNAME='obexfs'
-PACKAGE_VERSION='0.8'
-PACKAGE_STRING='ObexFS 0.8'
+PACKAGE_VERSION='0.10'
+PACKAGE_STRING='ObexFS 0.10'
PACKAGE_BUGREPORT='zany@triq.net'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB PKG_CONFIG ac_pt_PKG_CONFIG OPENOBEX_CFLAGS OPENOBEX_LIBS LIBOBJS LTLIBOBJS'
@@ -683,13 +683,13 @@
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
+ if test ! -r "$srcdir/$ac_unique_file"; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r $srcdir/$ac_unique_file; then
+if test ! -r "$srcdir/$ac_unique_file"; then
if test "$ac_srcdir_defaulted" = yes; then
{ echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
{ (exit 1); exit 1; }; }
@@ -698,7 +698,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
{ echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
{ (exit 1); exit 1; }; }
srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
@@ -750,7 +750,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ObexFS 0.8 to adapt to many kinds of systems.
+\`configure' configures ObexFS 0.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -812,7 +812,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ObexFS 0.8:";;
+ short | recursive ) echo "Configuration of ObexFS 0.10:";;
esac
cat <<\_ACEOF
@@ -934,7 +934,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-ObexFS configure 0.8
+ObexFS configure 0.10
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -948,7 +948,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ObexFS $as_me 0.8, which was
+It was created by ObexFS $as_me 0.10, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1560,7 +1560,7 @@
# Define the identity of the package.
PACKAGE='obexfs'
- VERSION='0.8'
+ VERSION='0.10'
cat >>confdefs.h <<_ACEOF
@@ -3544,7 +3544,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by ObexFS $as_me 0.8, which was
+This file was extended by ObexFS $as_me 0.10, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3607,7 +3607,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-ObexFS config.status 0.8
+ObexFS config.status 0.10
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/obexfs-0.8/configure.in new/obexfs-0.10/configure.in
--- old/obexfs-0.8/configure.in 2006-02-08 22:18:40.000000000 +0100
+++ new/obexfs-0.10/configure.in 2006-07-04 19:21:20.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT(ObexFS, 0.8, zany@triq.net)
+AC_INIT(ObexFS, 0.10, zany@triq.net)
#AC_CONFIG_SRCDIR(src/foo.c)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/obexfs-0.8/fuse/obexautofs.c new/obexfs-0.10/fuse/obexautofs.c
--- old/obexfs-0.8/fuse/obexautofs.c 2006-01-19 15:46:37.000000000 +0100
+++ new/obexfs-0.10/fuse/obexautofs.c 2006-07-04 19:21:11.000000000 +0200
@@ -1,7 +1,8 @@
/*
* obexautofs.c: FUSE Filesystem to access OBEX with automount
+ * This is just a wrapper. ObexFTP API does the real work.
*
- * Copyright (c) 2005 Christian W. Zuckschwerdt
+ * Copyright (c) 2003-2006 Christian W. Zuckschwerdt
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -18,10 +19,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
-/*
- * Created at: 2005-09-22
- * This is just a wrapper. ObexFTP API does the real work.
- */
/* strndup */
#define _GNU_SOURCE
@@ -33,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -97,7 +95,7 @@
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)
{
@@ -398,7 +396,7 @@
return 0;
}
-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;
@@ -615,7 +613,7 @@
actual = wb->size - offset;
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 %zu (peek: %02x\n", path, offset, actual, wb->data[offset]);
memcpy(buf, wb->data + offset, actual);
return actual;
@@ -625,7 +623,7 @@
{
data_buffer_t *wb;
size_t newsize;
- DEBUG("Writing %s at %lld for %d\n", path, offset, size);
+ DEBUG("Writing %s at %" PRId64 " for %zu\n", path, offset, size);
wb = (data_buffer_t *)fi->fh;
if (!wb)
@@ -645,7 +643,7 @@
wb->size = newsize;
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);
return size;
@@ -662,7 +660,7 @@
wb = (data_buffer_t *)fi->fh;
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);
if (!conn)
@@ -683,11 +681,11 @@
return 0;
}
+#ifdef SIEMENS
/* just sum all clients */
static int ofs_statfs(const char *UNUSED(label), struct statfs *st)
{
connection_t *conn;
- int res;
int size = 0, free = 0;
for (conn = connections; conn; conn = conn->next)
@@ -723,6 +721,7 @@
return 0;
}
+#endif
static void *ofs_init(void) {
@@ -736,7 +735,7 @@
return NULL;
}
-static void ofs_destroy(void *private_data) {
+static void ofs_destroy(void *UNUSED(private_data)) {
connection_t *conn;
DEBUG("terminating...\n");
@@ -774,7 +773,9 @@
open: ofs_open,
read: ofs_read,
write: ofs_write,
+#ifdef SIEMENS
statfs: ofs_statfs,
+#endif
release: ofs_release,
flush: NULL,
fsync: NULL,
@@ -784,8 +785,6 @@
int main(int argc, char *argv[])
{
- int res;
-
while (1) {
int option_index = 0;
int c;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/obexfs-0.8/fuse/obexfs.c new/obexfs-0.10/fuse/obexfs.c
--- old/obexfs-0.8/fuse/obexfs.c 2006-01-19 15:46:43.000000000 +0100
+++ new/obexfs-0.10/fuse/obexfs.c 2006-07-04 19:20:34.000000000 +0200
@@ -1,7 +1,8 @@
/*
* obexfs.c: FUSE Filesystem to access OBEX
+ * This is just a wrapper. ObexFTP API does the real work.
*
- * Copyright (c) 2003-2005 Christian W. Zuckschwerdt
+ * Copyright (c) 2003-2006 Christian W. Zuckschwerdt
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -18,10 +19,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
-/*
- * Created at: 2003-01-05
- * This is just a wrapper. ObexFTP API does the real work.
- */
/* strndup */
#define _GNU_SOURCE
@@ -32,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -66,10 +64,9 @@
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;
@@ -95,7 +92,7 @@
for (retry = 0; retry < 3; retry++) {
/* Connect */
- if (obexftp_connect (cli, btaddr, btchannel) >= 0)
+ if (obexftp_connect (cli, device, channel) >= 0)
return 0;
/* Still trying to connect */
sleep(1);
@@ -350,7 +347,7 @@
actual = wb->size - offset;
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 %zu (peek: %02x\n", path, offset, actual, wb->data[offset]);
memcpy(buf, wb->data + offset, actual);
return actual;
@@ -360,7 +357,7 @@
{
data_buffer_t *wb;
size_t newsize;
- DEBUG("Writing %s at %lld for %d\n", path, offset, size);
+ DEBUG("Writing %s at %" PRId64 " for %zu\n", path, offset, size);
wb = (data_buffer_t *)fi->fh;
if (!wb)
@@ -380,7 +377,7 @@
wb->size = newsize;
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);
return size;
@@ -395,7 +392,7 @@
wb = (data_buffer_t *)fi->fh;
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();
if(res < 0)
@@ -412,6 +409,7 @@
return 0;
}
+#ifdef SIEMENS
static int ofs_statfs(const char *UNUSED(label), struct statfs *st)
{
int res;
@@ -425,7 +423,7 @@
/* 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 */
(void) obexftp_info(cli, 0x01);
@@ -436,7 +434,7 @@
DEBUG("%s() GOT FS STAT: %d / %d\n", __func__, free, size);
(void) obexftp_disconnect (cli);
- (void) obexftp_connect (cli, btaddr, btchannel);
+ (void) obexftp_connect (cli, device, channel);
ofs_disconnect();
@@ -451,13 +449,14 @@
return 0;
}
+#endif
static void *ofs_init(void) {
//cli_open();
return NULL;
}
-static void ofs_destroy(void *private_data) {
+static void ofs_destroy(void *UNUSED(private_data)) {
fprintf(stderr, "terminating...\n");
cli_close();
return;
@@ -484,7 +483,9 @@
open: ofs_open,
read: ofs_read,
write: ofs_write,
+#ifdef SIEMENS
statfs: ofs_statfs,
+#endif
release: ofs_release,
flush: NULL,
fsync: NULL,
@@ -503,14 +504,16 @@
{"irda", no_argument, NULL, 'i'},
{"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'},
{"usage", no_argument, NULL, 'h'},
{0, 0, 0, 0}
};
- 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)
break;
@@ -519,27 +522,55 @@
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;
case 'N':
@@ -555,7 +586,9 @@
" -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"
+ " -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"
"Options to fusermount need to be preceeded by two dashes (--).\n"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...