Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-25 18:33:06 +00:00
Code Issues Projects Releases Wiki Activity

message string changes, mostly for consistency, also -32 bytes in .rodata

Browse Source
This commit is contained in:
Denis Vlasenko 2006-10-20 13:28:22 +00:00
parent dd2982882b
commit e1a0d486e4
71 changed files with 127 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applets/applets.c
View File

@ -338,7 +338,7 @@ static void check_suid(struct BB_applet *applet)
m >>= 3;
if (!(m & S_IXOTH)) /* is x bit not set ? */
bb_error_msg_and_die ("You have no permission to run this applet!");
bb_error_msg_and_die("you have no permission to run this applet!");
if ((sct->m_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) { /* *both* have to be set for sgid */
xsetgid(sct->m_gid);
@ -365,7 +365,7 @@ static void check_suid(struct BB_applet *applet)
#endif
if (applet->need_suid == _BB_SUID_ALWAYS) {
if (geteuid()) bb_error_msg_and_die("Applet requires root privileges!");
if (geteuid()) bb_error_msg_and_die("applet requires root privileges!");
} else if (applet->need_suid == _BB_SUID_NEVER) {
xsetgid(rgid); /* drop all privileges */
xsetuid(ruid);

2
archival/ar.c
View File

@ -83,7 +83,7 @@ int ar_main(int argc, char **argv)
xread(archive_handle->src_fd, magic, 7);
if (strncmp(magic, "!<arch>", 7) != 0) {
bb_error_msg_and_die("Invalid ar magic");
bb_error_msg_and_die("invalid ar magic");
}
archive_handle->offset += 7;

12
archival/dpkg.c
View File

@ -711,7 +711,7 @@ static unsigned int get_status(const unsigned int status_node, const int num)
/* skip past the separating spaces */
status_string += strspn(status_string, " ");
}
len = strcspn(status_string, " \n\0");
len = strcspn(status_string, " \n");
state_sub_string = xstrndup(status_string, len);
state_sub_num = search_name_hashtable(state_sub_string);
free(state_sub_string);
@ -796,7 +796,7 @@ static void index_status_file(const char *filename)
if (status_line != NULL) {
status_line += 7;
status_line += strspn(status_line, " \n\t");
status_line = xstrndup(status_line, strcspn(status_line, "\n\0"));
status_line = xstrndup(status_line, strcspn(status_line, "\n"));
status_node->status = search_name_hashtable(status_line);
free(status_line);
}
@ -849,7 +849,7 @@ static void write_status_file(deb_file_t **deb_file)
tmp_string += 8;
tmp_string += strspn(tmp_string, " \n\t");
package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n\0"));
package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n"));
write_flag = FALSE;
tmp_string = strstr(control_buffer, "Status:");
if (tmp_string != NULL) {
@ -1374,8 +1374,8 @@ static void remove_package(const unsigned int package_num, int noisy)
sprintf(conffile_name, "/var/lib/dpkg/info/%s.conffiles", package_name);
exclude_files = create_list(conffile_name);
/* Some directories cant be removed straight away, so do multiple passes */
while (remove_file_array(remove_files, exclude_files));
/* Some directories can't be removed straight away, so do multiple passes */
while (remove_file_array(remove_files, exclude_files)) /*repeat */;
free_array(exclude_files);
free_array(remove_files);
@ -1421,7 +1421,7 @@ static void purge_package(const unsigned int package_num)
exclude_files = xzalloc(sizeof(char*));
/* Some directories cant be removed straight away, so do multiple passes */
while (remove_file_array(remove_files, exclude_files));
while (remove_file_array(remove_files, exclude_files)) /* repeat */;
free_array(remove_files);
/* Create a list of all /var/lib/dpkg/info/<package> files */

2
archival/libunarchive/archive_xread_all_eof.c
View File

@ -15,7 +15,7 @@ ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *b
size = full_read(archive_handle->src_fd, buf, count);
if ((size != 0) && (size != count)) {
bb_perror_msg_and_die("Short read, read %ld of %ld", (long)size, (long)count);
bb_perror_msg_and_die("short read, read %ld of %ld", (long)size, (long)count);
}
return(size);
}

2
archival/libunarchive/check_header_gzip.c
View File

@ -24,7 +24,7 @@ void check_header_gzip(int src_fd)
/* Check the compression method */
if (header.formatted.method != 8) {
bb_error_msg_and_die("Unknown compression method %d",
bb_error_msg_and_die("unknown compression method %d",
header.formatted.method);
}

2
archival/libunarchive/decompress_unzip.c
View File

@ -745,7 +745,7 @@ static int inflate_block(int *e)
if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) {
if (i == 1) {
bb_error_msg_and_die("Incomplete literal tree");
bb_error_msg_and_die("incomplete literal tree");
huft_free(tl);
}
return i; /* incomplete code set */

2
archival/libunarchive/get_header_cpio.c
View File

@ -57,7 +57,7 @@ char get_header_cpio(archive_handle_t *archive_handle)
archive_handle->offset += 110;
if ((strncmp(&cpio_header[0], "07070", 5) != 0) || ((cpio_header[5] != '1') && (cpio_header[5] != '2'))) {
bb_error_msg_and_die("Unsupported cpio format, use newc or crc");
bb_error_msg_and_die("unsupported cpio format, use newc or crc");
}
{

2
archival/libunarchive/get_header_tar_bz2.c
View File

@ -15,7 +15,7 @@
char get_header_tar_bz2(archive_handle_t *archive_handle)
{
/* Cant lseek over pipe's */
/* Can't lseek over pipes */
archive_handle->seek = seek_by_read;
archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompressStream);

2
archival/libunarchive/get_header_tar_gz.c
View File

@ -12,7 +12,7 @@ char get_header_tar_gz(archive_handle_t *archive_handle)
{
unsigned char magic[2];
/* Cant lseek over pipe's */
/* Can't lseek over pipes */
archive_handle->seek = seek_by_read;
xread(archive_handle->src_fd, &magic, 2);

2
archival/libunarchive/seek_by_jump.c
View File

@ -19,6 +19,6 @@ void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amo
seek_by_read(archive_handle, amount);
} else
#endif
bb_perror_msg_and_die("Seek failure");
bb_perror_msg_and_die("seek failure");
}
}

2
archival/libunarchive/seek_by_read.c
View File

@ -8,7 +8,7 @@
#include "unarchive.h"
#include "libbb.h"
/* If we are reading through a pipe(), or from stdin then we cant lseek,
/* If we are reading through a pipe(), or from stdin then we can't lseek,
* we must read and discard the data to skip over it.
*/
void seek_by_read(const archive_handle_t *archive_handle, const unsigned int jump_size)

2
archival/libunarchive/unpack_ar_archive.c
View File

@ -14,7 +14,7 @@ void unpack_ar_archive(archive_handle_t *ar_archive)
xread(ar_archive->src_fd, magic, 7);
if (strncmp(magic, "!<arch>", 7) != 0) {
bb_error_msg_and_die("Invalid ar magic");
bb_error_msg_and_die("invalid ar magic");
}
ar_archive->offset += 7;

2
archival/rpm.c
View File

@ -183,7 +183,7 @@ static void extract_cpio_gz(int fd) {
xread(archive_handle->src_fd, &magic, 2);
if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
bb_error_msg_and_die("Invalid gzip magic");
bb_error_msg_and_die("invalid gzip magic");
}
check_header_gzip(archive_handle->src_fd);
xchdir("/"); // Install RPM's to root

4
archival/rpm2cpio.c
View File

@ -37,10 +37,10 @@ static void skip_header(int rpm_fd)
xread(rpm_fd, &header, sizeof(struct rpm_header));
if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC, 3) != 0) {
bb_error_msg_and_die("Invalid RPM header magic"); /* Invalid magic */
bb_error_msg_and_die("invalid RPM header magic"); /* Invalid magic */
}
if (header.version != 1) {
bb_error_msg_and_die("Unsupported RPM header version"); /* This program only supports v1 headers */
bb_error_msg_and_die("unsupported RPM header version"); /* This program only supports v1 headers */
}
header.entries = ntohl(header.entries);
header.size = ntohl(header.size);

