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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreutils/libcoreutils/cp_mv_stat.c
View File

@ -27,7 +27,7 @@ int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf)
{
if (sf(fn, fn_stat) < 0) {
if (errno != ENOENT) {
bb_perror_msg("unable to stat '%s'", fn);
bb_perror_msg("cannot stat '%s'", fn);
return -1;
}
return 0;

2
coreutils/mkdir.c
View File

@ -44,7 +44,7 @@ int mkdir_main (int argc, char **argv)
if(opt & 1) {
mode = 0777;
if (!bb_parse_mode (smode, &mode)) {
bb_error_msg_and_die ("invalid mode `%s'", smode);
bb_error_msg_and_die ("invalid mode '%s'", smode);
}
}
if(opt & 2)

2
coreutils/rm.c
View File

@ -38,7 +38,7 @@ int rm_main(int argc, char **argv)
const char *base = bb_get_last_path_component(*argv);
if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) {
bb_error_msg("cannot remove `.' or `..'");
bb_error_msg("cannot remove '.' or '..'");
} else if (remove_file(*argv, flags) >= 0) {
continue;
}

4
coreutils/rmdir.c
View File

@ -38,7 +38,7 @@ int rmdir_main(int argc, char **argv)
do {
if (rmdir(path) < 0) {
bb_perror_msg("`%s'", path); /* Match gnu rmdir msg. */
bb_perror_msg("'%s'", path); /* Match gnu rmdir msg. */
status = EXIT_FAILURE;
} else if (flags) {
/* Note: path was not empty or null since rmdir succeeded. */
@ -46,7 +46,7 @@ int rmdir_main(int argc, char **argv)
/* Path is now just the parent component. Note that dirname
* returns "." if there are no parents. We must distinguish
* this from the case of the original path starting with '.'.
*/
*/
if (do_dot || (*path != '.') || path[1]) {
continue;
}

2
coreutils/stty.c
View File

@ -917,7 +917,7 @@ end_option:
new_mode.c_cflag &= (~CIBAUD);
if (speed_was_set || memcmp(&mode, &new_mode, sizeof(mode)) != 0)
#endif
perror_on_device_and_die ("%s: unable to perform all requested operations");
perror_on_device_and_die("%s: cannot perform all requested operations");
}
}

2
debianutils/start_stop_daemon.c
View File

@ -315,5 +315,5 @@ int start_stop_daemon_main(int argc, char **argv)
}
#endif
execv(startas, argv);
bb_perror_msg_and_die ("unable to start %s", startas);
bb_perror_msg_and_die("cannot start %s", startas);
}

2
e2fsprogs/e2fsck.c
View File

@ -13377,7 +13377,7 @@ restart:
* happen, unless the hardware or
* device driver is being bogus.
*/
bb_error_msg(_("unable to set superblock flags on %s"), ctx->device_name);
bb_error_msg(_("cannot set superblock flags on %s"), ctx->device_name);
bb_error_msg_and_die(0);
}
retval = e2fsck_run_ext3_journal(ctx);

20
include/usage.h
View File

