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

diff --git a/busybox.h b/busybox.h
index 8905b0dbd22891485ce6d5cae8144ca03ac34ad0..e8055b06c0545b5b996b33d6f83cb2281b9bc637 100644 (file)
--- 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 8905b0dbd22891485ce6d5cae8144ca03ac34ad0..e8055b06c0545b5b996b33d6f83cb2281b9bc637 100644 (file)
--- 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 c47a6689e241795c7515cd1f9d0a3568026d4d1e..4eeb99343ccc08ef4822532a344db02d8737eb56 100644 (file)
--- 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 113c253b9e4d68dc85bffa4728daffb56ba9ff6f..f24d1b119955bfa98dd0f996755f3af734da5974 100644 (file)
--- 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 c47a6689e241795c7515cd1f9d0a3568026d4d1e..4eeb99343ccc08ef4822532a344db02d8737eb56 100644 (file)
--- 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 d72755a37a9cc9f0f32b0b3a060ee34af1fecb51..5dadcc4335fabfb79eae4fe77a9796d4d46045c4 100644 (file)
--- 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 b5278cfb7acac7712186c7c5c79976cf1dd49938..b34821561566d57f58a962371f8c5a931c3c5c34 100644 (file)
--- 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);