emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bb_applet_name -> applet_name

Browse Source
This commit is contained in:
Denis Vlasenko
2006-10-03 21:00:43 +00:00
parent 67b23e6043
commit 8f8f268cfd
45 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libbb/copy_file.c
View File

@@ -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;

6
libbb/remove_file.c
View File

@@ -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;
}

2
libbb/verror_msg.c
View File

@@ -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);