@ -425,11 +425,11 @@
"Displays the current time in the given FORMAT, or sets the system date.\n" \
"\nOptions:\n" \
"\t-R\t\tOutputs RFC-822 compliant date string\n" \
"\t-d STRING\tDisplays time described by STRING, not `now'\n" \
"\t-d STRING\tDisplays time described by STRING, not 'now'\n" \
USE_FEATURE_DATE_ISOFMT( \
"\t-I[TIMESPEC]\tOutputs an ISO-8601 compliant date/time string\n" \
"\t\t\tTIMESPEC=`date' (or missing) for date only,\n" \
"\t\t\t`hours', `minutes', or `seconds' for date and,\n" \
"\t\t\tTIMESPEC='date' (or missing) for date only,\n" \
"\t\t\t'hours', 'minutes', or 'seconds' for date and,\n" \
"\t\t\ttime to the indicated precision\n" \
"\t-D hint\t\tUse 'hint' as date format, via strptime()\n" \
) \
@ -774,8 +774,8 @@ USE_FEATURE_DATE_ISOFMT( \
"\t or 0\n" \
"\tlength STRING length of STRING\n" \
"\tquote TOKEN interpret TOKEN as a string, even if\n" \
"\t it is a keyword like `match' or an\n" \
"\t operator like `/'\n" \
"\t it is a keyword like 'match' or an\n" \
"\t operator like '/'\n" \
"\t( EXPRESSION ) value of EXPRESSION\n\n" \
"Beware that many operators need to be escaped or quoted for shells.\n" \
"Comparisons are arithmetic if both ARGs are numbers, else\n" \
@ -980,11 +980,11 @@ USE_FEATURE_DATE_ISOFMT( \
"while true ; do\n" \
" case $1 in\n" \
" -a|--a-long) echo \"Option a\" ; shift ;;\n" \
" -b|--b-long) echo \"Option b, argument `$2'\" ; shift 2 ;;\n" \
" -b|--b-long) echo \"Option b, argument '$2'\" ; shift 2 ;;\n" \
" -c|--c-long)\n" \
" case \"$2\" in\n" \
" \"\") echo \"Option c, no argument\"; shift 2 ;;\n" \
" *) echo \"Option c, argument `$2'\" ; shift 2 ;;\n" \
" *) echo \"Option c, argument '$2'\" ; shift 2 ;;\n" \
" esac ;;\n" \
" --) shift ; break ;;\n" \
" *) echo \"Internal error!\" ; exit 1 ;;\n" \
@ -1639,7 +1639,7 @@ USE_FEATURE_DATE_ISOFMT( \
"\t-s\tLog to stderr as well as the system log\n" \
"\t-t TAG\tLog using the specified tag (defaults to user name)\n" \
"\t-p PRIORITY\tEnter the message with the specified priority\n" \
"\t\tThis may be numerical or a ``facility.level'' pair"
"\t\tThis may be numerical or a 'facility.level' pair"
#define logger_example_usage \
"$ logger \"hello\"\n"
@ -1943,7 +1943,7 @@ USE_FEATURE_MDEV_CONFIG( \
"[-dq] TEMPLATE"
#define mktemp_full_usage \
"Creates a temporary file with its name based on TEMPLATE.\n" \
"TEMPLATE is any name with six `Xs' (i.e., /tmp/temp.XXXXXX).\n\n" \
"TEMPLATE is any name with six 'Xs' (i.e., /tmp/temp.XXXXXX).\n\n" \
"Options:\n" \
"\t-d\t\tMake a directory instead of a file\n" \
"\t-q\t\tFail silently if an error occurs"
@ -3125,7 +3125,7 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
"\t-m max_ttl\tSet the max time-to-live (max number of hops)\n" \
"\t-p port#\tSet the base UDP port number used in probes\n" \
"\t\t(default is 33434)\n" \
"\t-q nqueries\tSet the number of probes per ``ttl'' to nqueries\n" \
"\t-q nqueries\tSet the number of probes per 'ttl' to nqueries\n" \
"\t\t(default is 3)\n" \
"\t-s src_addr\tUse the following IP address as the source address\n" \
"\t-t tos\tSet the type-of-service in probe packets to the following value\n" \

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

10
loginutils/login.c
View File

@ -260,11 +260,11 @@ int login_main(int argc, char **argv)
USE_FEATURE_UTMP(
safe_strncpy(utent.ut_host, opt_host, sizeof(utent.ut_host));
)
snprintf(fromhost, sizeof(fromhost)-1, " on `%.100s' from "
"`%.200s'", short_tty, opt_host);
snprintf(fromhost, sizeof(fromhost)-1, " on '%.100s' from "
"'%.200s'", short_tty, opt_host);
}
else
snprintf(fromhost, sizeof(fromhost)-1, " on `%.100s'", short_tty);
snprintf(fromhost, sizeof(fromhost)-1, " on '%.100s'", short_tty);
bb_setpgrp;
@ -302,7 +302,7 @@ auth_failed:
bb_do_delay(FAIL_DELAY);
puts("Login incorrect");
if (++count == 3) {
syslog(LOG_WARNING, "invalid password for `%s'%s",
syslog(LOG_WARNING, "invalid password for '%s'%s",
username, fromhost);
return EXIT_FAILURE;
}
@ -319,7 +319,7 @@ auth_failed:
security_context_t old_tty_sid, new_tty_sid;
if (get_default_context(username, NULL, &user_sid)) {
bb_error_msg_and_die("unable to get SID for %s",
bb_error_msg_and_die("cannot get SID for %s",
username);
}
if (getfilecon(full_tty, &old_tty_sid) < 0) {

10
miscutils/crond.c
View File

@ -654,7 +654,7 @@ static void SynchronizeDir(void)
remove(CRONUPDATE);
if (chdir(CDir) < 0) {
crondlog("\311unable to find %s\n", CDir);
crondlog("\311cannot find %s\n", CDir);
}
{
DIR *dir = opendir(".");
@ -673,7 +673,7 @@ static void SynchronizeDir(void)
}
closedir(dir);
} else {
crondlog("\311Unable to open current dir!\n");
crondlog("\311cannot open current dir!\n");
}
}
}
@ -876,7 +876,7 @@ ForkJob(const char *user, CronLine * line, int mailFd,
close(mailFd);
}
execl(prog, prog, cmd, arg, NULL);
crondlog("\024unable to exec, user %s cmd %s %s %s\n", user, prog, cmd, arg);
crondlog("\024cannot exec, user %s cmd %s %s %s\n", user, prog, cmd, arg);
if (mailf) {
fdprintf(1, "Exec failed: %s -c %s\n", prog, arg);
}
@ -926,7 +926,7 @@ static void RunJob(const char *user, CronLine * line)
line->cl_Shell);
line->cl_MailPos = lseek(mailFd, 0, SEEK_CUR);
} else {
crondlog("\024unable to create mail file user %s file %s, output to /dev/null\n", user, mailFile);
crondlog("\024cannot create mail file user %s file %s, output to /dev/null\n", user, mailFile);
}
ForkJob(user, line, mailFd, DEFAULT_SHELL, "-c", line->cl_Shell, mailFile);
@ -1003,7 +1003,7 @@ static void RunJob(const char *user, CronLine * line)
#endif
execl(DEFAULT_SHELL, DEFAULT_SHELL, "-c", line->cl_Shell, NULL);
crondlog("\024unable to exec, user %s cmd %s -c %s\n", user,
crondlog("\024cannot exec, user %s cmd %s -c %s\n", user,
DEFAULT_SHELL, line->cl_Shell);
exit(0);
} else if (pid < 0) {

6
miscutils/crontab.c
View File

@ -126,7 +126,7 @@ int crontab_main(int ac, char **av)
if (repFile) {
repFd = GetReplaceStream(caller, repFile);
if (repFd < 0)
bb_error_msg_and_die("unable to read replacement file");
bb_error_msg_and_die("cannot read replacement file");
}
/*
@ -191,7 +191,7 @@ int crontab_main(int ac, char **av)
close(fd);
rename(path, pas->pw_name);
} else {
bb_error_msg("unable to create %s/%s", CDir, path);
bb_error_msg("cannot create %s/%s", CDir, path);
}
close(repFd);
}
@ -224,7 +224,7 @@ int crontab_main(int ac, char **av)
/* loop */
}
if (fo == NULL) {
bb_error_msg("unable to append to %s/%s", CDir, CRONUPDATE);
bb_error_msg("cannot append to %s/%s", CDir, CRONUPDATE);
}
}
return 0;

