diff options
| author | Stam He <stamhe@163.com> | 2013-02-27 11:53:11 +0800 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2013-02-27 11:50:35 +0100 |
| commit | 9c8be6cab9e4ec6c4fad2e1dd01fb13f7032205b (patch) | |
| tree | 0db44e2a27efa7077546fae3ca010524c4ac4e95 /src/setproctitle.c | |
| parent | deb1f4d841d402508d27a5bda0bf3a7c19cc0a6d (diff) | |
| download | redis-9c8be6cab9e4ec6c4fad2e1dd01fb13f7032205b.tar.gz | |
Set proctitle: avoid the use of __attribute__((constructor)).
This cased a segfault in some Linux system and was GCC-specific.
Commit modified by @antirez:
1) Stripped away the part to set the proc title via config for now.
2) Handle initialization of setproctitle only when the replacement
is used.
3) Don't require GCC now that the attribute constructor is no
longer used.
Diffstat (limited to 'src/setproctitle.c')
| -rw-r--r-- | src/setproctitle.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/setproctitle.c b/src/setproctitle.c index 99bccf2c0..f44253e16 100644 --- a/src/setproctitle.c +++ b/src/setproctitle.c @@ -2,6 +2,8 @@ * setproctitle.c - Linux/Darwin setproctitle. * -------------------------------------------------------------------------- * Copyright (C) 2010 William Ahern + * Copyright (C) 2013 Salvatore Sanfilippo + * Copyright (C) 2013 Stam He * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the @@ -42,8 +44,9 @@ #if !HAVE_SETPROCTITLE -#if (defined __linux || defined __APPLE__) && defined __GNUC__ +#if (defined __linux || defined __APPLE__) +extern char **environ; static struct { /* original value */ @@ -142,9 +145,8 @@ static int spt_copyargs(int argc, char *argv[]) { } /* spt_copyargs() */ -void spt_init(int argc, char *argv[], char *envp[]) __attribute__((constructor)); - -void spt_init(int argc, char *argv[], char *envp[]) { +void spt_init(int argc, char *argv[]) { + char **envp = environ; char *base, *end, *nul, *tmp; int i, error; |