Changeset 148

Timestamp:

01/17/05 10:18:41 (4 years ago)

Author:

abauer

Message:

Fixed a bug, where the file-sync plugin would access the
context after freeing it.

Removed unessecary osync_env_group_remove

Location:

trunk

Files:

• plugins/file-sync/src/file_sync.c (modified) (1 diff)
• src/opensync_group.c (modified) (1 diff)
• src/opensync_member.c (modified) (1 diff)
• tests/check_filter.c (modified) (1 diff)

trunk/plugins/file-sync/src/file_sync.c

@@ -228 +228 @@
         osync_debug("FILE-SYNC", 4, "start: %s", __func__);
         osync_debug("FILE-SYNC", 3, "Writing change %s with changetype %i", osync_change_get_uid(change), osync_change_get_changetype(change));
+        filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
+        
         if (!fs_access(ctx, change))
                 return FALSE;
 
-        filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
         osync_hashtable_update_hash(fsinfo->hashtable, change);
         osync_debug("FILE-SYNC", 4, "end: %s", __func__);

trunk/src/opensync_group.c

@@ -291 +291 @@
         }
         g_free(delcmd);
-        osync_env_remove_group(group->env, group);
         osync_group_free(group);
         return TRUE;

trunk/src/opensync_member.c

@@ -713 +713 @@
 }
 
+/*void osync_member_set_read_only(OSyncMember *member, const char *objtypestr, osync_bool read_only)
+{
+        if (osync_conv_objtype_is_any(objtypestr))
+                g_assert_not_reached();
+        
+        g_assert(member);
+        OSyncObjTypeSink *sink = osync_member_find_objtype_sink(member, objtypestr);
+        g_assert(sink);
+        
+        sink->read_only = read_only;
+}*/
+
 void osync_member_set_format(OSyncMember *member, const char *objtypestr, const char *objformatstr)
 {

trunk/tests/check_filter.c

@@ -239 +239 @@
 END_TEST
 
+/*int num_read;
+
+START_TEST (filter_sync_read_only)
+{
+        char *testbed = setup_testbed("filter_sync_deny_all");
+        OSyncEnv *osync = osync_env_new();
+        osync_env_initialize(osync, NULL);
+        mark_point();
+        OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
+        fail_unless(group != NULL, NULL);
+        mark_point();
+        
+        OSyncMember *leftmember = osync_group_nth_member(group, 0);
+        
+        osync_member_set_read_only(leftmember, "data", TRUE);
+        
+        num_read = 0;
+        mark_point();
+        OSyncError *error = NULL;
+        OSyncEngine *engine = osync_engine_new(group, &error);
+        mark_point();
+        fail_unless(engine != NULL, NULL);
+        fail_unless(osync_engine_init(engine, &error), NULL);
+        mark_point();
+        fail_unless(osync_engine_synchronize(engine, &error), NULL);
+        mark_point();
+        
+        osync_engine_wait_sync_end(engine);
+        osync_engine_finalize(engine);
+
+        fail_unless(num_read == 1);
+
+        fail_unless(!system("test \"x$(ls data1/testdata)\" = \"xdata1/testdata\""), NULL);
+        fail_unless(!system("test \"x$(ls data1/testdata2)\" = \"xdata1/testdata2\""), NULL);
+        fail_unless(!system("test \"x$(ls data2/testdata2)\" = \"xdata2/testdata2\""), NULL);
+
+        destroy_testbed(testbed);
+}
+END_TEST*/
+
 Suite *filter_suite(void)
 {