Skip to content

sapi/fpm: remove reimplementations of (un)setenv #23287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NattyNarwhal wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −75
Open

sapi/fpm: remove reimplementations of (un)setenv #23287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 0 additions & 75 deletions sapi/fpm/fpm/fpm_env.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,47 +20,6 @@ static size_t fpm_env_argv_len = 0;
#endif
#endif

#ifndef HAVE_SETENV
# ifdef (__sparc__ || __sparc)
int setenv(char *name, char *value, int clobber) /* {{{ */
{
char *malloc();
char *getenv();
char *cp;

if (clobber == 0 && getenv(name) != 0) {
return 0;
}

size_t length = strlen(name) + strlen(value) + 2;
if ((cp = malloc(length)) == 0) {
return 1;
}
snprintf(cp, length, "%s=%s", name, value);
return putenv(cp);
}
/* }}} */
# else
int setenv(char *name, char *value, int overwrite) /* {{{ */
{
int name_len = strlen(name);
int value_len = strlen(value);
char *var = alloca(name_len + 1 + value_len + 1);

memcpy(var, name, name_len);

var[name_len] = '=';

memcpy(var + name_len + 1, value, value_len);

var[name_len + 1 + value_len] = '\0';

return putenv(var);
}
/* }}} */
# endif
#endif

#ifndef HAVE_CLEARENV
void clearenv(void)
{
Expand All @@ -83,40 +42,6 @@ void clearenv(void)
}
#endif

#ifndef HAVE_UNSETENV
void unsetenv(const char *name) /* {{{ */
{
if(getenv(name) != NULL) {
int ct = 0;
int del = 0;

while(environ[ct] != NULL) {
if (nvmatch(name, environ[ct]) != 0) del=ct; /* <--- WTF?! */
{ ct++; } /* <--- WTF?! */
}
/* isn't needed free here?? */
environ[del] = environ[ct-1];
environ[ct-1] = NULL;
}
}
/* }}} */

static char * nvmatch(char *s1, char *s2) /* {{{ */
{
while(*s1 == *s2++)
{
if(*s1++ == '=') {
return s2;
}
}
if(*s1 == '\0' && *(s2-1) == '=') {
return s2;
}
return NULL;
}
/* }}} */
#endif

void fpm_env_setproctitle(char *title) /* {{{ */
{
#if defined(HAVE_SETPROCTITLE_FAST)
Expand Down
Loading