Guest User

Untitled

a guest
Apr 20th, 2018
75
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.55 KB | None | 0 0
  1. Index: lashd/server.c
  2. ===================================================================
  3. --- lashd/server.c (revision 150)
  4. +++ lashd/server.c (working copy)
  5. @@ -41,7 +41,6 @@
  6. void server_create_loader(server_t * server);
  7. void server_set_loader(server_t * server, loader_t * loader);
  8. void server_set_ui_project(server_t * server, const char *project);
  9. -void server_set_default_dir(server_t * server, const char *default_dir);
  10.  
  11. server_t *
  12. server_new(const char *default_dir)
  13. @@ -52,7 +51,7 @@
  14.  
  15. pthread_mutex_init(&server->server_events_lock, NULL);
  16. pthread_cond_init(&server->server_event_cond, NULL);
  17. - server->default_dir = lash_strdup(default_dir);
  18. + server->project_dir = lash_strdup(lash_get_fqn(getenv("HOME"), default_dir));
  19.  
  20. server_create_loader(server);
  21.  
  22. @@ -119,7 +118,7 @@
  23. signal(SIGCHLD, SIG_IGN);
  24. loader_destroy(server->loader);
  25.  
  26. - free(server->default_dir);
  27. + free(server->project_dir);
  28. free(server);
  29.  
  30. lash_debug("server destroyed");
  31. @@ -161,9 +160,9 @@
  32. }
  33.  
  34. const char *
  35. -server_get_default_dir(server_t * server)
  36. +server_get_project_dir(server_t * server)
  37. {
  38. - return server->default_dir;
  39. + return server->project_dir;
  40. }
  41.  
  42. int
  43. @@ -366,9 +365,7 @@
  44.  
  45. do {
  46. sprintf(new_name, "project-%d", num);
  47. - new_dir = lash_get_fqn(lash_get_fqn(getenv("HOME"),
  48. - server->default_dir),
  49. - new_name);
  50. + new_dir = lash_get_fqn(server->project_dir, new_name);
  51. num++;
  52. lash_debug("Trying project name %s, dir %s",
  53. new_name, new_dir);
  54. @@ -398,9 +395,7 @@
  55. lash_debug("The new project's name is %s", project->name);
  56.  
  57. project_set_directory(project,
  58. - lash_get_fqn(lash_get_fqn(getenv("HOME"),
  59. - server->default_dir),
  60. - project->name));
  61. + lash_get_fqn(server->project_dir, project->name));
  62.  
  63. lash_create_dir(project->directory);
  64.  
  65. Index: lashd/server.h
  66. ===================================================================
  67. --- lashd/server.h (revision 150)
  68. +++ lashd/server.h (working copy)
  69. @@ -52,7 +52,7 @@
  70. loader_t * loader;
  71. int loader_quit;
  72.  
  73. - char * default_dir;
  74. + char * project_dir;
  75. lash_list_t * projects;
  76. lash_list_t * interfaces;
  77.  
  78. @@ -82,4 +82,7 @@
  79.  
  80. void server_send_event (server_t * server, server_event_t * server_event);
  81.  
  82. +const char *
  83. +server_get_project_dir(server_t * server);
  84. +
  85. #endif /* __LASHD_SERVER_H__ */
Add Comment
Please, Sign In to add comment