From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Fri, 13 Sep 2024 19:49:24 +0000 (+0200)
Subject: lib/run_part: Unify logging
X-Git-Tag: 4.17.0-rc1~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db395130d151150be84d1b412980369090633920;p=thirdparty%2Fshadow.git

lib/run_part: Unify logging

Use shadow_logfd for logging instead of fixed stderr to use
shadow's own logging infrastructure.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
---

diff --git a/lib/run_part.c b/lib/run_part.c
index 5ef05d980..4ac58567a 100644
--- a/lib/run_part.c
+++ b/lib/run_part.c
@@ -24,14 +24,14 @@ int run_part (char *script_path, const char *name, const char *action)
 
 	pid=fork();
 	if (pid==-1) {
-		perror ("Could not fork");
+		fprintf (shadow_logfd, "Could not fork: %s\n", strerror(errno));
 		return 1;
 	}
 	if (pid==0) {
 		setenv ("ACTION",action,1);
 		setenv ("SUBJECT",name,1);
 		execv (script_path,args);
-		perror ("execv");
+		fprintf (shadow_logfd, "execv: %s\n", strerror(errno));
 		exit(1);
 	}
 
@@ -40,7 +40,7 @@ int run_part (char *script_path, const char *name, const char *action)
 		return (wait_status);
 	}
 
-	perror ("waitpid");
+	fprintf (shadow_logfd, "waitpid: %s\n", strerror(errno));
 	return (1);
 }
 
@@ -61,7 +61,7 @@ int run_parts (const char *directory, const char *name, const char *action)
 		struct stat  sb;
 
 		if (asprintf(&s, "%s/%s", directory, namelist[n]->d_name) == -1) {
-			fprintf(stderr, "could not allocate memory\n");
+			fprintf (shadow_logfd, "could not allocate memory\n");
 			for (; n<scanlist; n++) {
 				free(namelist[n]);
 			}
@@ -71,7 +71,7 @@ int run_parts (const char *directory, const char *name, const char *action)
 
 		execute_result = 0;
 		if (stat (s, &sb) == -1) {
-			perror ("stat");
+			fprintf (shadow_logfd, "stat: %s\n", strerror(errno));
 			free(s);
 			for (; n<scanlist; n++) {
 				free (namelist[n]);