6
archival/tar.c
View File

@ -496,7 +496,7 @@ static int writeTarFile(const int tar_fd, const int verboseFlag,
freeHardLinkInfo(&tbInfo.hlInfoHead);
if (errorFlag)
bb_error_msg("Error exit delayed from previous errors");
bb_error_msg("error exit delayed from previous errors");
if (gzipPid && waitpid(gzipPid, NULL, 0)==-1)
bb_error_msg("cannot wait");
@ -540,7 +540,7 @@ static llist_t *append_file_list_to_list(llist_t *list)
#ifdef CONFIG_FEATURE_TAR_COMPRESS
static char get_header_tar_Z(archive_handle_t *archive_handle)
{
/* Cant lseek over pipe's */
/* Can't lseek over pipes */
archive_handle->seek = seek_by_read;
/* do the decompression, and cleanup */
@ -556,7 +556,7 @@ static char get_header_tar_Z(archive_handle_t *archive_handle)
/* nothing */;
/* Can only do one file at a time */
return(EXIT_FAILURE);
return EXIT_FAILURE;
}
#else
#define get_header_tar_Z 0

4
archival/uncompress.c
View File

@ -49,7 +49,7 @@ int uncompress_main(int argc, char **argv)
extension = strrchr(uncompressed_file, '.');
if (!extension || (strcmp(extension, ".Z") != 0)) {
bb_error_msg_and_die("Invalid extension");
bb_error_msg_and_die("invalid extension");
}
*extension = '\0';
@ -65,7 +65,7 @@ int uncompress_main(int argc, char **argv)
/* do the decompression, and cleanup */
if ((xread_char(src_fd) != 0x1f) || (xread_char(src_fd) != 0x9d)) {
bb_error_msg_and_die("Invalid magic");
bb_error_msg_and_die("invalid magic");
}
status = uncompress(src_fd, dst_fd);

2
console-tools/loadkmap.c
View File

@ -40,7 +40,7 @@ int loadkmap_main(int argc, char **argv)
xread(0, buff, 7);
if (strncmp(buff, BINARY_KEYMAP_MAGIC, 7))
bb_error_msg_and_die("This is not a valid binary keymap.");
bb_error_msg_and_die("this is not a valid binary keymap");
xread(0, flags, MAX_NR_KEYMAPS);

2
coreutils/chown.c
View File

@ -30,7 +30,7 @@ static int fileAction(const char *fileName, struct stat *statbuf,
(gid == (gid_t)-1) ? statbuf->st_gid : gid)) {
return TRUE;
}
bb_perror_msg("%s", fileName); /* A filename could have % in it... */
bb_perror_msg("%s", fileName); /* A filename can have % in it... */
return FALSE;
}

