From: Matt Kraai <kraai@debian.org>
Date: Tue, 24 Apr 2001 01:12:33 +0000 (-0000)
Subject: Move applet_name declaration from busybox.h to libbb.h.
X-Git-Tag: 0_52~307
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9ff9325e60eac6cc119eab5dff0dbbba78edfd32;p=oweals%2Fbusybox.git

Move applet_name declaration from busybox.h to libbb.h.
---

diff --git a/busybox.h b/busybox.h
index 8905b0dbd..e8055b06c 100644
--- a/busybox.h
+++ b/busybox.h
@@ -66,8 +66,6 @@ extern const struct BB_applet applets[];
 #include "applets.h"
 #undef PROTOTYPES
 
-extern const char *applet_name;
-
 #ifdef BB_FEATURE_BUFFERS_GO_ON_STACK
 #define RESERVE_BB_BUFFER(buffer,len)           char buffer[len]
 #define RESERVE_BB_UBUFFER(buffer,len) unsigned char buffer[len]
diff --git a/include/busybox.h b/include/busybox.h
index 8905b0dbd..e8055b06c 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -66,8 +66,6 @@ extern const struct BB_applet applets[];
 #include "applets.h"
 #undef PROTOTYPES
 
-extern const char *applet_name;
-
 #ifdef BB_FEATURE_BUFFERS_GO_ON_STACK
 #define RESERVE_BB_BUFFER(buffer,len)           char buffer[len]
 #define RESERVE_BB_UBUFFER(buffer,len) unsigned char buffer[len]
diff --git a/include/libbb.h b/include/libbb.h
index c47a6689e..4eeb99343 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -262,4 +262,6 @@ enum {
 	CP_INTERACTIVE = 16
 };
 
+extern const char *applet_name;
+
 #endif /* __LIBBB_H__ */
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 113c253b9..f24d1b119 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -126,7 +126,7 @@ int copy_file(const char *source, const char *dest, int flags)
 
 		if (dest_exists) {
 			if (flags & CP_INTERACTIVE) {
-				fprintf(stderr, "cp: overwrite `%s'? ", dest);
+				fprintf(stderr, "%s: overwrite `%s'? ", applet_name, dest);
 				if (!ask_confirmation())
 					return 0;
 			}
diff --git a/libbb/libbb.h b/libbb/libbb.h
index c47a6689e..4eeb99343 100644
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -262,4 +262,6 @@ enum {
 	CP_INTERACTIVE = 16
 };
 
+extern const char *applet_name;
+
 #endif /* __LIBBB_H__ */
diff --git a/libbb/syslog_msg_with_name.c b/libbb/syslog_msg_with_name.c
index d72755a37..5dadcc433 100644
--- a/libbb/syslog_msg_with_name.c
+++ b/libbb/syslog_msg_with_name.c
@@ -29,8 +29,6 @@
 #include <sys/syslog.h>
 #include "libbb.h"
 
-extern const char *applet_name;
-
 void syslog_msg_with_name(const char *name, int facility, int pri, const char *msg)
 {
  	openlog(name, 0, facility);
diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c
index b5278cfb7..b34821561 100644
--- a/libbb/verror_msg.c
+++ b/libbb/verror_msg.c
@@ -31,8 +31,6 @@
 #include <stdlib.h>
 #include "libbb.h"
 
-extern const char *applet_name;
-
 extern void verror_msg(const char *s, va_list p)
 {
 	fflush(stdout);