diff options
author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-11-18 22:04:09 +0000 |
---|---|---|
committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-11-18 22:04:09 +0000 |
commit | 5fbe80c88a10cf2f357c3eb50990aa345bd5257a (patch) | |
tree | fc0d65e0d33b5b526b0d44d4c4da8143be3b53b1 /libbb | |
parent | 8c464c6dfa6a2fe87ca2762a237811b3ce2a8730 (diff) | |
download | busybox-w32-5fbe80c88a10cf2f357c3eb50990aa345bd5257a.tar.gz busybox-w32-5fbe80c88a10cf2f357c3eb50990aa345bd5257a.tar.bz2 busybox-w32-5fbe80c88a10cf2f357c3eb50990aa345bd5257a.zip |
rodata cleanup. "unable to" == "cannot". -300 bytes
git-svn-id: svn://busybox.net/trunk/busybox@16580 69ca8d6d-28ef-0310-b511-8ec308f3f277
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 509aa6a6d..ab159a481 100644 --- a/libbb/remove_file.c +++ b/libbb/remove_file.c | |||
@@ -25,7 +25,7 @@ int remove_file(const char *path, int flags) | |||
25 | 25 | ||
26 | if (lstat(path, &path_stat) < 0) { | 26 | if (lstat(path, &path_stat) < 0) { |
27 | if (errno != ENOENT) { | 27 | if (errno != ENOENT) { |
28 | bb_perror_msg("unable to stat `%s'", path); | 28 | bb_perror_msg("cannot stat '%s'", path); |
29 | return -1; | 29 | return -1; |
30 | } | 30 | } |
31 | 31 | ||
@@ -34,7 +34,7 @@ int remove_file(const char *path, int flags) | |||
34 | 34 | ||
35 | if (!path_exists) { | 35 | if (!path_exists) { |
36 | if (!(flags & FILEUTILS_FORCE)) { | 36 | if (!(flags & FILEUTILS_FORCE)) { |
37 | bb_perror_msg("cannot remove `%s'", path); | 37 | bb_perror_msg("cannot remove '%s'", path); |
38 | return -1; | 38 | return -1; |
39 | } | 39 | } |
40 | return 0; | 40 | return 0; |
@@ -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'? ", 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; |
@@ -75,18 +75,18 @@ int remove_file(const char *path, int flags) | |||
75 | } | 75 | } |
76 | 76 | ||
77 | if (closedir(dp) < 0) { | 77 | if (closedir(dp) < 0) { |
78 | bb_perror_msg("unable to close `%s'", path); | 78 | bb_perror_msg("cannot close '%s'", path); |
79 | return -1; | 79 | return -1; |
80 | } | 80 | } |
81 | 81 | ||
82 | if (flags & FILEUTILS_INTERACTIVE) { | 82 | if (flags & FILEUTILS_INTERACTIVE) { |
83 | fprintf(stderr, "%s: remove directory `%s'? ", 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 | } |
87 | 87 | ||
88 | if (rmdir(path) < 0) { | 88 | if (rmdir(path) < 0) { |
89 | bb_perror_msg("unable to remove `%s'", path); | 89 | bb_perror_msg("cannot remove '%s'", path); |
90 | return -1; | 90 | return -1; |
91 | } | 91 | } |
92 | 92 | ||
@@ -96,13 +96,13 @@ 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'? ", 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 | } |
103 | 103 | ||
104 | if (unlink(path) < 0) { | 104 | if (unlink(path) < 0) { |
105 | bb_perror_msg("unable to remove `%s'", path); | 105 | bb_perror_msg("cannot remove '%s'", path); |
106 | return -1; | 106 | return -1; |
107 | } | 107 | } |
108 | 108 | ||
diff --git a/libbb/run_parts.c b/libbb/run_parts.c index c1a45e3d9..fae91813c 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) | |||
64 | if (test_mode & 2) { | 64 | if (test_mode & 2) { |
65 | return(2); | 65 | return(2); |
66 | } | 66 | } |
67 | bb_perror_msg_and_die("unable to open `%s'", arg0); | 67 | bb_perror_msg_and_die("cannot open '%s'", arg0); |
68 | } | 68 | } |
69 | 69 | ||
70 | for (i = 0; i < entries; i++) { | 70 | for (i = 0; i < entries; i++) { |
diff --git a/libbb/xconnect.c b/libbb/xconnect.c index 7cf9d00e9..21ec2761a 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) | |||
54 | if (connect(s, s_addr, addrlen) < 0) { | 54 | if (connect(s, s_addr, addrlen) < 0) { |
55 | if (ENABLE_FEATURE_CLEAN_UP) close(s); | 55 | if (ENABLE_FEATURE_CLEAN_UP) close(s); |
56 | if (s_addr->sa_family == AF_INET) | 56 | if (s_addr->sa_family == AF_INET) |
57 | bb_perror_msg_and_die("unable to connect to remote host (%s)", | 57 | bb_perror_msg_and_die("cannot connect to remote host (%s)", |
58 | inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr)); | 58 | inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr)); |
59 | bb_perror_msg_and_die("unable to connect to remote host"); | 59 | bb_perror_msg_and_die("cannot connect to remote host"); |
60 | } | 60 | } |
61 | } | 61 | } |
62 | 62 | ||
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 352515af4..44a551639 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c | |||
@@ -412,7 +412,7 @@ DIR *warn_opendir(const char *path) | |||
412 | DIR *dp; | 412 | DIR *dp; |
413 | 413 | ||
414 | if ((dp = opendir(path)) == NULL) { | 414 | if ((dp = opendir(path)) == NULL) { |
415 | bb_perror_msg("unable to open `%s'", path); | 415 | bb_perror_msg("cannot open '%s'", path); |
416 | return NULL; | 416 | return NULL; |
417 | } | 417 | } |
418 | return dp; | 418 | return dp; |
@@ -424,7 +424,7 @@ DIR *xopendir(const char *path) | |||
424 | DIR *dp; | 424 | DIR *dp; |
425 | 425 | ||
426 | if ((dp = opendir(path)) == NULL) | 426 | if ((dp = opendir(path)) == NULL) |
427 | bb_perror_msg_and_die("unable to open `%s'", path); | 427 | bb_perror_msg_and_die("cannot open '%s'", path); |
428 | return dp; | 428 | return dp; |
429 | } | 429 | } |
430 | 430 | ||