emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Plug a leak

Browse Source
This commit is contained in:
Roy Marples 2007-09-29 17:20:52 +00:00
parent 7d5c82cf63
commit 0fae5deeb1
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/rc.c
View File

@ -63,6 +63,7 @@ static char *RUNLEVEL = NULL;
static char *PREVLEVEL = NULL; static char *PREVLEVEL = NULL;
static char *applet = NULL; static char *applet = NULL;
static char *runlevel = NULL;
static char **env = NULL; static char **env = NULL;
static char **newenv = NULL; static char **newenv = NULL;
static char **coldplugged_services = NULL; static char **coldplugged_services = NULL;
@ -114,6 +115,8 @@ static void cleanup (void)
if (rc_is_dir (RC_STOPPING)) if (rc_is_dir (RC_STOPPING))
rc_rm_dir (RC_STOPPING, true); rc_rm_dir (RC_STOPPING, true);
} }
free (runlevel);
} }
free (applet); free (applet);
@ -536,14 +539,14 @@ static void single_user (void)
#endif #endif
} }
static void set_ksoftlevel (const char *runlevel) static void set_ksoftlevel (const char *level)
{ {
FILE *fp; FILE *fp;
if (! runlevel || if (! level ||
strcmp (runlevel, getenv ("RC_BOOTLEVEL")) == 0 || strcmp (level, getenv ("RC_BOOTLEVEL")) == 0 ||
strcmp (runlevel, RC_LEVEL_SINGLE) == 0 || strcmp (level, RC_LEVEL_SINGLE) == 0 ||
strcmp (runlevel, RC_LEVEL_SYSINIT) == 0) strcmp (level, RC_LEVEL_SYSINIT) == 0)
{ {
if (rc_exists (RC_KSOFTLEVEL) && if (rc_exists (RC_KSOFTLEVEL) &&
unlink (RC_KSOFTLEVEL) != 0) unlink (RC_KSOFTLEVEL) != 0)
@ -556,7 +559,7 @@ static void set_ksoftlevel (const char *runlevel)
return; return;
} }
fprintf (fp, "%s", runlevel); fprintf (fp, "%s", level);
fclose (fp); fclose (fp);
} }
@ -722,7 +725,6 @@ static const char * const longopts_help[] = {
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
char *runlevel = NULL;
const char *bootlevel = NULL; const char *bootlevel = NULL;
char *newlevel = NULL; char *newlevel = NULL;
char *service = NULL; char *service = NULL;
@ -1269,7 +1271,8 @@ int main (int argc, char **argv)
/* Store the new runlevel */ /* Store the new runlevel */
if (newlevel) { if (newlevel) {
rc_set_runlevel (newlevel); rc_set_runlevel (newlevel);
runlevel = newlevel; free (runlevel);
runlevel = rc_xstrdup (newlevel);
setenv ("RC_SOFTLEVEL", runlevel, 1); setenv ("RC_SOFTLEVEL", runlevel, 1);
} }