Add mode setting to socket directory creation

[ust.git] / libustcomm / ustcomm.c

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index 9b1d83a9a4d86bde829f45830b404872a7fe8e1c..e401c4256e6666292a3ea6b9f5dddd948d811b64 100644 (file)
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -371,7 +371,7 @@ int ustcomm_recv_fd(int sock,
        if (peek_header.size && data) {
                if (peek_header.size < 0 ||
                    peek_header.size > USTCOMM_DATA_SIZE) {
-                       ERR("big peek header! %d", peek_header.size);
+                       ERR("big peek header! %ld", peek_header.size);
                        return 0;
                }
 
@@ -533,6 +533,21 @@ close_sock:
        return -1;
 }
 
+/* Returns the current users socket directory, must be freed */
+char *ustcomm_user_sock_dir(void)
+{
+       int result;
+       char *sock_dir = NULL;
+
+       result = asprintf(&sock_dir, "%s%s", USER_SOCK_DIR,
+                         cuserid(NULL));
+       if (result < 0) {
+               ERR("string overflow allocating directory name");
+               return NULL;
+       }
+
+       return sock_dir;
+}
 
 /* Open a connection to a traceable app.
  *
@@ -545,47 +560,62 @@ int ustcomm_connect_app(pid_t pid, int *app_fd)
 {
        int result;
        int retval = 0;
-       char *name;
+       char *dir_name, *sock_name;
 
-       result = asprintf(&name, "%s/%d", SOCK_DIR, pid);
+       dir_name = ustcomm_user_sock_dir();
+       if (!dir_name)
+               return -ENOMEM;
+
+       result = asprintf(&sock_name, "%s/%d", dir_name, pid);
        if (result < 0) {
                ERR("failed to allocate socket name");
-               return -1;
+               retval = -1;
+               goto free_dir_name;
        }
 
-       result = ustcomm_connect_path(name, app_fd);
+       result = ustcomm_connect_path(sock_name, app_fd);
        if (result < 0) {
                ERR("failed to connect to app");
                retval = -1;
+               goto free_sock_name;
        }
 
-       free(name);
+free_sock_name:
+       free(sock_name);
+free_dir_name:
+       free(dir_name);
 
        return retval;
 }
 
-int ensure_dir_exists(const char *dir)
+int ensure_dir_exists(const char *dir, mode_t mode)
 {
        struct stat st;
        int result;
 
-       if(!strcmp(dir, ""))
+       if (!strcmp(dir, ""))
                return -1;
 
        result = stat(dir, &st);
-       if(result == -1 && errno != ENOENT) {
+       if (result < 0 && errno != ENOENT) {
                return -1;
-       }
-       else if(result == -1) {
+       } else if (result < 0) {
                /* ENOENT */
                int result;
 
-               /* mkdir mode to 0777 */
-               result = mkdir_p(dir, S_IRWXU | S_IRWXG | S_IRWXO);
+               result = mkdir_p(dir, mode);
                if(result != 0) {
                        ERR("executing in recursive creation of directory %s", dir);
                        return -1;
                }
+       } else {
+               if (st.st_mode != mode) {
+                       result = chmod(dir, mode);
+                       if (result < 0) {
+                               ERR("couldn't set directory mode on %s", dir);
+                               return -1;
+                       }
+               }
        }
 
        return 0;