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

rodata cleanup. "unable to" == "cannot". -300 bytes

Browse Source
This commit is contained in:
Denis Vlasenko
2006-11-18 22:04:09 +00:00
parent 61126ab30a
commit 89f0b3486d
24 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libbb/remove_file.c
View File

@@ -25,7 +25,7 @@ int remove_file(const char *path, int flags)
if (lstat(path, &path_stat) < 0) {
if (errno != ENOENT) {
bb_perror_msg("unable to stat `%s'", path);
bb_perror_msg("cannot stat '%s'", path);
return -1;
}
@@ -34,7 +34,7 @@ int remove_file(const char *path, int flags)
if (!path_exists) {
if (!(flags & FILEUTILS_FORCE)) {
bb_perror_msg("cannot remove `%s'", path);
bb_perror_msg("cannot remove '%s'", path);
return -1;
}
return 0;
@@ -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'? ", applet_name,
fprintf(stderr, "%s: descend into directory '%s'? ", applet_name,
path);
if (!bb_ask_confirmation())
return 0;
@@ -75,18 +75,18 @@ int remove_file(const char *path, int flags)
}
if (closedir(dp) < 0) {
bb_perror_msg("unable to close `%s'", path);
bb_perror_msg("cannot close '%s'", path);
return -1;
}
if (flags & FILEUTILS_INTERACTIVE) {
fprintf(stderr, "%s: remove directory `%s'? ", applet_name, path);
fprintf(stderr, "%s: remove directory '%s'? ", applet_name, path);
if (!bb_ask_confirmation())
return status;
}
if (rmdir(path) < 0) {
bb_perror_msg("unable to remove `%s'", path);
bb_perror_msg("cannot remove '%s'", path);
return -1;
}
@@ -96,13 +96,13 @@ int remove_file(const char *path, int flags)
!S_ISLNK(path_stat.st_mode) &&
isatty(0)) ||
(flags & FILEUTILS_INTERACTIVE)) {
fprintf(stderr, "%s: remove `%s'? ", applet_name, path);
fprintf(stderr, "%s: remove '%s'? ", applet_name, path);
if (!bb_ask_confirmation())
return 0;
}
if (unlink(path) < 0) {
bb_perror_msg("unable to remove `%s'", path);
bb_perror_msg("cannot remove '%s'", path);
return -1;
}

2
libbb/run_parts.c
View File

@@ -64,7 +64,7 @@ int run_parts(char **args, const unsigned char test_mode, char **env)
if (test_mode & 2) {
return(2);
}
bb_perror_msg_and_die("unable to open `%s'", arg0);
bb_perror_msg_and_die("cannot open '%s'", arg0);
}
for (i = 0; i < entries; i++) {

4
libbb/xconnect.c
View File

@@ -54,9 +54,9 @@ void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
if (connect(s, s_addr, addrlen) < 0) {
if (ENABLE_FEATURE_CLEAN_UP) close(s);
if (s_addr->sa_family == AF_INET)
bb_perror_msg_and_die("unable to connect to remote host (%s)",
bb_perror_msg_and_die("cannot connect to remote host (%s)",
inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr));
bb_perror_msg_and_die("unable to connect to remote host");
bb_perror_msg_and_die("cannot connect to remote host");
}
}

4
libbb/xfuncs.c
View File

@@ -412,7 +412,7 @@ DIR *warn_opendir(const char *path)
DIR *dp;
if ((dp = opendir(path)) == NULL) {
bb_perror_msg("unable to open `%s'", path);
bb_perror_msg("cannot open '%s'", path);
return NULL;
}
return dp;
@@ -424,7 +424,7 @@ DIR *xopendir(const char *path)
DIR *dp;
if ((dp = opendir(path)) == NULL)
bb_perror_msg_and_die("unable to open `%s'", path);
bb_perror_msg_and_die("cannot open '%s'", path);
return dp;
}