diff options
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/remove_file.c | 16 | ||||
| -rw-r--r-- | libbb/run_parts.c | 2 | ||||
| -rw-r--r-- | libbb/xconnect.c | 4 | ||||
| -rw-r--r-- | libbb/xfuncs.c | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/libbb/remove_file.c b/libbb/remove_file.c index 509aa6a..ab159a4 100644 --- a/libbb/remove_file.c +++ b/libbb/remove_file.c @@ -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; } diff --git a/libbb/run_parts.c b/libbb/run_parts.c index c1a45e3..fae9181 100644 --- a/libbb/run_parts.c +++ b/libbb/run_parts.c @@ -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++) { diff --git a/libbb/xconnect.c b/libbb/xconnect.c index 7cf9d00..21ec276 100644 --- a/libbb/xconnect.c +++ b/libbb/xconnect.c @@ -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"); } } diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 352515a..44a5516 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -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; } |