Merge pull request #1319 from haiwen/format-path

[api] format dir path
haiwen · Jul 20, 2015 · d7db1d6 · d7db1d6
2 parents f50e063 + 50814f4
commit d7db1d6
Show file tree

Hide file tree

Showing 2 changed files with 146 additions and 99 deletions.
diff --git a/common/fs-mgr.c b/common/fs-mgr.c
@@ -2410,9 +2410,12 @@ seaf_fs_manager_get_dirent_by_path (SeafFSManager *mgr,
     parent_dir  = g_path_get_dirname(path);
     file_name = g_path_get_basename(path);
 
-    if (strcmp (parent_dir, ".") == 0)
+    if (strcmp (parent_dir, ".") == 0) {
         dir = seaf_fs_manager_get_seafdir (mgr, repo_id, version, root_id);
-    else
+        if (!dir) {
+            g_set_error (error, SEAFILE_DOMAIN, SEAF_ERR_DIR_MISSING, "directory is missing");
+        }
+    } else
         dir = seaf_fs_manager_get_seafdir_by_path (mgr, repo_id, version,
                                                    root_id, parent_dir, error);