Move applet_name declaration from busybox.h to libbb.h.
diff --git a/busybox.h b/busybox.h
index 8905b0d..e8055b0 100644
--- a/busybox.h
+++ b/busybox.h
@@ -66,8 +66,6 @@
#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 8905b0d..e8055b0 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -66,8 +66,6 @@
#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 c47a668..4eeb993 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -262,4 +262,6 @@
CP_INTERACTIVE = 16
};
+extern const char *applet_name;
+
#endif /* __LIBBB_H__ */
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 113c253..f24d1b1 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -126,7 +126,7 @@
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 c47a668..4eeb993 100644
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -262,4 +262,6 @@
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 d72755a..5dadcc4 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 b5278cf..b348215 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);