2
coreutils/expr.c
View File

@ -250,7 +250,7 @@ of a basic regular expression is not portable; it is being ignored", pv->u.s);
memset(&re_buffer, 0, sizeof(re_buffer));
memset(re_regs, 0, sizeof(*re_regs));
if (regcomp(&re_buffer, pv->u.s, 0) != 0)
bb_error_msg_and_die("Invalid regular expression");
bb_error_msg_and_die("invalid regular expression");
/* expr uses an anchored pattern match, so check that there was a
* match and that the match starts at offset 0. */

4
coreutils/install.c
View File

@ -61,7 +61,7 @@ int install_main(int argc, char **argv)
umask(0);
/* Create directories
* dont use bb_make_directory() as it cant change uid or gid
* don't use bb_make_directory() as it can't change uid or gid
* perhaps bb_make_directory() should be improved.
*/
if (flags & INSTALL_OPT_DIRECTORY) {
@ -77,7 +77,7 @@ int install_main(int argc, char **argv)
}
if (mkdir(*argv, mode) == -1) {
if (errno != EEXIST) {
bb_perror_msg("coulnt create %s", *argv);
bb_perror_msg("cannot create %s", *argv);
ret = EXIT_FAILURE;
break;
}

2
coreutils/nohup.c
View File

@ -42,7 +42,7 @@ int nohup_main(int argc, char **argv)
* Else redirect to /dev/null.
*/
temp = isatty(STDERR_FILENO);
if (temp) bb_error_msg("Appending to %s", nohupout);
if (temp) bb_error_msg("appending to %s", nohupout);
dup2(temp ? STDOUT_FILENO : nullfd, STDERR_FILENO);
close(nullfd);
signal (SIGHUP, SIG_IGN);

2
e2fsprogs/blkid/devno.c
View File

@ -170,7 +170,7 @@ char *blkid_devno_to_devname(dev_t devno)
if (!devname) {
DBG(DEBUG_DEVNO,
printf("blkid: couldn't find devno 0x%04lx\n",
printf("blkid: cannot find devno 0x%04lx\n",
(unsigned long) devno));
} else {
DBG(DEBUG_DEVNO,

2
e2fsprogs/blkid/tag.c
View File

@ -408,7 +408,7 @@ int main(int argc, char **argv)
dev = blkid_get_dev(cache, devname, flags);
if (!dev) {
fprintf(stderr, "%s: Can not find device in blkid cache\n");
fprintf(stderr, "%s: cannot find device in blkid cache\n");
exit(1);
}
if (search_type) {

4
e2fsprogs/mke2fs.c
View File

@ -247,7 +247,7 @@ static void test_disk(ext2_filsys fs, badblocks_list *bb_list)
mke2fs_verbose("Running command: %s\n", buf);
f = popen(buf, "r");
if (!f) {
bb_perror_msg_and_die("Could not run '%s'", buf);
bb_perror_msg_and_die("cannot run '%s'", buf);
}
retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block);
pclose(f);
@ -1332,7 +1332,7 @@ int mke2fs_main (int argc, char *argv[])
retval = zero_blocks(fs, start, blocks - start,
NULL, &ret_blk, NULL);
mke2fs_warning_msg(retval, "could not zero block %u at end of filesystem", ret_blk);
mke2fs_warning_msg(retval, "cannot zero block %u at end of filesystem", ret_blk);
write_inode_tables(fs);
create_root_dir(fs);
create_lost_and_found(fs);

2
e2fsprogs/tune2fs.c
View File

@ -615,7 +615,7 @@ int tune2fs_main(int argc, char **argv)
}
retval = ext2fs_check_if_mounted(device_name, &mount_flags);
if (retval)
bb_error_msg_and_die("Could not determine if %s is mounted", device_name);
bb_error_msg_and_die("cannot determine if %s is mounted", device_name);
/* Normally we only need to write out the superblock */
fs->flags |= EXT2_FLAG_SUPER_ONLY;

6
e2fsprogs/util.c
View File

@ -82,7 +82,7 @@ void check_mount(const char *device, int force, const char *type)
retval = ext2fs_check_if_mounted(device, &mount_flags);
if (retval) {
bb_error_msg("Could not determine if %s is mounted", device);
bb_error_msg("cannot determine if %s is mounted", device);
return;
}
if (mount_flags & EXT2_MF_MOUNTED) {
@ -219,7 +219,7 @@ void make_journal_device(char *journal_device, ext2_filsys fs, int quiet, int fo
EXT2_FLAG_JOURNAL_DEV_OK, 0,
fs->blocksize, io_ptr, &jfs);
if (retval)
bb_error_msg_and_die("Could not journal device %s", journal_device);
bb_error_msg_and_die("cannot journal device %s", journal_device);
if(!quiet)
printf("Adding journal to device %s: ", journal_device);
fflush(stdout);
@ -248,7 +248,7 @@ void make_journal_blocks(ext2_filsys fs, int journal_size, int journal_flags, in
retval = ext2fs_add_journal_inode(fs, journal_blocks,
journal_flags);
if(retval)
bb_error_msg_and_die("Could not create journal");
bb_error_msg_and_die("cannot create journal");
if(!quiet)
puts("done");
}

2
editors/awk.c
View File

@ -2716,7 +2716,7 @@ keep_going:
free(s);
}
if (opt & 0x8) // -W
bb_error_msg("Warning: unrecognized option '-W %s' ignored", opt_W);
bb_error_msg("warning: unrecognized option '-W %s' ignored", opt_W);
if (!from_file) {
if (argc == optind)

8
editors/patch.c
View File

@ -37,7 +37,7 @@ static unsigned int copy_lines(FILE *src_stream, FILE *dest_stream, const unsign
break;
}
if (fputs(line, dest_stream) == EOF) {
bb_perror_msg_and_die("Error writing to new file");
bb_perror_msg_and_die("error writing to new file");
}
free(line);
@ -125,7 +125,7 @@ int patch_main(int argc, char **argv)
patch_line = xmalloc_fgets(patch_file);
if (strncmp(patch_line, "+++ ", 4) != 0) {
ret = 2;
bb_error_msg("Invalid patch");
bb_error_msg("invalid patch");
continue;
}
new_filename = extract_filename(patch_line, patch_level);
@ -189,7 +189,7 @@ int patch_main(int argc, char **argv)
/* src_beg_line will be 0 if its a new file */
count = src_beg_line - src_cur_line;
if (copy_lines(src_stream, dst_stream, count) != count) {
bb_error_msg_and_die("Bad src file");
bb_error_msg_and_die("bad src file");
}
src_cur_line += count;
dest_cur_line += count;
@ -209,7 +209,7 @@ int patch_main(int argc, char **argv)
src_cur_line++;
}
if (strcmp(src_line, patch_line + 1) != 0) {
bb_error_msg("Hunk #%d FAILED at %d.", hunk_count, hunk_offset_start);
bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start);
hunk_error++;
free(patch_line);
break;

2
init/halt.c
View File

@ -48,6 +48,6 @@ RB_AUTOBOOT
if (rc) rc = kill(1,signals[which]);
} else rc = reboot(magic[which]);
if (rc) bb_error_msg("No.");
if (rc) bb_error_msg("no");
return rc;
}

4
init/init.c
View File

@ -211,7 +211,7 @@ static void message(int device, const char *fmt, ...)
if (log_fd < 0) {
if ((log_fd = device_open(log_console, O_RDWR | O_NONBLOCK | O_NOCTTY)) < 0) {
log_fd = -2;
bb_error_msg("Bummer, can't write to log on %s!", log_console);
bb_error_msg("bummer, can't write to log on %s!", log_console);
device = CONSOLE;
} else {
fcntl(log_fd, F_SETFD, FD_CLOEXEC);
@ -232,7 +232,7 @@ static void message(int device, const char *fmt, ...)
#if ENABLE_DEBUG_INIT
/* all descriptors may be closed */
} else {
bb_error_msg("Bummer, can't print: ");
bb_error_msg("bummer, can't print: ");
va_start(arguments, fmt);
vfprintf(stderr, fmt, arguments);
va_end(arguments);

2
libbb/make_directory.c
View File

@ -99,6 +99,6 @@ int bb_make_directory (char *path, long mode, int flags)
} while (1);
bb_perror_msg ("Cannot %s directory `%s'", fail_msg, path);
bb_perror_msg ("cannot %s directory '%s'", fail_msg, path);
return -1;
}

2
libbb/xfuncs.c
View File

@ -265,7 +265,7 @@ void xsetgid(gid_t gid)
if (setgid(gid)) bb_error_msg_and_die("setgid");
}
// Die with an error message if we cant' set uid. (See xsetgid() for why.)
// Die with an error message if we can't set uid. (See xsetgid() for why.)
void xsetuid(uid_t uid)
{
if (setuid(uid)) bb_error_msg_and_die("setuid");

2
loginutils/adduser.c
View File

@ -81,7 +81,7 @@ static void passwd_wrapper(const char *login)
{
static const char prog[] = "passwd";
execlp(prog, prog, login, NULL);
bb_error_msg_and_die("Failed to execute '%s', you must set the password for '%s' manually", prog, login);
bb_error_msg_and_die("failed to execute '%s', you must set the password for '%s' manually", prog, login);
}
/* putpwent(3) remix */

2
loginutils/vlock.c
View File

@ -58,7 +58,7 @@ int vlock_main(int argc, char **argv)
o_lock_all = getopt32(argc, argv, "a");
if((pw = getpwuid(getuid())) == NULL) {
bb_error_msg_and_die("Unknown uid %d", getuid());
bb_error_msg_and_die("unknown uid %d", getuid());
}
vfd = xopen(CURRENT_TTY, O_RDWR);

6
miscutils/crond.c
View File

@ -314,7 +314,7 @@ static void startlogger(void)
if ((logfd = open(LogFile, O_WRONLY | O_CREAT | O_APPEND, 0600)) >= 0) {
close(logfd);
} else {
bb_perror_msg("Failed to open log file '%s' reason", LogFile);
bb_perror_msg("failed to open log file '%s': ", LogFile);
}
}
#endif
@ -883,7 +883,7 @@ ForkJob(const char *user, CronLine * line, int mailFd,
exit(0);
} else if (pid < 0) {
/* FORK FAILED */
crondlog("\024couldn't fork, user %s\n", user);
crondlog("\024cannot fork, user %s\n", user);
line->cl_Pid = 0;
if (mailf) {
remove(mailf);
@ -1008,7 +1008,7 @@ static void RunJob(const char *user, CronLine * line)
exit(0);
} else if (pid < 0) {
/* FORK FAILED */
crondlog("\024couldn't fork, user %s\n", user);
crondlog("\024cannot, user %s\n", user);
pid = 0;
}
line->cl_Pid = pid;

2
miscutils/hdparm.c
View File

@ -595,7 +595,7 @@ static void identify(uint16_t *id_supplied)
}
else
/*"Unknown device type:\n\tbits 15&14 of general configuration word 0 both set to 1.\n"*/
bb_error_msg_and_die("Unknown device type");
bb_error_msg_and_die("unknown device type");
printf("%sremovable media\n", !(val[GEN_CONFIG] & MEDIA_REMOVABLE) ? "non-" : "");
/* Info from the specific configuration word says whether or not the

2
miscutils/less.c
View File

@ -1113,7 +1113,7 @@ int less_main(int argc, char **argv) {
if (ttyname(STDIN_FILENO) == NULL)
inp_stdin = 1;
else {
bb_error_msg("Missing filename");
bb_error_msg("missing filename");
bb_show_usage();
}
}

2
miscutils/makedevs.c
View File

@ -53,7 +53,7 @@ int makedevs_main(int argc, char **argv)
/* if mode != S_IFCHR and != S_IFBLK third param in mknod() ignored */
if (mknod(nodname, mode, makedev(Smajor, Sminor)))
bb_error_msg("Failed to create: %s", nodname);
bb_error_msg("failed to create: %s", nodname);
if (nodname == basedev) /* ex. /dev/hda - to /dev/hda1 ... */
nodname = buf;

