Changeset ef9e54e3fdea5f50be28da38b8c9801828bedec2

Timestamp:

09/05/10 01:31:22 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

7eaf2d172909418013d8e9cf19812bc6906cc2ad

Parents:

c5acbafc8f666d9cbc7c81f01deb0a3db01b22d4

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-09-05T01:31:22Z+0300

Message:

daemon: implement deduction of project dir from project name and vice versa

Files:

• daemon/room_save.c (modified) (3 diffs)

daemon/room_save.c

@@ -30 +30 @@
 #include <fcntl.h>
 #include <unistd.h>
+#include <libgen.h>             /* POSIX basename() */
 
 #include "room_internal.h"
@@ -224 +225 @@
   char * old_project_dir;
   char * old_project_name;
+  char * buffer;
   bool ret;
 
@@ -253 +255 @@
     {
       ASSERT(!name_supplied);
-      /* TODO */
-      log_error("Deducing project name from project dir is not implemented yet");
-      goto exit;
+
+      buffer = strdup(project_dir_param);
+      if (buffer == NULL)
+      {
+        log_error("strdup() failed for project dir");
+        goto exit;
+      }
+
+      project_name = basename(buffer);
+      log_info("Project name for dir '%s' will be '%s'", project_dir_param, project_name);
+      project_name = strdup(project_name);
+      free(buffer);
+      project_dir = strdup(project_dir_param); /* buffer cannot be used because it may be modified by basename() */
     }
     else if (name_supplied)
     {
       ASSERT(!dir_supplied);
-      /* TODO */
-      log_error("Deducing project dir from project name is not implemented yet");
-      goto exit;
+
+      project_dir = catdup3(getenv("HOME"), "/ladish-projects/", project_name_param); /* TODO: this must be a runtime setting */
+      if (project_dir == NULL)
+      {
+        log_error("catdup3() failed to compose project name");
+        goto exit;
+      }
+
+      log_info("Project dir for name '%s' will be '%s'", project_name_param, project_dir);
+
+      project_name = strdup(project_name_param);
     }
     else