diff -uNr uftrace-0.9.3/cmds/record.c uftrace-0.9.3.mod/cmds/record.c --- uftrace-0.9.3/cmds/record.c 2019-07-13 17:25:47.000000000 +0300 +++ uftrace-0.9.3.mod/cmds/record.c 2019-09-03 15:29:17.756680758 +0300 @@ -60,6 +60,65 @@ static bool has_sched_event; static bool finish_received; +static int shm_unlink(const char *name) { + size_t namelen; + char *fname; + + /* Construct the filename. */ + while (name[0] == '/') ++name; + + if (name[0] == '\0') { + /* The name "/" is not supported. */ + errno = EINVAL; + return -1; + } + + namelen = strlen(name); + fname = (char *) alloca(sizeof("@TERMUX_PREFIX@/tmp/") - 1 + namelen + 1); + memcpy(fname, "@TERMUX_PREFIX@/tmp/", sizeof("@TERMUX_PREFIX@/tmp/") - 1); + memcpy(fname + sizeof("@TERMUX_PREFIX@/tmp/") - 1, name, namelen + 1); + + return unlink(fname); +} + +static int shm_open(const char *name, int oflag, mode_t mode) { + size_t namelen; + char *fname; + int fd; + + /* Construct the filename. */ + while (name[0] == '/') ++name; + + if (name[0] == '\0') { + /* The name "/" is not supported. */ + errno = EINVAL; + return -1; + } + + namelen = strlen(name); + fname = (char *) alloca(sizeof("@TERMUX_PREFIX@/tmp/") - 1 + namelen + 1); + memcpy(fname, "@TERMUX_PREFIX@/tmp/", sizeof("@TERMUX_PREFIX@/tmp/") - 1); + memcpy(fname + sizeof("@TERMUX_PREFIX@/tmp/") - 1, name, namelen + 1); + + fd = open(fname, oflag, mode); + if (fd != -1) { + /* We got a descriptor. Now set the FD_CLOEXEC bit. */ + int flags = fcntl(fd, F_GETFD, 0); + flags |= FD_CLOEXEC; + flags = fcntl(fd, F_SETFD, flags); + + if (flags == -1) { + /* Something went wrong. We cannot return the descriptor. */ + int save_errno = errno; + close(fd); + fd = -1; + errno = save_errno; + } + } + + return fd; +} + static bool can_use_fast_libmcount(struct opts *opts) { if (debug) @@ -918,7 +977,7 @@ sscanf(sl->id, "/uftrace-%[^-]-%*d-%*d", shmem_session); pr_dbg2("unlink for session: %s\n", shmem_session); - num = scandir("/dev/shm/", &shmem_bufs, filter_shmem, alphasort); + num = scandir("@TERMUX_PREFIX@/tmp/", &shmem_bufs, filter_shmem, alphasort); for (i = 0; i < num; i++) { sid[0] = '/'; memcpy(&sid[1], shmem_bufs[i]->d_name, MSG_ID_SIZE);