4
modutils/insmod.c
View File

@ -4299,12 +4299,12 @@ int insmod_ng_main( int argc, char **argv)
len = st.st_size;
map = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
if (map == MAP_FAILED) {
bb_perror_msg_and_die("cannot mmap `%s'", filename);
bb_perror_msg_and_die("cannot mmap '%s'", filename);
}
ret = syscall(__NR_init_module, map, len, options);
if (ret != 0) {
bb_perror_msg_and_die("cannot insert `%s': %s (%li)",
bb_perror_msg_and_die("cannot insert '%s': %s (%li)",
filename, moderror(errno), ret);
}

2
networking/ether-wake.c
View File

@ -270,7 +270,7 @@ static inline int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd)
byte_cnt = sscanf(ethoptarg, "%d.%d.%d.%d",
&passwd[0], &passwd[1], &passwd[2], &passwd[3]);
if (byte_cnt < 4) {
bb_error_msg("unable to read the Wake-On-LAN pass");
bb_error_msg("cannot read Wake-On-LAN pass");
return 0;
}

4
networking/nameif.c
View File

@ -78,7 +78,7 @@ int nameif_main(int argc, char **argv)
while (*a) {
if (strlen(*a) > IF_NAMESIZE)
bb_error_msg_and_die("interface name `%s' "
bb_error_msg_and_die("interface name '%s' "
"too long", *a);
ch = xzalloc(sizeof(mactable_t));
ch->ifname = xstrdup(*a++);
@ -104,7 +104,7 @@ int nameif_main(int argc, char **argv)
ch = xzalloc(sizeof(mactable_t));
ch->ifname = xstrndup(line_ptr, name_length);
if (name_length > IF_NAMESIZE)
bb_error_msg_and_die("interface name `%s' "
bb_error_msg_and_die("interface name '%s' "
"too long", ch->ifname);
line_ptr += name_length;
line_ptr += strspn(line_ptr, " \t");

2
procps/sysctl.c
View File

@ -43,7 +43,7 @@ static const char ERR_UNKNOWN_READING[] =
static const char ERR_PERMISSION_DENIED[] =
"error: permission denied on key '%s'\n";
static const char ERR_PRELOAD_FILE[] =
"error: unable to open preload file '%s'\n";
"error: cannot open preload file '%s'\n";
static const char WARN_BAD_LINE[] =
"warning: %s(%d): invalid syntax, continuing...\n";

2
shell/msh.c
View File

@ -2786,7 +2786,7 @@ forkexec(struct op *t, int *pin, int *pout, int act, char **wp)
newpid = vfork();
if (newpid == -1) {
DBGPRINTF(("FORKEXEC: ERROR, unable to vfork()!\n"));
DBGPRINTF(("FORKEXEC: ERROR, cannot vfork()!\n"));
return (-1);
}

8
util-linux/fdisk.c
View File

@ -441,7 +441,7 @@ static const struct systypes i386_sys_types[] = {
{ "\x07" "HPFS/NTFS" }, /* OS/2 IFS, eg, HPFS or NTFS or QNX */
{ "\x0a" "OS/2 Boot Manager" },/* OS/2 Boot Manager */
{ "\x0b" "Win95 FAT32" },
{ "\x0c" "Win95 FAT32 (LBA)" },/* LBA really is `Extended Int 13h' */
{ "\x0c" "Win95 FAT32 (LBA)" },/* LBA really is 'Extended Int 13h' */
{ "\x0e" "Win95 FAT16 (LBA)" },
{ "\x0f" "Win95 Ext'd (LBA)" },
{ "\x11" "Hidden FAT12" },
@ -1053,7 +1053,7 @@ read_extended(int ext)
if (partitions >= MAXIMUM_PARTS) {
/* This is not a Linux restriction, but
this program uses arrays of size MAXIMUM_PARTS.
Do not try to `improve' this test. */
Do not try to 'improve' this test. */
struct pte *pre = &ptes[partitions-1];
#ifdef CONFIG_FEATURE_FDISK_WRITABLE
printf(_("Warning: deleting partitions after %d\n"),
@ -1716,7 +1716,7 @@ change_sysid(void)
printf(_("Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
"type 0 is probably unwise. You can delete\n"
"a partition using the `d' command.\n"));
"a partition using the 'd' command.\n"));
/* break; */
}
@ -2434,7 +2434,7 @@ new_partition(void)
}
else
printf(_("Invalid partition number "
"for type `%c'\n"), c);
"for type '%c'\n"), c);
}
}
}

