diff options
| author | Denis Vlasenko | 2006-10-03 21:00:43 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2006-10-03 21:00:43 +0000 |
| commit | 8f8f268cfdecb4cabeb2e649a73afc7a485aeff5 (patch) | |
| tree | 8c555cc94aca9fabd177526e554d93bed4886642 /libbb | |
| parent | 67b23e6043d8e2b30b0bf3bc105b8583c2a26db5 (diff) | |
| download | busybox-8f8f268cfdecb4cabeb2e649a73afc7a485aeff5.zip busybox-8f8f268cfdecb4cabeb2e649a73afc7a485aeff5.tar.gz | |
bb_applet_name -> applet_name
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/copy_file.c | 2 | ||||
| -rw-r--r-- | libbb/remove_file.c | 6 | ||||
| -rw-r--r-- | libbb/verror_msg.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libbb/copy_file.c b/libbb/copy_file.c index d2794e7..bd9c9f7 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) if (dest_exists) { if (flags & FILEUTILS_INTERACTIVE) { - fprintf(stderr, "%s: overwrite `%s'? ", bb_applet_name, dest); + fprintf(stderr, "%s: overwrite `%s'? ", applet_name, dest); if (!bb_ask_confirmation()) { close (src_fd); return 0; diff --git a/libbb/remove_file.c b/libbb/remove_file.c index 92534a1..509aa6a 100644 --- a/libbb/remove_file.c +++ b/libbb/remove_file.c @@ -53,7 +53,7 @@ int remove_file(const char *path, int flags) if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 && isatty(0)) || (flags & FILEUTILS_INTERACTIVE)) { - fprintf(stderr, "%s: descend into directory `%s'? ", bb_applet_name, + fprintf(stderr, "%s: descend into directory `%s'? ", applet_name, path); if (!bb_ask_confirmation()) return 0; @@ -80,7 +80,7 @@ int remove_file(const char *path, int flags) } if (flags & FILEUTILS_INTERACTIVE) { - fprintf(stderr, "%s: remove directory `%s'? ", bb_applet_name, path); + fprintf(stderr, "%s: remove directory `%s'? ", applet_name, path); if (!bb_ask_confirmation()) return status; } @@ -96,7 +96,7 @@ int remove_file(const char *path, int flags) !S_ISLNK(path_stat.st_mode) && isatty(0)) || (flags & FILEUTILS_INTERACTIVE)) { - fprintf(stderr, "%s: remove `%s'? ", bb_applet_name, path); + fprintf(stderr, "%s: remove `%s'? ", applet_name, path); if (!bb_ask_confirmation()) return 0; } diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c index e670d40..0f018c5 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) if (logmode & LOGMODE_STDIO) { fflush(stdout); - fprintf(stderr, "%s: ", bb_applet_name); + fprintf(stderr, "%s: ", applet_name); vfprintf(stderr, s, p); if (!strerr) fputs(msg_eol, stderr); |