4
modutils/insmod.c
View File

@ -4113,7 +4113,7 @@ int insmod_main( int argc, char **argv)
if (strncmp(uts_info.release, m_strversion, STRVERSIONLEN) != 0) {
if (flag_force_load) {
bb_error_msg("Warning: kernel-module version mismatch\n"
bb_error_msg("warning: kernel-module version mismatch\n"
"\t%s was compiled for kernel version %s\n"
"\twhile this kernel is version %s",
m_filename, m_strversion, uts_info.release);
@ -4134,7 +4134,7 @@ int insmod_main( int argc, char **argv)
goto out;
k_crcs = new_is_kernel_checksummed();
} else {
bb_error_msg("Not configured to support old kernels");
bb_error_msg("not configured to support old kernels");
goto out;
}

4
modutils/modprobe.c
View File

@ -758,7 +758,7 @@ static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t *
}
}
else {
bb_error_msg ("Bad alias %s", dt-> m_name);
bb_error_msg ("bad alias %s", dt-> m_name);
return;
}
}
@ -897,7 +897,7 @@ int modprobe_main(int argc, char** argv)
} while ( ++optind < argc );
} else {
if (optind >= argc)
bb_error_msg_and_die ( "No module or pattern provided" );
bb_error_msg_and_die ( "no module or pattern provided" );
if ( mod_insert ( argv [optind], argc - optind - 1, argv + optind + 1 ))
bb_error_msg_and_die ( "failed to load module %s", argv [optind] );

2
networking/arping.c
View File

@ -392,7 +392,7 @@ int arping_main(int argc, char **argv)
}
}
if (me.sll_halen == 0) {
bb_error_msg("Interface \"%s\" is not ARPable (no ll address)", device);
bb_error_msg("interface \"%s\" is not ARPable (no ll address)", device);
exit(cfg&dad ? 0 : 2);
}
he = me;

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("unable to read the Wake-On-LAN pass");
return 0;
}

