Changeset 3440

Timestamp:

07/14/08 11:46:31 (1 month ago)

Author:

dgollub

Message:

Don't use '/' in ANY path. Use the dir separtaor character.

Files:

• trunk/opensync/client/opensync_client_proxy.c (modified) (3 diffs)
• trunk/opensync/engine/opensync_engine.c (modified) (2 diffs)
• trunk/opensync/format/opensync_format_env.c (modified) (1 diff)
• trunk/opensync/group/opensync_group.c (modified) (12 diffs)
• trunk/opensync/group/opensync_group_env.c (modified) (5 diffs)
• trunk/opensync/group/opensync_member.c (modified) (4 diffs)
• trunk/opensync/group/opensync_updater.c (modified) (6 diffs)
• trunk/opensync/opensync_support.c (modified) (1 diff)
• trunk/opensync/plugin/opensync_plugin_env.c (modified) (1 diff)
• trunk/opensync/version/opensync_version.c (modified) (1 diff)

trunk/opensync/client/opensync_client_proxy.c

@@ -110 +110 @@
-/*static char *_osync_client_pid_filename(OSyncClientProxy *proxy)
-{
-/osplugin.pid", proxy->path
+%cosplugin.pid", proxy->path, G_DIR_SEPARATOR
-}*/
-
@@ -896 +896 @@
-                        goto error;
-        } else {
-/pluginpipe", path
+%cpluginpipe", path, G_DIR_SEPARATOR
-                proxy->outgoing = osync_queue_new(name, error);
-                g_free(name);
@@ -902 +902 @@
-                        goto error;
-                
-/enginepipe", path
+%cenginepipe", path, G_DIR_SEPARATOR
-                proxy->incoming = osync_queue_new(name, error);
-                g_free(name);

trunk/opensync/engine/opensync_engine.c

@@ -381 +381 @@
-                osync_trace(TRACE_INTERNAL, "No config dir found. Making stateless sync");
-        } else {
-/archive.db", osync_group_get_configdir(group)
+%carchive.db", osync_group_get_configdir(group), G_DIR_SEPARATOR
-                engine->archive = osync_archive_new(filename, error);
-                g_free(filename);
@@ -406 +406 @@
-        g_main_context_ref(engine->context);
-
-/.opensync/engines", g_get_home_dir()
-/enginepipe", enginesdir
+%c.opensync%cengines", g_get_home_dir(), G_DIR_SEPARATOR, G_DIR_SEPARATOR
+%cenginepipe", enginesdir, G_DIR_SEPARATOR
-        
-        if (g_mkdir_with_parents(enginesdir, 0755) < 0) {

trunk/opensync/format/opensync_format_env.c

@@ -70 +70 @@
-        
-        while ((de = g_dir_read_name(dir))) {
-/%s", path
+%c%s", path, G_DIR_SEPARATOR
-                
-                if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR) || !g_pattern_match_simple("*.so", filename)) {

trunk/opensync/group/opensync_group.c

@@ -94 +94 @@
-                if (filename)
-                        g_free(filename);
-/%lli", group->configdir
+%c%lli", group->configdir, G_DIR_SEPARATOR
-        } while (g_file_test(filename, G_FILE_TEST_EXISTS));
-        
@@ -130 +130 @@
-
-        while ((de = g_dir_read_name(dir))) {
-/%s/syncmember.conf", osync_group_get_configdir(group), de
+%c%s%csyncmember.conf", osync_group_get_configdir(group), G_DIR_SEPARATOR, de, G_DIR_SEPARATOR
-                if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
-                        g_free(filename);
@@ -146 +146 @@
-#endif /* OPENSYNC_UNITTESTS */
-                
-/%s", osync_group_get_configdir(group)
+%c%s", osync_group_get_configdir(group), G_DIR_SEPARATOR
-                if (!osync_member_load(member, member_path, error)) {
-                        g_free(member_path);
@@ -377 +377 @@
-        }
-        
-/lock", group->configdir
+%clock", group->configdir, G_DIR_SEPARATOR
-
-        if (g_file_test(lockfile, G_FILE_TEST_EXISTS)) {
@@ -463 +463 @@
-        group->lock_fd = 0;
-        
-/lock", group->configdir
+%clock", group->configdir, G_DIR_SEPARATOR
-        
-        g_unlink(lockfile);
@@ -531 +531 @@
-        }
-        
-/syncgroup.conf", group->configdir
+%csyncgroup.conf", group->configdir, G_DIR_SEPARATOR
-        osync_trace(TRACE_INTERNAL, "Saving group to file %s", filename);
-        
@@ -653 +653 @@
-
-                /* flush hashtable */
-/hashtable.db", osync_member_get_configdir(member)
+%chashtable.db", osync_member_get_configdir(member), G_DIR_SEPARATOR
-                if (!(db = osync_db_new(error)))
-                        goto error_and_free;
@@ -665 +665 @@
-
-                /* flush anchor db */ 
-/anchor.db", osync_member_get_configdir(member)
+%canchor.db", osync_member_get_configdir(member), G_DIR_SEPARATOR
-                if (!(db = osync_db_new(error)))
-                        goto error_and_free;
@@ -678 +678 @@
-        }
-
-/archive.db", osync_group_get_configdir(group)
+%carchive.db", osync_group_get_configdir(group), G_DIR_SEPARATOR
-        if (!(db = osync_db_new(error)))
-                goto error_and_free;
@@ -723 +723 @@
-        if (!g_path_is_absolute(path)) {
-                char *curdir = g_get_current_dir();
-/%s", curdir
+%c%s", curdir, G_DIR_SEPARATOR
-                g_free(curdir);
-        } else {
@@ -730 +730 @@
-        
-        osync_group_set_configdir(group, real_path);
-/syncgroup.conf", real_path
+%csyncgroup.conf", real_path, G_DIR_SEPARATOR
-        g_free(real_path);
-        
@@ -860 +860 @@
-        
-        if (!osync_member_get_configdir(member)) {
-/%lli", group->configdir
+%c%lli", group->configdir, G_DIR_SEPARATOR
-                osync_member_set_configdir(member, configdir);
-                g_free(configdir);

trunk/opensync/group/opensync_group_env.c

@@ -64 +64 @@
-                if (filename)
-                        g_free(filename);
-/group%lli", env->groupsdir
+%cgroup%lli", env->groupsdir, G_DIR_SEPARATOR
-        } while (g_file_test(filename, G_FILE_TEST_EXISTS));
-        g_free(filename);
@@ -176 +176 @@
-                        homedir = g_get_home_dir();
-
-/.opensync", homedir
+%c.opensync", homedir, G_DIR_SEPARATOR
-                osync_trace(TRACE_INTERNAL, "Default home dir: %s", env->groupsdir);
-                
@@ -188 +188 @@
-        } else {
-                if (!g_path_is_absolute(path)) {
-/%s", g_get_current_dir()
+%c%s", g_get_current_dir(), G_DIR_SEPARATOR
-                } else {
-                        env->groupsdir = g_strdup(path);
@@ -208 +208 @@
-        
-        while ((de = g_dir_read_name(dir))) {
-/%s", env->groupsdir
+%c%s", env->groupsdir, G_DIR_SEPARATOR
-                
-                if (!g_file_test(filename, G_FILE_TEST_IS_DIR) || !g_pattern_match_simple("group*", de)) {
@@ -302 +302 @@
-        
-        if (!osync_group_get_configdir(group)) {
-/group%lli", env->groupsdir
+%cgroup%lli", env->groupsdir, G_DIR_SEPARATOR
-                osync_group_set_configdir(group, configdir);
-                g_free(configdir);

trunk/opensync/group/opensync_member.c

@@ -440 +440 @@
-        }
-        
-/%s.conf", member->configdir
+%c%s.conf", member->configdir, G_DIR_SEPARATOR
-        osync_trace(TRACE_INTERNAL, "Reading config from: %s", filename);
-        
@@ -511 +511 @@
-        osync_trace(TRACE_ENTRY, "%s(%p, %s, %p)", __func__, member, path, error);
-
-/syncmember.conf", path
+%csyncmember.conf", path, G_DIR_SEPARATOR
-        
-        basename = g_path_get_basename(path);
@@ -700 +700 @@
-
-        //Saving the syncmember.conf
-/syncmember.conf", member->configdir
+%csyncmember.conf", member->configdir, G_DIR_SEPARATOR
-        xmlSaveFormatFile(filename, doc, 1);
-        g_free(filename);
@@ -708 +708 @@
-        //Saving the config if it exists
-        if (member->config) {
-/%s.conf", member->configdir
+%c%s.conf", member->configdir, G_DIR_SEPARATOR
-                if (!osync_plugin_config_file_save(member->config, filename, error)) {
-                        g_free(filename);

trunk/opensync/group/opensync_updater.c

@@ -453 +453 @@
-
-        while ((de = g_dir_read_name(dir))) {
-/%s/", backup_groupdir, de
+%c%s%c", backup_groupdir, G_DIR_SEPARATOR, de, G_DIR_SEPARATOR
-                if (!g_file_test(member_path, G_FILE_TEST_IS_DIR)) {
-                        g_free(member_path);
@@ -476 +476 @@
-                }
-
-/%s/", orig_groupdir, de
+%c%s%c", orig_groupdir, G_DIR_SEPARATOR, de, G_DIR_SEPARATOR
-                if (g_mkdir(member_path, orig_stat.st_mode) < 0) { 
-                        g_set_error(&gerror, G_FILE_ERROR, errno, NULL);
@@ -487 +487 @@
-
-                while ((member_de = g_dir_read_name(member_dir))) {
-/%s/%s", backup_groupdir, de
+%c%s%c%s", backup_groupdir, G_DIR_SEPARATOR, de, G_DIR_SEPARATOR
-                        
-                        /* Only copy files ending with ".conf" */
@@ -503 +503 @@
-                        g_free(config);
-
-/%s/%s", orig_groupdir, de
+%c%s%c%s", orig_groupdir, G_DIR_SEPARATOR, de, G_DIR_SEPARATOR
-
-                        if (!g_file_set_contents(copy_config, content, length, &gerror)) {
@@ -523 +523 @@
-
-
-/%s", backup_groupdir
+%c%s", backup_groupdir, G_DIR_SEPARATOR
-
-        if (!g_file_get_contents(config, &content, &length, &gerror)) {
@@ -533 +533 @@
-        g_free(config);
-
-/%s", orig_groupdir
+%c%s", orig_groupdir, G_DIR_SEPARATOR
-
-        if (!g_file_set_contents(copy_config, content, length, &gerror)) {

trunk/opensync/opensync_support.c

@@ -167 +167 @@
-        endline = "\n";
-#endif
-/Thread%lu-%i.log", trace
+%cThread%lu-%i.log", trace, G_DIR_SEPARATOR
-        
-        va_start(arglist, message);

trunk/opensync/plugin/opensync_plugin_env.c

@@ -146 +146 @@
-        
-        while ((de = g_dir_read_name(dir))) {
-/%s", path
+%c%s", path, G_DIR_SEPARATOR
-                
-                if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR) || !g_pattern_match_simple("*.so", filename)) {

trunk/opensync/version/opensync_version.c

@@ -125 +125 @@
-        
-        while ((de = g_dir_read_name(dir))) {
-/%s", descpath
+%c%s", descpath, G_DIR_SEPARATOR
-                
-                if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR) || !g_pattern_match_simple("*.xml", filename)) {