X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fcrond.c;h=fa7964e4e6a606155050285c8902534aee2eafcc;hb=48237b0c88343154d58854020c3a9c8b07c61b10;hp=4fc940b7901660256c8ca6563b3ee6db169c4e30;hpb=e1a0d486e4804eae098571f1a6788394c2ee51ae;p=oweals%2Fbusybox.git

diff --git a/miscutils/crond.c b/miscutils/crond.c
index 4fc940b79..fa7964e4e 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -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)
@@ -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)
@@ -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,7 +876,7 @@ 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);
 		}
@@ -926,7 +926,7 @@ static void RunJob(const char *user, CronLine * line)
 			line->cl_Shell);
 		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,7 +1003,7 @@ 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) {