2
networking/httpd.c
View File

@ -1317,7 +1317,7 @@ static int sendFile(const char *url)
close(f);
} else {
#if DEBUG
bb_perror_msg("Unable to open '%s'", url);
bb_perror_msg("unable to open '%s'", url);
#endif
sendHeaders(HTTP_NOT_FOUND);
}

4
networking/interface.c
View File

@ -325,7 +325,7 @@ static int sockets_open(int family)
sfd = af->fd;
}
if (sfd < 0) {
bb_error_msg("No usable address families found.");
bb_error_msg("no usable address families found");
}
return sfd;
}
@ -557,7 +557,7 @@ static int if_readlist_proc(char *target)
fh = fopen(_PATH_PROCNET_DEV, "r");
if (!fh) {
bb_perror_msg("Warning: cannot open %s. Limited output.", _PATH_PROCNET_DEV);
bb_perror_msg("warning: cannot open %s, limiting output", _PATH_PROCNET_DEV);
return if_readconf();
}
fgets(buf, sizeof buf, fh); /* eat line */

6
networking/libiproute/iplink.c
View File

@ -31,7 +31,7 @@
static int on_off(char *msg)
{
bb_error_msg("Error: argument of \"%s\" must be \"on\" or \"off\"", msg);
bb_error_msg("error: argument of \"%s\" must be \"on\" or \"off\"", msg);
return -1;
}
@ -200,7 +200,7 @@ static int parse_address(char *dev, int hatype, int halen, char *lla, struct ifr
if (alen < 0)
return -1;
if (alen != halen) {
bb_error_msg("Wrong address (%s) length: expected %d bytes", lla, halen);
bb_error_msg("wrong address (%s) length: expected %d bytes", lla, halen);
return -1;
}
return 0;
@ -349,6 +349,6 @@ int do_iplink(int argc, char **argv)
} else
return ipaddr_list_link(0, NULL);
bb_error_msg("Command \"%s\" is unknown.", *argv);
bb_error_msg("command \"%s\" is unknown", *argv);
exit(-1);
}

