aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-03 21:00:43 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-03 21:00:43 +0000
commitd8cf793135eac928e653eb5178894a611aa27837 (patch)
tree8c555cc94aca9fabd177526e554d93bed4886642 /libbb
parent63adc7384791548741e3a2afbee1be40d99fe9d2 (diff)
downloadbusybox-w32-d8cf793135eac928e653eb5178894a611aa27837.tar.gz
busybox-w32-d8cf793135eac928e653eb5178894a611aa27837.tar.bz2
busybox-w32-d8cf793135eac928e653eb5178894a611aa27837.zip
bb_applet_name -> applet_name
git-svn-id: svn://busybox.net/trunk/busybox@16306 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb')
-rw-r--r--libbb/copy_file.c2
-rw-r--r--libbb/remove_file.c6
-rw-r--r--libbb/verror_msg.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index d2794e7d6..bd9c9f7a2 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -127,7 +127,7 @@ int copy_file(const char *source, const char *dest, int flags)
127 127
128 if (dest_exists) { 128 if (dest_exists) {
129 if (flags & FILEUTILS_INTERACTIVE) { 129 if (flags & FILEUTILS_INTERACTIVE) {
130 fprintf(stderr, "%s: overwrite `%s'? ", bb_applet_name, dest); 130 fprintf(stderr, "%s: overwrite `%s'? ", applet_name, dest);
131 if (!bb_ask_confirmation()) { 131 if (!bb_ask_confirmation()) {
132 close (src_fd); 132 close (src_fd);
133 return 0; 133 return 0;
diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index 92534a1c5..509aa6a6d 100644
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -53,7 +53,7 @@ int remove_file(const char *path, int flags)
53 if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 && 53 if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 &&
54 isatty(0)) || 54 isatty(0)) ||
55 (flags & FILEUTILS_INTERACTIVE)) { 55 (flags & FILEUTILS_INTERACTIVE)) {
56 fprintf(stderr, "%s: descend into directory `%s'? ", bb_applet_name, 56 fprintf(stderr, "%s: descend into directory `%s'? ", applet_name,
57 path); 57 path);
58 if (!bb_ask_confirmation()) 58 if (!bb_ask_confirmation())
59 return 0; 59 return 0;
@@ -80,7 +80,7 @@ int remove_file(const char *path, int flags)
80 } 80 }
81 81
82 if (flags & FILEUTILS_INTERACTIVE) { 82 if (flags & FILEUTILS_INTERACTIVE) {
83 fprintf(stderr, "%s: remove directory `%s'? ", bb_applet_name, path); 83 fprintf(stderr, "%s: remove directory `%s'? ", applet_name, path);
84 if (!bb_ask_confirmation()) 84 if (!bb_ask_confirmation())
85 return status; 85 return status;
86 } 86 }
@@ -96,7 +96,7 @@ int remove_file(const char *path, int flags)
96 !S_ISLNK(path_stat.st_mode) && 96 !S_ISLNK(path_stat.st_mode) &&
97 isatty(0)) || 97 isatty(0)) ||
98 (flags & FILEUTILS_INTERACTIVE)) { 98 (flags & FILEUTILS_INTERACTIVE)) {
99 fprintf(stderr, "%s: remove `%s'? ", bb_applet_name, path); 99 fprintf(stderr, "%s: remove `%s'? ", applet_name, path);
100 if (!bb_ask_confirmation()) 100 if (!bb_ask_confirmation())
101 return 0; 101 return 0;
102 } 102 }
diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c
index e670d40ba..0f018c517 100644
--- a/libbb/verror_msg.c
+++ b/libbb/verror_msg.c
@@ -22,7 +22,7 @@ void bb_verror_msg(const char *s, va_list p, const char* strerr)
22 22
23 if (logmode & LOGMODE_STDIO) { 23 if (logmode & LOGMODE_STDIO) {
24 fflush(stdout); 24 fflush(stdout);
25 fprintf(stderr, "%s: ", bb_applet_name); 25 fprintf(stderr, "%s: ", applet_name);
26 vfprintf(stderr, s, p); 26 vfprintf(stderr, s, p);
27 if (!strerr) 27 if (!strerr)
28 fputs(msg_eol, stderr); 28 fputs(msg_eol, stderr);