libbb: add bb_unsetenv (taken from hush).

[oweals/busybox.git] / miscutils / crond.c

diff --git a/miscutils/crond.c b/miscutils/crond.c
index 41f1517536372aede7eabe8c59031d1bfe4343e3..12560fa367a846254f43d0cf792bede510ad3ed2 100644 (file)
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -80,9 +80,9 @@ enum {
        OPT_b = (1 << 3),
        OPT_S = (1 << 4),
        OPT_c = (1 << 5),
-       OPT_d = (1 << 6) * ENABLE_DEBUG_CROND_OPTION,
+       OPT_d = (1 << 6) * ENABLE_FEATURE_CROND_D,
 };
-#if ENABLE_DEBUG_CROND_OPTION
+#if ENABLE_FEATURE_CROND_D
 #define DebugOpt (option_mask32 & OPT_d)
 #else
 #define DebugOpt 0
@@ -166,11 +166,11 @@ int crond_main(int argc UNUSED_PARAM, char **argv)
        INIT_G();
 
        /* "-b after -f is ignored", and so on for every pair a-b */
-       opt_complementary = "f-b:b-f:S-L:L-S" USE_DEBUG_CROND_OPTION(":d-l")
+       opt_complementary = "f-b:b-f:S-L:L-S" USE_FEATURE_CROND_D(":d-l")
                        ":l+:d+"; /* -l and -d have numeric param */