14
networking/libiproute/utils.c
View File

@ -206,10 +206,10 @@ int get_prefix_1(inet_prefix * dst, char *arg, int family)
int get_addr(inet_prefix * dst, char *arg, int family)
{
if (family == AF_PACKET) {
bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context.", arg);
bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context", arg);
}
if (get_addr_1(dst, arg, family)) {
bb_error_msg_and_die("an inet address is expected rather than \"%s\".", arg);
bb_error_msg_and_die("an inet address is expected rather than \"%s\"", arg);
}
return 0;
}
@ -217,10 +217,10 @@ int get_addr(inet_prefix * dst, char *arg, int family)
int get_prefix(inet_prefix * dst, char *arg, int family)
{
if (family == AF_PACKET) {
bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context.", arg);
bb_error_msg_and_die("\"%s\" may be inet address, but it is not allowed in this context", arg);
}
if (get_prefix_1(dst, arg, family)) {
bb_error_msg_and_die("an inet address is expected rather than \"%s\".", arg);
bb_error_msg_and_die("an inet address is expected rather than \"%s\"", arg);
}
return 0;
}
@ -237,7 +237,7 @@ __u32 get_addr32(char *name)
void incomplete_command(void)
{
bb_error_msg("Command line is not complete. Try option \"help\"");
bb_error_msg("command line is not complete, try option \"help\"");
exit(-1);
}
@ -249,13 +249,13 @@ void invarg(const char * const arg, const char * const opt)
void duparg(char *key, char *arg)
{
bb_error_msg("duplicate \"%s\": \"%s\" is the second value.", key, arg);
bb_error_msg("duplicate \"%s\": \"%s\" is the second value", key, arg);
exit(-1);
}
void duparg2(char *key, char *arg)
{
bb_error_msg("either \"%s\" is duplicate, or \"%s\" is a garbage.", key, arg);
bb_error_msg("either \"%s\" is duplicate, or \"%s\" is a garbage", key, arg);
exit(-1);
}

