convert calloc to xzalloc

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

diff --git a/miscutils/crond.c b/miscutils/crond.c
index db0cc2c6bcdc8a393adaa360b166d9047d5afbaa..aace3ee18b55f99156012162ee872aeaaca26f10 100644 (file)
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -65,10 +65,10 @@ typedef struct CronLine {
 #define DaemonUid 0
 
 #if ENABLE_DEBUG_CROND_OPTION
-static short DebugOpt;
+static unsigned DebugOpt;
 #endif
 
-static short LogLevel = 8;
+static unsigned LogLevel = 8;
 static const char *LogFile;
 static const char *CDir = CRONTABS;
 
@@ -120,7 +120,7 @@ static void crondlog(const char *ctl, ...)
                                close(logfd);
 #if ENABLE_DEBUG_CROND_OPTION
                        } else {
-                               bb_perror_msg("Can't open log file");
+                               bb_perror_msg("can't open log file");
 #endif
                        }
                }
@@ -155,7 +155,7 @@ int crond_main(int ac, char **av)
 #endif
                );
        if (opt & 1) {
-               LogLevel = atoi(lopt);
+               LogLevel = xatou(lopt);
        }
        if (opt & 2) {
                if (*Lopt != 0) {
@@ -169,7 +169,7 @@ int crond_main(int ac, char **av)
        }
 #if ENABLE_DEBUG_CROND_OPTION
        if (opt & 64) {
-               DebugOpt = atoi(dopt);
+               DebugOpt = xatou(dopt);
                LogLevel = 0;
        }
 #endif
@@ -264,7 +264,7 @@ int crond_main(int ac, char **av)
                        }
                }
        }
-       bb_fflush_stdout_and_exit(EXIT_SUCCESS); /* not reached */
+       return 0; /* not reached */
 }
 
 static int ChangeUser(const char *user)
@@ -278,7 +278,7 @@ static int ChangeUser(const char *user)
        pas = getpwnam(user);
        if (pas == 0) {
                crondlog("\011failed to get uid for %s", user);
-               return (-1);
+               return -1;
        }
        setenv("USER", pas->pw_name, 1);
        setenv("HOME", pas->pw_dir, 1);
@@ -290,16 +290,16 @@ static int ChangeUser(const char *user)
        err_msg = change_identity_e2str(pas);
        if (err_msg) {
                crondlog("\011%s for user %s", err_msg, user);
-               return (-1);
+               return -1;
        }
        if (chdir(pas->pw_dir) < 0) {
                crondlog("\011chdir failed: %s: %m", pas->pw_dir);
                if (chdir(TMPDIR) < 0) {
                        crondlog("\011chdir failed: %s: %m", TMPDIR);
-                       return (-1);
+                       return -1;
                }
        }
-       return (pas->pw_uid);
+       return pas->pw_uid;
 }
 
 static void startlogger(void)
@@ -314,7 +314,7 @@ static void startlogger(void)
                if ((logfd = open(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600)) >= 0) {
                        close(logfd);
                } else {
-                       bb_perror_msg("Failed to open log file '%s' reason", LogFile);
+                       bb_perror_msg("failed to open log file '%s': ", LogFile);
                }
        }
 #endif
