diff options
Diffstat (limited to 'sapi/fpm/fpm/fpm_env.c')
| -rw-r--r-- | sapi/fpm/fpm/fpm_env.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sapi/fpm/fpm/fpm_env.c b/sapi/fpm/fpm/fpm_env.c index 9931ab480c..a9227f8c7d 100644 --- a/sapi/fpm/fpm/fpm_env.c +++ b/sapi/fpm/fpm/fpm_env.c @@ -13,7 +13,7 @@ #include "fpm.h" #ifndef HAVE_SETPROCTITLE -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) static char **fpm_env_argv = NULL; static size_t fpm_env_argv_len = 0; #endif @@ -122,16 +122,15 @@ void fpm_env_setproctitle(char *title) /* {{{ */ setproctitle_fast("%s", title); #elif defined(HAVE_SETPROCTITLE) setproctitle("%s", title); -#else -#ifdef __linux__ - if (fpm_env_argv != NULL && fpm_env_argv_len > strlen(SETPROCTITLE_PREFIX) + 3) { +#elif defined(__linux__) || defined(__APPLE__) + size_t prefixlen = strlen(SETPROCTITLE_PREFIX); + if (fpm_env_argv != NULL && fpm_env_argv_len > prefixlen + 3) { memset(fpm_env_argv[0], 0, fpm_env_argv_len); strncpy(fpm_env_argv[0], SETPROCTITLE_PREFIX, fpm_env_argv_len - 2); - strncpy(fpm_env_argv[0] + strlen(SETPROCTITLE_PREFIX), title, fpm_env_argv_len - strlen(SETPROCTITLE_PREFIX) - 2); + strncpy(fpm_env_argv[0] + prefixlen, title, fpm_env_argv_len - prefixlen - 2); fpm_env_argv[1] = NULL; } #endif -#endif } /* }}} */ @@ -207,7 +206,7 @@ int fpm_env_init_main() /* {{{ */ } } #ifndef HAVE_SETPROCTITLE -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) int i; char *first = NULL; char *last = NULL; |