2
networking/ping.c
View File

@ -317,7 +317,7 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
printf("\n");
} else
if (icmppkt->icmp_type != ICMP_ECHO)
bb_error_msg("Warning: Got ICMP %d (%s)",
bb_error_msg("warning: got ICMP %d (%s)",
icmppkt->icmp_type, icmp_type_name(icmppkt->icmp_type));
fflush(stdout);
}

2
networking/ping6.c
View File

@ -308,7 +308,7 @@ static void unpack(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit
printf("\n");
} else
if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST)
bb_error_msg("Warning: Got ICMP %d (%s)",
bb_error_msg("warning: got ICMP %d (%s)",
icmppkt->icmp6_type, icmp6_type_name(icmppkt->icmp6_type));
}

2
networking/udhcp/arpping.c
View File

@ -81,7 +81,7 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface)
FD_SET(s, &fdset);
tm.tv_sec = timeout;
if (select(s + 1, &fdset, (fd_set *) NULL, (fd_set *) NULL, &tm) < 0) {
bb_perror_msg("Error on ARPING request");
bb_perror_msg("error on ARPING request");
if (errno != EINTR) rv = 0;
} else if (FD_ISSET(s, &fdset)) {
if (recv(s, &arp, sizeof(arp), 0) < 0 ) rv = 0;

4
networking/udhcp/clientpacket.c
View File

@ -216,14 +216,14 @@ int get_raw_packet(struct dhcpMessage *payload, int fd)
packet.ip.daddr = dest;
packet.ip.tot_len = packet.udp.len; /* cheat on the psuedo-header */
if (check && check != udhcp_checksum(&packet, bytes)) {
bb_error_msg("Packet with bad UDP checksum received, ignoring");
bb_error_msg("packet with bad UDP checksum received, ignoring");
return -2;
}
memcpy(payload, &(packet.data), bytes - (sizeof(packet.ip) + sizeof(packet.udp)));
if (ntohl(payload->cookie) != DHCP_MAGIC) {
bb_error_msg("Received bogus message (bad magic) - ignoring");
bb_error_msg("received bogus message (bad magic) - ignoring");
return -2;
}
DEBUG("oooooh!!! got some!");

2
networking/udhcp/common.c
View File

@ -53,7 +53,7 @@ static inline void sanitize_fds(void)
void udhcp_background(const char *pidfile)
{
#ifdef __uClinux__
bb_error_msg("Cannot background in uclinux (yet)");
bb_error_msg("cannot background in uclinux (yet)");
#else /* __uClinux__ */
int pid_fd;

10
networking/udhcp/files.c
View File

@ -284,7 +284,7 @@ int read_config(const char *file)
keywords[i].handler(keywords[i].def, keywords[i].var);
if (!(in = fopen(file, "r"))) {
bb_error_msg("Unable to open config file: %s", file);
bb_error_msg("unable to open config file: %s", file);
return 0;
}
@ -308,7 +308,7 @@ int read_config(const char *file)
for (i = 0; keywords[i].keyword[0]; i++)
if (!strcasecmp(token, keywords[i].keyword))
if (!keywords[i].handler(line, keywords[i].var)) {
bb_error_msg("Failure parsing line %d of %s", lm, file);
bb_error_msg("failure parsing line %d of %s", lm, file);
if (ENABLE_FEATURE_UDHCP_DEBUG)
bb_error_msg("unable to parse '%s'", debug_orig);
/* reset back to the default value */
@ -329,7 +329,7 @@ void write_leases(void)
unsigned long tmp_time;
if (!(fp = fopen(server_config.lease_file, "w"))) {
bb_error_msg("Unable to open %s for writing", server_config.lease_file);
bb_error_msg("unable to open %s for writing", server_config.lease_file);
return;
}
@ -367,7 +367,7 @@ void read_leases(const char *file)
struct dhcpOfferedAddr lease;
if (!(fp = fopen(file, "r"))) {
bb_error_msg("Unable to open %s for reading", file);
bb_error_msg("unable to open %s for reading", file);
return;
}
@ -377,7 +377,7 @@ void read_leases(const char *file)
lease.expires = ntohl(lease.expires);
if (!server_config.remaining) lease.expires -= time(0);
if (!(add_lease(lease.chaddr, lease.yiaddr, lease.expires))) {
bb_error_msg("Too many leases while loading %s", file);
bb_error_msg("too many leases while loading %s", file);
break;
}
i++;

8
networking/udhcp/options.c
View File

@ -76,12 +76,12 @@ uint8_t *get_option(struct dhcpMessage *packet, int code)
length = 308;
while (!done) {
if (i >= length) {
bb_error_msg("Bogus packet, option fields too long");
bb_error_msg("bogus packet, option fields too long");
return NULL;
}
if (optionptr[i + OPT_CODE] == code) {
if (i + 1 + optionptr[i + OPT_LEN] >= length) {
bb_error_msg("Bogus packet, option fields too long");
bb_error_msg("bogus packet, option fields too long");
return NULL;
}
return optionptr + i + 2;
@ -92,7 +92,7 @@ uint8_t *get_option(struct dhcpMessage *packet, int code)
break;
case DHCP_OPTION_OVER:
if (i + 1 + optionptr[i + OPT_LEN] >= length) {
bb_error_msg("Bogus packet, option fields too long");
bb_error_msg("bogus packet, option fields too long");
return NULL;
}
over = optionptr[i + 3];
@ -140,7 +140,7 @@ int add_option_string(uint8_t *optionptr, uint8_t *string)
/* end position + string length + option code/length + end option */
if (end + string[OPT_LEN] + 2 + 1 >= 308) {
bb_error_msg("Option 0x%02x did not fit into the packet",
bb_error_msg("option 0x%02x did not fit into the packet",
string[OPT_CODE]);
return 0;
}

4
networking/udhcp/packet.c
View File

@ -58,12 +58,12 @@ int udhcp_get_packet(struct dhcpMessage *packet, int fd)
memset(packet, 0, sizeof(struct dhcpMessage));
bytes = read(fd, packet, sizeof(struct dhcpMessage));
if (bytes < 0) {
DEBUG("couldn't read on listening socket, ignoring");
DEBUG("cannot read on listening socket, ignoring");
return -1;
}
if (ntohl(packet->cookie) != DHCP_MAGIC) {
bb_error_msg("Received bogus message, ignoring");
bb_error_msg("received bogus message, ignoring");
return -2;
}
DEBUG("Received a packet");

9
networking/udhcp/pidfile.c
View File

@ -45,7 +45,7 @@ int pidfile_acquire(const char *pidfile)
pid_fd = open(pidfile, O_CREAT | O_WRONLY, 0644);
if (pid_fd < 0) {
bb_perror_msg("Unable to open pidfile %s", pidfile);
bb_perror_msg("unable to open pidfile %s", pidfile);
} else {
lockf(pid_fd, F_LOCK, 0);
if (!saved_pidfile)
@ -63,14 +63,11 @@ void pidfile_write_release(int pid_fd)
if (pid_fd < 0) return;
if ((out = fdopen(pid_fd, "w")) != NULL) {
out = fdopen(pid_fd, "w");
if (out) {
fprintf(out, "%d\n", getpid());
fclose(out);
}
lockf(pid_fd, F_UNLCK, 0);
close(pid_fd);
}

4
networking/udhcp/serverpacket.c
View File

@ -158,12 +158,12 @@ int sendOffer(struct dhcpMessage *oldpacket)
}
if(!packet.yiaddr) {
bb_error_msg("No IP addresses to give - OFFER abandoned");
bb_error_msg("no IP addresses to give - OFFER abandoned");
return -1;
}
if (!add_lease(packet.chaddr, packet.yiaddr, server_config.offer_time)) {
bb_error_msg("Lease pool is full - OFFER abandoned");
bb_error_msg("lease pool is full - OFFER abandoned");
return -1;
}

2
util-linux/fdisk.c
View File

@ -1371,7 +1371,7 @@ get_boot(enum action what)
#endif
break;
default:
bb_error_msg_and_die(_("Internal error"));
bb_error_msg_and_die(_("internal error"));
}
#endif /* CONFIG_FEATURE_FDISK_WRITABLE */
}

4
util-linux/switch_root.c
View File

@ -111,12 +111,12 @@ int switch_root_main(int argc, char *argv[])
if (console) {
close(0);
if(open(console, O_RDWR) < 0)
bb_error_msg_and_die("Bad console '%s'",console);
bb_error_msg_and_die("bad console '%s'",console);
dup2(0, 1);
dup2(0, 2);
}
// Exec real init. (This is why we must be pid 1.)
execv(argv[optind],argv+optind);
bb_error_msg_and_die("Bad init '%s'",argv[optind]);
bb_error_msg_and_die("bad init '%s'",argv[optind]);
}