@@ -377,7 +377,7 @@ static char *ParseField(char *user, char *ary, int modvalue, int off,
        int n2 = -1;
 
        if (base == NULL) {
-               return (NULL);
+               return NULL;
        }
 
        while (*ptr != ' ' && *ptr != '\t' && *ptr != '\n') {
@@ -420,7 +420,7 @@ static char *ParseField(char *user, char *ary, int modvalue, int off,
 
                if (skip == 0) {
                        crondlog("\111failed user %s parsing %s\n", user, base);
-                       return (NULL);
+                       return NULL;
                }
                if (*ptr == '-' && n2 < 0) {
                        ++ptr;
@@ -460,7 +460,7 @@ static char *ParseField(char *user, char *ary, int modvalue, int off,
 
                        if (failsafe == 0) {
                                crondlog("\111failed user %s parsing %s\n", user, base);
-                               return (NULL);
+                               return NULL;
                        }
                }
                if (*ptr != ',') {
@@ -473,7 +473,7 @@ static char *ParseField(char *user, char *ary, int modvalue, int off,
 
        if (*ptr != ' ' && *ptr != '\t' && *ptr != '\n') {
                crondlog("\111failed user %s parsing %s\n", user, base);
-               return (NULL);
+               return NULL;
        }
 
        while (*ptr == ' ' || *ptr == '\t' || *ptr == '\n') {
@@ -490,7 +490,7 @@ static char *ParseField(char *user, char *ary, int modvalue, int off,
        }
 #endif
 
-       return (ptr);
+       return ptr;
 }
 
 static void FixDayDow(CronLine * line)
@@ -542,7 +542,7 @@ static void SynchronizeFile(const char *fileName)
                        struct stat sbuf;
 
                        if (fstat(fileno(fi), &sbuf) == 0 && sbuf.st_uid == DaemonUid) {
-                               CronFile *file = calloc(1, sizeof(CronFile));
+                               CronFile *file = xzalloc(sizeof(CronFile));
                                CronLine **pline;
 
                                file->cf_User = strdup(fileName);
@@ -586,7 +586,7 @@ static void SynchronizeFile(const char *fileName)
 
                                        FixDayDow(&line);
 
-                                       *pline = calloc(1, sizeof(CronLine));
+                                       *pline = xzalloc(sizeof(CronLine));
                                        **pline = line;
 
                                        /* copy command */
@@ -654,7 +654,7 @@ static void SynchronizeDir(void)
 
        remove(CRONUPDATE);
        if (chdir(CDir) < 0) {
-               crondlog("\311unable to find %s\n", CDir);
+               crondlog("\311cannot find %s\n", CDir);
        }
        {
                DIR *dir = opendir(".");
@@ -673,7 +673,7 @@ static void SynchronizeDir(void)
                        }
                        closedir(dir);
                } else {
-                       crondlog("\311Unable to open current dir!\n");
+                       crondlog("\311cannot open current dir!\n");
                }
        }
 }
@@ -777,7 +777,7 @@ static int TestJobs(time_t t1, time_t t2)
                        }
                }
        }
-       return (nJobs);
+       return nJobs;
 }
 
 static void RunJobs(void)
@@ -843,7 +843,7 @@ static int CheckJobs(void)
                }
                nStillRunning += file->cf_Running;
        }
-       return (nStillRunning);
+       return nStillRunning;
 }
 
 
@@ -876,14 +876,14 @@ ForkJob(const char *user, CronLine * line, int mailFd,
                        close(mailFd);
                }
                execl(prog, prog, cmd, arg, NULL);
-               crondlog("\024unable to exec, user %s cmd %s %s %s\n", user, prog, cmd, arg);
+               crondlog("\024cannot exec, user %s cmd %s %s %s\n", user, prog, cmd, arg);
                if (mailf) {
                        fdprintf(1, "Exec failed: %s -c %s\n", prog, arg);
                }
                exit(0);
        } else if (pid < 0) {
                /* FORK FAILED */
-               crondlog("\024couldn't fork, user %s\n", user);
+               crondlog("\024cannot fork, user %s\n", user);
                line->cl_Pid = 0;
                if (mailf) {
                        remove(mailf);
@@ -924,9 +924,9 @@ static void RunJob(const char *user, CronLine * line)
                line->cl_MailFlag = 1;
                fdprintf(mailFd, "To: %s\nSubject: cron: %s\n\n", user,
                        line->cl_Shell);
-               line->cl_MailPos = lseek(mailFd, 0, 1);
+               line->cl_MailPos = lseek(mailFd, 0, SEEK_CUR);
        } else {
-               crondlog("\024unable to create mail file user %s file %s, output to /dev/null\n", user, mailFile);
+               crondlog("\024cannot create mail file user %s file %s, output to /dev/null\n", user, mailFile);
        }
 
        ForkJob(user, line, mailFd, DEFAULT_SHELL, "-c", line->cl_Shell, mailFile);
@@ -1003,12 +1003,12 @@ static void RunJob(const char *user, CronLine * line)
 #endif
 
                execl(DEFAULT_SHELL, DEFAULT_SHELL, "-c", line->cl_Shell, NULL);
-               crondlog("\024unable to exec, user %s cmd %s -c %s\n", user,
+               crondlog("\024cannot exec, user %s cmd %s -c %s\n", user,
                                 DEFAULT_SHELL, line->cl_Shell);
                exit(0);
        } else if (pid < 0) {
                /* FORK FAILED */
-               crondlog("\024couldn't fork, user %s\n", user);
+               crondlog("\024cannot, user %s\n", user);
                pid = 0;
        }
        line->cl_Pid = pid;