Editing basename, dirname for ssh-copy-id

holzschu · Mar 22, 2024 · 74b0152 · 74b0152
1 parent 8e9949a
commit 74b0152
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/shell_cmds/basename/basename.c b/shell_cmds/basename/basename.c
@@ -52,11 +52,13 @@ static char sccsid[] = "@(#)basename.c	8.4 (Berkeley) 5/4/95";
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include "ios_error.h"
+#define usage basename_usage
 
 void usage(void);
 
 int
-main(int argc, char **argv)
+basename_main(int argc, char **argv)
 {
 	char *p, *q, *suffix;
 	size_t suffixlen;
@@ -103,7 +105,7 @@ main(int argc, char **argv)
 		    strcmp(suffix, q) == 0)
 			*q = '\0';
 		argv++;
-		(void)printf("%s\n", p);
+		(void)fprintf(thread_stdout, "%s\n", p);
 	}
 	exit(0);
 }
@@ -112,7 +114,7 @@ void
 usage(void)
 {
 
-	(void)fprintf(stderr,
+	(void)fprintf(thread_stderr,
 "usage: basename string [suffix]\n"
 "       basename [-a] [-s suffix] string [...]\n");
 	exit(1);

diff --git a/shell_cmds/dirname/dirname.c b/shell_cmds/dirname/dirname.c
@@ -48,11 +48,14 @@ static const char sccsid[] = "@(#)dirname.c	8.4 (Berkeley) 5/4/95";
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include "ios_error.h"
+
+#define usage dirname_usage
 
 void usage(void);
 
 int
-main(int argc, char **argv)
+dirname_main(int argc, char **argv)
 {
 	char *p;
 	int ch;
@@ -71,14 +74,14 @@ main(int argc, char **argv)
 
 	if ((p = dirname(*argv)) == NULL)
 		err(1, "%s", *argv);
-	(void)printf("%s\n", p);
+	(void)fprintf(thread_stdout,"%s\n", p);
 	exit(0);
 }
 
 void
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: dirname path\n");
+	(void)fprintf(thread_stderr, "usage: dirname path\n");
 	exit(1);
 }