--- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -81,6 +81,64 @@ #include "mb/pg_wchar.h" #include "miscadmin.h" +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 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); +} /* Ideally this would be in a .h file, but it hardly seems worth the trouble */ extern const char *select_default_timezone(const char *share_path); @@ -135,8 +193,8 @@ /* values to be obtained from arguments */ static char *pg_data = NULL; -static char *encoding = NULL; -static char *locale = NULL; +static char *encoding = "UTF-8"; +static char *locale = "en_US.UTF-8"; static char *lc_collate = NULL; static char *lc_ctype = NULL; static char *lc_monetary = NULL; @@ -1006,6 +1064,9 @@ static const char * choose_dsm_implementation(void) { +#if defined(__ANDROID__) + return "mmap"; +#endif #if defined(HAVE_SHM_OPEN) && !defined(__sun__) int ntries = 10; pg_prng_state prng_state;