Ticket #315: opie-sync-fix_seperator_path.diff

src/opie_comms.c

@@ -263 +263 @@
       env->username &&
       env->password )
   {  
-      char* separator_path;
+      char* separator_path = NULL;
+      char* root_path = NULL;
       if ( env->use_qcop ) 
       {
           qcop_conn *qc_conn   = qcop_connect(env->url, env->username, env->password);
-          char* root_path      = qcop_get_root(qc_conn);
+          root_path = qcop_get_root(qc_conn);
           osync_trace( TRACE_INTERNAL, "QCop root path = %s", root_path );
-          separator_path = g_strdup_printf("%s/", root_path);
 
-/*    if(!separator_path)
-     g_strdup("/");*/
+          if ( root_path )
+                separator_path = g_strdup_printf("%s/", root_path);
+
           qcop_disconnect(qc_conn);
-          if ( root_path ) g_free(root_path);
-      } else {
-          separator_path = g_strdup( "/" );
+
+          if ( root_path ) 
+                g_free(root_path);
       }
 
+      if ( !root_path )
+          separator_path = g_strdup( "/" );
+
     /* fetch each of the requested files */
     for(t = 0; t < len; ++t)
     {