4
util-linux/fdisk_sgi.c
View File

@ -720,7 +720,7 @@ sgi_add_partition(int n, int sys)
first = read_int(0, 0, last-1, 0, mesg);
if (first != 0) {
printf(_("It is highly recommended that eleventh partition\n"
"covers the entire disk and is of type `SGI volume'\n"));
"covers the entire disk and is of type 'SGI volume'\n"));
}
} else {
first = freelist[0].first;
@ -749,7 +749,7 @@ sgi_add_partition(int n, int sys)
last = last; /* align to cylinder if You know how ... */
if ( (sys == SGI_VOLUME) && (first != 0 || last != sgi_get_lastblock() ) )
printf(_("It is highly recommended that eleventh partition\n"
"covers the entire disk and is of type `SGI volume'\n"));
"covers the entire disk and is of type 'SGI volume'\n"));
sgi_set_partition(n, first, last-first, sys);
}

2
util-linux/fsck_minix.c
View File

@ -445,7 +445,7 @@ static void read_block(unsigned int nr, char *addr)
return;
}
if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) {
printf("%s: unable to seek to block in file '%s'\n",
printf("%s: cannot seek to block in file '%s'\n",
bb_msg_read_error, current_name);
errors_uncorrected = 1;
memset(addr, 0, BLOCK_SIZE);

14
util-linux/mkfs_minix.c
View File

@ -312,17 +312,17 @@ static void write_tables(void)
if (lseek(DEV, 0, SEEK_SET))
bb_error_msg_and_die("seek to boot block failed in write_tables");
if (512 != write(DEV, boot_block_buffer, 512))
bb_error_msg_and_die("unable to clear boot sector");
bb_error_msg_and_die("cannot clear boot sector");
if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET))
bb_error_msg_and_die("seek failed in write_tables");
if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE))
bb_error_msg_and_die("unable to write super-block");
bb_error_msg_and_die("cannot write super-block");
if (IMAPS * BLOCK_SIZE != write(DEV, inode_map, IMAPS * BLOCK_SIZE))
bb_error_msg_and_die("unable to write inode map");
bb_error_msg_and_die("cannot write inode map");
if (ZMAPS * BLOCK_SIZE != write(DEV, zone_map, ZMAPS * BLOCK_SIZE))
bb_error_msg_and_die("unable to write zone map");
bb_error_msg_and_die("cannot write zone map");
if (INODE_BUFFER_SIZE != write(DEV, inode_buffer, INODE_BUFFER_SIZE))
bb_error_msg_and_die("unable to write inodes");
bb_error_msg_and_die("cannot write inodes");
}
@ -570,7 +570,7 @@ static void setup_tables(void)
* /sbin/mkfs.minix -i 200 test.fs
* */
if (i >= 999) {
bb_error_msg_and_die("unable to allocate buffers for maps");
bb_error_msg_and_die("cannot allocate buffers for maps");
}
FIRSTZONE = NORM_FIRSTZONE;
inode_map = xmalloc(IMAPS * BLOCK_SIZE);
@ -807,7 +807,7 @@ goodbye:
strcpy(tmp + 2, ".badblocks");
DEV = xopen(device_name, O_RDWR);
if (fstat(DEV, &statbuf) < 0)
bb_error_msg_and_die("unable to stat %s", device_name);
bb_error_msg_and_die("cannot stat %s", device_name);
if (!S_ISBLK(statbuf.st_mode))
check = 0;
else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)