-       opt = getopt32(argv, "l:L:fbSc:" USE_DEBUG_CROND_OPTION("d:"),
+       opt = getopt32(argv, "l:L:fbSc:" USE_FEATURE_CROND_D("d:"),
                        &LogLevel, &LogFile, &CDir
-                       USE_DEBUG_CROND_OPTION(,&LogLevel));
+                       USE_FEATURE_CROND_D(,&LogLevel));
        /* both -d N and -l N set the same variable: LogLevel */
 
        if (!(opt & OPT_f)) {
@@ -187,7 +187,7 @@ int crond_main(int argc UNUSED_PARAM, char **argv)
 
        xchdir(CDir);
        //signal(SIGHUP, SIG_IGN); /* ? original crond dies on HUP... */
-       setenv("SHELL", DEFAULT_SHELL, 1); /* once, for all future children */
+       xsetenv("SHELL", DEFAULT_SHELL); /* once, for all future children */
        crondlog(LVL9 "crond (busybox "BB_VER") started, log level %d", LogLevel);
        SynchronizeDir();
 
@@ -252,14 +252,12 @@ int crond_main(int argc UNUSED_PARAM, char **argv)
 /* We set environment *before* vfork (because we want to use vfork),
  * so we cannot use setenv() - repeated calls to setenv() may leak memory!
  * Using putenv(), and freeing memory after unsetenv() won't leak */
-static void safe_setenv4(char **pvar_val, const char *var, const char *val /*, int len*/)
+static void safe_setenv(char **pvar_val, const char *var, const char *val)
 {
-       const int len = 4; /* both var names are 4 char long */
        char *var_val = *pvar_val;
 
        if (var_val) {
-               var_val[len] = '\0'; /* nuke '=' */
-               unsetenv(var_val);
+               bb_unsetenv(var_val);
                free(var_val);
        }
        *pvar_val = xasprintf("%s=%s", var, val);
@@ -270,13 +268,13 @@ static void safe_setenv4(char **pvar_val, const char *var, const char *val /*, i
 static void SetEnv(struct passwd *pas)
 {
 #if SETENV_LEAKS
-       safe_setenv4(&env_var_user, "USER", pas->pw_name);
-       safe_setenv4(&env_var_home, "HOME", pas->pw_dir);
+       safe_setenv(&env_var_user, "USER", pas->pw_name);
+       safe_setenv(&env_var_home, "HOME", pas->pw_dir);
        /* if we want to set user's shell instead: */
-       /*safe_setenv(env_var_user, "SHELL", pas->pw_shell, 5);*/
+       /*safe_setenv(env_var_user, "SHELL", pas->pw_shell);*/
 #else
-       setenv("USER", pas->pw_name, 1);
-       setenv("HOME", pas->pw_dir, 1);
+       xsetenv("USER", pas->pw_name);
+       xsetenv("HOME", pas->pw_dir);
 #endif
        /* currently, we use constant one: */
        /*setenv("SHELL", DEFAULT_SHELL, 1); - done earlier */
@@ -443,7 +441,7 @@ static void FixDayDow(CronLine *line)
 
 static void SynchronizeFile(const char *fileName)
 {
-       struct parser_t parser;
+       struct parser_t *parser;
        struct stat sbuf;
        int maxLines;
        char *tokens[6];
@@ -455,12 +453,13 @@ static void SynchronizeFile(const char *fileName)
                return;
 
        DeleteFile(fileName);
-       if (!config_open(&parser, fileName))
+       parser = config_open(fileName);
+       if (!parser)
                return;
 
        maxLines = (strcmp(fileName, "root") == 0) ? 65535 : MAXLINES;
 
-       if (fstat(fileno(parser.fp), &sbuf) == 0 && sbuf.st_uid == DaemonUid) {
+       if (fstat(fileno(parser->fp), &sbuf) == 0 && sbuf.st_uid == DaemonUid) {
                CronFile *file = xzalloc(sizeof(CronFile));
                CronLine **pline;
                int n;
@@ -468,12 +467,17 @@ static void SynchronizeFile(const char *fileName)
                file->cf_User = xstrdup(fileName);
                pline = &file->cf_LineBase;
 
-               while (--maxLines && (n=config_read(&parser, tokens, 6, 0, " \t", '#')) >= 0) {
+               while (1) {
                        CronLine *line;
 
-                       if (DebugOpt) {
-                               crondlog(LVL5 "user:%s entry:%s", fileName, parser.data);
-                       }
+                       if (!--maxLines)
+                               break;
+                       n = config_read(parser, tokens, 6, 1, "# \t", PARSE_NORMAL | PARSE_KEEP_COPY);
+                       if (!n)
+                               break;
+
+                       if (DebugOpt)
+                               crondlog(LVL5 "user:%s entry:%s", fileName, parser->data);
 
                        /* check if line is setting MAILTO= */
                        if (0 == strncmp(tokens[0], "MAILTO=", 7)) {
@@ -484,9 +488,9 @@ static void SynchronizeFile(const char *fileName)
                                continue;
                        }
                        /* check if a minimum of tokens is specified */
-                       if (n < 5)
+                       if (n < 6)
                                continue;
-                       *pline = line = xzalloc(sizeof(CronLine));
+                       *pline = line = xzalloc(sizeof(*line));
                        /* parse date ranges */
                        ParseField(file->cf_User, line->cl_Mins, 60, 0, NULL, tokens[0]);
                        ParseField(file->cf_User, line->cl_Hrs, 24, 0, NULL, tokens[1]);
@@ -519,7 +523,7 @@ static void SynchronizeFile(const char *fileName)
                        crondlog(WARN9 "user %s: too many lines", fileName);
                }
        }
-       config_close(&parser);
+       config_close(parser);
 }
 
 static void CheckUpdates(void)
@@ -527,7 +531,7 @@ static void CheckUpdates(void)
        FILE *fi;
        char buf[256];
 
-       fi = fopen(CRONUPDATE, "r");
+       fi = fopen_for_read(CRONUPDATE);
        if (fi != NULL) {
                unlink(CRONUPDATE);
                while (fgets(buf, sizeof(buf), fi) != NULL) {
@@ -773,6 +777,8 @@ ForkJob(const char *user, CronLine *line, int mailFd,
                        xmove_fd(mailFd, mail_filename ? 1 : 0);
                        dup2(1, 2);
                }
+               /* crond 3.0pl1-100 puts tasks in separate process groups */
+               bb_setpgrp();
                execlp(prog, prog, cmd, arg, NULL);
                crondlog(ERR20 "can't exec, user %s cmd %s %s %s", user, prog, cmd, arg);
                if (mail_filename) {
@@ -908,6 +914,8 @@ static void RunJob(const char *user, CronLine *line)
                if (DebugOpt) {
                        crondlog(LVL5 "child running %s", DEFAULT_SHELL);
                }
+               /* crond 3.0pl1-100 puts tasks in separate process groups */
+               bb_setpgrp();
                execl(DEFAULT_SHELL, DEFAULT_SHELL, "-c", line->cl_Shell, NULL);
                crondlog(ERR20 "can't exec, user %s cmd %s %s %s", user,
                                 DEFAULT_SHELL, "-c", line->cl_Shell);