[maemo-commits] [maemo-commits] r15305 - in projects/haf/trunk/osso-gnomevfs-extra: . debian obex-module/src

[From: subversion at stage.maemo.org]

Author: richard
Date: 2008-03-19 12:42:30 +0200 (Wed, 19 Mar 2008)
New Revision: 15305

Modified:
   projects/haf/trunk/osso-gnomevfs-extra/ChangeLog
   projects/haf/trunk/osso-gnomevfs-extra/configure.in
   projects/haf/trunk/osso-gnomevfs-extra/debian/changelog
   projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/obex-method.c
   projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/om-utils.c
Log:
NB#79291

Modified: projects/haf/trunk/osso-gnomevfs-extra/ChangeLog
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/ChangeLog	2008-03-19 10:37:28 UTC (rev 15304)
+++ projects/haf/trunk/osso-gnomevfs-extra/ChangeLog	2008-03-19 10:42:30 UTC (rev 15305)
@@ -1,3 +1,16 @@
+2008-03-19  Richard Hult  <richard at imendio.com>
+
+	* configure.in: Bump version.
+
+	* obex-module/src/obex-method.c: (do_create), (do_close),
+	(do_make_directory): Add debugging.
+	
+	* obex-module/src/om-utils.c: (om_utils_get_path_list_from_uri):
+	Treat NULL as the root, fixes crash.
+	
+	(om_utils_obex_error_to_vfs_result): Add the OBEX "unauthorized"
+	error and map to "not permitted" in GnomeVFS land.
+
 2008-01-23  Richard Hult  <richard at imendio.com>
 
 	* obex-module/src/obex-method.c: (do_close): Send abort through

Modified: projects/haf/trunk/osso-gnomevfs-extra/configure.in
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/configure.in	2008-03-19 10:37:28 UTC (rev 15304)
+++ projects/haf/trunk/osso-gnomevfs-extra/configure.in	2008-03-19 10:42:30 UTC (rev 15305)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
  
-AC_INIT(osso-gnomevfs-extra, 1.9.5)
+AC_INIT(osso-gnomevfs-extra, 1.9.6)
 AC_CONFIG_SRCDIR(obex-module/src/obex-method.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 

Modified: projects/haf/trunk/osso-gnomevfs-extra/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/debian/changelog	2008-03-19 10:37:28 UTC (rev 15304)
+++ projects/haf/trunk/osso-gnomevfs-extra/debian/changelog	2008-03-19 10:42:30 UTC (rev 15305)
@@ -1,8 +1,8 @@
-osso-gnomevfs-extra (1.9.6-1~unreleased) unstable; urgency=low
+osso-gnomevfs-extra (1.9.6-1) unstable; urgency=low
 
-  * 
+  * Fixes: NB#79291, gnome-vfs-daemon core dumps are generated when trying
 
- -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 12 Feb 2008 15:11:20 +0200
+ -- Richard Hult <richard at imendio.com>  Wed, 19 Mar 2008 11:24:55 +0100
 
 osso-gnomevfs-extra (1.9.5-1) unstable; urgency=low
 

Modified: projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/obex-method.c
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/obex-method.c	2008-03-19 10:37:28 UTC (rev 15304)
+++ projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/obex-method.c	2008-03-19 10:42:30 UTC (rev 15305)
@@ -41,7 +41,7 @@
 #include <dbus/dbus.h>
 
 /* For debug output (like errors/warnings). */
-#define d(x) x
+#define d(x) 
 
 /* For really verbose debug output (like for every read/write). */
 #define dv(x) 
@@ -818,6 +818,8 @@
 	GwObexXfer     *xfer;
 	gint            error;
 
+	d(g_printerr ("obex, do_create, uri: %s\n", gnome_vfs_uri_to_string(uri, 0)));
+
 	if (om_uri_is_below_virtual_obex_root (uri)) {
 		/* Files can't be created in the virtual root, it's
 		 * read-only.
@@ -900,6 +902,10 @@
 	result = GNOME_VFS_OK;
 	handle = (FileHandle *) method_handle;
 
+	if (handle->mode & GNOME_VFS_OPEN_WRITE) {
+		d(g_printerr ("obex, do_close, for write, uri: %s\n", gnome_vfs_uri_to_string(handle->uri, 0)));
+	}
+	
 	conn = om_get_connection (handle->uri, &result);
 	if (conn == NULL) {
 		return result;
@@ -1441,6 +1447,8 @@
 	ObexConnection *conn;
 	gint            error;
 
+        d(g_printerr ("obex, do_make_dir, uri: %s\n", gnome_vfs_uri_to_string(uri, 0)));
+
 	if (om_uri_is_below_virtual_obex_root (uri)) {
 		return GNOME_VFS_ERROR_NOT_SUPPORTED;
 	}

Modified: projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/om-utils.c
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/om-utils.c	2008-03-19 10:37:28 UTC (rev 15304)
+++ projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/om-utils.c	2008-03-19 10:42:30 UTC (rev 15305)
@@ -28,7 +28,7 @@
 
 #include "om-utils.h"
 
-#define d(x) x
+#define d(x) 
 
 
 /* Note: Uses URIs on the form:
@@ -154,6 +154,10 @@
 		new_path = om_utils_get_path_from_uri (uri);
 	}
 
+        if (new_path == NULL) {
+                new_path = g_strdup ("");
+        }
+
 	if (cur_dir && strcmp (new_path, cur_dir) == 0) {
 		/* Same path */
 		g_free (new_path);
@@ -288,6 +292,10 @@
 		d(g_printerr ("Error: RSP_BAD_REQUEST\n"));
 		return GNOME_VFS_ERROR_NOT_SUPPORTED;
 
+	case OBEX_RSP_UNAUTHORIZED: /* 0x41 */
+		d(g_printerr ("Error: RSP_UNAUTHORIZED\n"));
+		return GNOME_VFS_ERROR_NOT_PERMITTED;
+
 	case OBEX_RSP_FORBIDDEN: /* 0x43 */
 		d(g_printerr ("Error: RSP_FORBIDDEN\n"));
 		return GNOME_VFS_ERROR_NOT_PERMITTED;