← Commit list

a959588b8

Denis Vlasenko
Denis Vlasenko
2006-09-29
SOURCE BUG Duration: 39s

Subject

Yet another silly little byte saving. couldn't -> cannot

SOURCE BUG

This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)

→ Bu hatanin tam hikayesini ve duzeltme diffini gor

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

archival/gunzip.c +4 -4archival/uncompress.c +1 -1archival/unlzma.c +2 -2coreutils/stty.c +1 -1e2fsprogs/blkid/devno.c +1 -1e2fsprogs/blkid/resolve.c +1 -1e2fsprogs/e2fsck.c +3 -3e2fsprogs/ext2fs/finddev.c +2 -2e2fsprogs/fsck.c +7 -7e2fsprogs/tune2fs.c +1 -1libbb/get_console.c +1 -1modutils/insmod.c +1 -1networking/udhcp/clientpacket.c +1 -1networking/udhcp/dhcpc.c +1 -1networking/udhcp/dhcpd.c +3 -3shell/hush.c +2 -2util-linux/mdev.c +1 -1
archival/gunzip.c+4 -4
@@ -119,13 +119,13 @@ int gunzip_main(int argc, char **argv)
check_header_gzip(src_fd);
status = inflate_gunzip(src_fd, dst_fd);
if (status != 0) {
- bb_error_msg_and_die("Error inflating");
+ bb_error_msg_and_die("error inflating");
}
} else {
- bb_error_msg_and_die("Invalid magic");
+ bb_error_msg_and_die("invalid magic");
}
} else {
- bb_error_msg_and_die("Invalid magic");
+ bb_error_msg_and_die("invalid magic");
}
if ((status != EXIT_SUCCESS) && (new_path)) {
@@ -142,7 +142,7 @@ int gunzip_main(int argc, char **argv)
/* delete_path will be NULL if in test mode or from stdin */
if (delete_path && (unlink(delete_path) == -1)) {
- bb_error_msg_and_die("Couldn't remove %s", delete_path);
+ bb_error_msg_and_die("cannot remove %s", delete_path);
}
free(new_path);
archival/uncompress.c+1 -1
@@ -84,7 +84,7 @@ int uncompress_main(int argc, char **argv)
/* delete_path will be NULL if in test mode or from stdin */
if (delete_path && (unlink(delete_path) == -1)) {
- bb_error_msg_and_die("Couldn't remove %s", delete_path);
+ bb_error_msg_and_die("cannot remove %s", delete_path);
}
free(uncompressed_file);
archival/unlzma.c+2 -2
@@ -40,7 +40,7 @@ int unlzma_main(int argc, char **argv)
/* bug: char *extension = filename + strlen(filename) - 5; */
char *extension = strrchr(filename, '.');
if (!extension || strcmp(extension, ".lzma") != 0) {
- bb_error_msg_and_die("Invalid extension");
+ bb_error_msg_and_die("invalid extension");
}
xstat(filename, &stat_buf);
*extension = '\0';
@@ -53,7 +53,7 @@ int unlzma_main(int argc, char **argv)
if (!status)
filename[strlen(filename)] = '.';
if (unlink(filename) < 0) {
- bb_error_msg_and_die("Couldn't remove %s", filename);
+ bb_error_msg_and_die("cannot remove %s", filename);
}
}
coreutils/stty.c+1 -1
@@ -792,7 +792,7 @@ end_option:
}
fdflags = fcntl(STDIN_FILENO, F_GETFL);
if (fdflags == -1 || fcntl(STDIN_FILENO, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
- perror_on_device_and_die("%s: couldn't reset non-blocking mode");
+ perror_on_device_and_die("%s: cannot reset non-blocking mode");
}
/* Initialize to all zeroes so there is no risk memcmp will report a
e2fsprogs/blkid/devno.c+1 -1
@@ -189,7 +189,7 @@ int main(int argc, char** argv)
char *devname, *tmp;
int major, minor;
dev_t devno;
- const char *errmsg = "Couldn't parse %s: %s\n";
+ const char *errmsg = "Cannot parse %s: %s\n";
blkid_debug_mask = DEBUG_ALL;
if ((argc != 2) && (argc != 3)) {
e2fsprogs/blkid/resolve.c+1 -1
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
exit(1);
}
if (blkid_get_cache(&cache, bb_dev_null) < 0) {
- fprintf(stderr, "Couldn't get blkid cache\n");
+ fprintf(stderr, "cannot get blkid cache\n");
exit(1);
}
e2fsprogs/e2fsck.c+3 -3
@@ -9132,7 +9132,7 @@ static const struct e2fsck_problem problem_table[] = {
/* Internal error: couldn't find dir_info */
{ PR_2_NO_DIRINFO,
- N_("Internal error: couldn't find dir_info for %i.\n"),
+ N_("Internal error: cannot find dir_info for %i.\n"),
PROMPT_NONE, PR_FATAL },
/* Final rec_len is wrong */
@@ -9408,7 +9408,7 @@ static const struct e2fsck_problem problem_table[] = {
/* Internal error: couldn't find dir_info */
{ PR_3_NO_DIRINFO,
- N_("Internal error: couldn't find dir_info for %i.\n"),
+ N_("Internal error: cannot find dir_info for %i.\n"),
PROMPT_NONE, PR_FATAL },
/* Lost+found not a directory */
@@ -12915,7 +12915,7 @@ static void reserve_stdio_fds(void)
if (fd > 2)
break;
if (fd < 0) {
- fprintf(stderr, _("ERROR: Couldn't open "
+ fprintf(stderr, _("ERROR: Cannot open "
"/dev/null (%s)\n"),
strerror(errno));
break;
e2fsprogs/ext2fs/finddev.c+2 -2
@@ -158,7 +158,7 @@ int main(int argc, char** argv)
char *devname, *tmp;
int major, minor;
dev_t device;
- const char *errmsg = "Couldn't parse %s: %s\n";
+ const char *errmsg = "Cannot parse %s: %s\n";
if ((argc != 2) && (argc != 3)) {
fprintf(stderr, "Usage: %s device_number\n", argv[0]);
@@ -191,7 +191,7 @@ int main(int argc, char** argv)
printf("Found device! %s\n", devname);
free(devname);
} else {
- printf("Couldn't find device.\n");
+ printf("Cannot find device.\n");
}
return 0;
}
e2fsprogs/fsck.c+7 -7
@@ -479,7 +479,7 @@ static void load_fs_info(const char *filename)
struct fs_info *fs;
if ((f = fopen(filename, "r")) == NULL) {
- bb_perror_msg("WARNING: couldn't open %s", filename);
+ bb_perror_msg("WARNING: cannot open %s", filename);
return;
}
while (!feof(f)) {
@@ -717,7 +717,7 @@ static struct fsck_instance *wait_one(int flags)
if ((errno == EINTR) || (errno == EAGAIN))
continue;
if (errno == ECHILD) {
- bb_error_msg("wait: No more child process?!?");
+ bb_error_msg("wait: no more child process?!?");
return NULL;
}
perror("wait");
@@ -840,7 +840,7 @@ static void fsck_device(struct fs_info *fs, int interactive)
num_running++;
retval = execute(type, fs->device, fs->mountpt, interactive);
if (retval) {
- bb_error_msg("Error %d while executing fsck.%s for %s",
+ bb_error_msg("error %d while executing fsck.%s for %s",
retval, type, fs->device);
num_running--;
}
@@ -1208,8 +1208,8 @@ static void PRS(int argc, char *argv[])
* /proc/partitions isn't found.
*/
if (access("/proc/partitions", R_OK) < 0) {
- bb_error_msg_and_die("Couldn't open /proc/partitions: %m\n"
- "Is /proc mounted?");
+ bb_perror_msg_and_die("cannot open /proc/partitions "
+ "(is /proc mounted?)");
}
/*
* Check to see if this is because
@@ -1217,10 +1217,10 @@ static void PRS(int argc, char *argv[])
*/
if (geteuid())
bb_error_msg_and_die(
- "Must be root to scan for matching filesystems: %s\n", arg);
+ "must be root to scan for matching filesystems: %s\n", arg);
else
bb_error_msg_and_die(
- "Couldn't find matching filesystem: %s", arg);
+ "cannot find matching filesystem: %s", arg);
}
devices[num_devices++] = dev ? dev : string_copy(arg);
continue;
e2fsprogs/tune2fs.c+1 -1
@@ -397,7 +397,7 @@ static time_t parse_time(char *str)
ts.tm_mday = 0;
#endif
if (ts.tm_mday == 0) {
- bb_error_msg_and_die("Couldn't parse date/time specifier: %s", str);
+ bb_error_msg_and_die("Cannot parse date/time specifier: %s", str);
}
return (mktime(&ts));
}
libbb/get_console.c+1 -1
@@ -72,6 +72,6 @@ int get_console_fd(void)
}
}
- bb_error_msg("Couldn't get a file descriptor referring to the console");
+ bb_error_msg("cannot get file descriptor referring to console");
return fd; /* total failure */
}
modutils/insmod.c+1 -1
@@ -4111,7 +4111,7 @@ int insmod_main( int argc, char **argv)
if (m_has_modinfo) {
m_version = new_get_module_version(f, m_strversion);
if (m_version == -1) {
- bb_error_msg("couldn't find the kernel version the module was "
+ bb_error_msg("cannot find the kernel version the module was "
"compiled for");
goto out;
}
networking/udhcp/clientpacket.c+1 -1
@@ -172,7 +172,7 @@ int get_raw_packet(struct dhcpMessage *payload, int fd)
memset(&packet, 0, sizeof(struct udp_dhcp_packet));
bytes = read(fd, &packet, sizeof(struct udp_dhcp_packet));
if (bytes < 0) {
- DEBUG("Couldn't read on raw listening socket - ignoring");
+ DEBUG("Cannot read on raw listening socket - ignoring");
usleep(500000); /* possible down interface, looping condition */
return -1;
}
networking/udhcp/dhcpc.c+1 -1
@@ -320,7 +320,7 @@ int udhcpc_main(int argc, char *argv[])
else
fd = raw_socket(client_config.ifindex);
if (fd < 0) {
- bb_perror_msg("FATAL: couldn't listen on socket");
+ bb_perror_msg("FATAL: cannot listen on socket");
return 0;
}
}
networking/udhcp/dhcpd.c+3 -3
@@ -90,7 +90,7 @@ int udhcpd_main(int argc, char *argv[])
if (server_socket < 0)
if ((server_socket = listen_socket(INADDR_ANY, SERVER_PORT, server_config.interface)) < 0) {
- bb_perror_msg("FATAL: couldn't create server socket");
+ bb_perror_msg("FATAL: cannot create server socket");
return 2;
}
@@ -137,7 +137,7 @@ int udhcpd_main(int argc, char *argv[])
}
if ((state = get_option(&packet, DHCP_MESSAGE_TYPE)) == NULL) {
- bb_error_msg("Couldn't get option from packet, ignoring");
+ bb_error_msg("cannot get option from packet, ignoring");
continue;
}
@@ -165,7 +165,7 @@ int udhcpd_main(int argc, char *argv[])
DEBUG("Received DISCOVER");
if (sendOffer(&packet) < 0) {
- bb_error_msg("Send OFFER failed");
+ bb_error_msg("send OFFER failed");
}
break;
case DHCPREQUEST:
shell/hush.c+2 -2
@@ -717,7 +717,7 @@ static int builtin_source(struct child_prog *child)
/* XXX search through $PATH is missing */
input = fopen(child->argv[1], "r");
if (!input) {
- bb_error_msg("Couldn't open file '%s'", child->argv[1]);
+ bb_error_msg("cannot open '%s'", child->argv[1]);
return EXIT_FAILURE;
}
@@ -1120,7 +1120,7 @@ static void pseudo_exec(struct child_prog *child)
#endif
debug_printf("exec of %s\n",child->argv[0]);
execvp(child->argv[0],child->argv);
- bb_perror_msg("couldn't exec: %s",child->argv[0]);
+ bb_perror_msg("cannot exec: %s",child->argv[0]);
_exit(1);
} else if (child->group) {
debug_printf("runtime nesting to group\n");
util-linux/mdev.c+1 -1
@@ -185,7 +185,7 @@ static void make_device(char *path, int delete)
putenv(s);
free(s);
free(command);
- if (rc == -1) bb_perror_msg_and_die("Couldn't run %s", command);
+ if (rc == -1) bb_perror_msg_and_die("cannot run %s", command);
}
if (delete) unlink(device_name);
}