emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whitespace fixes. no code changes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-01-14 01:34:48 +01:00
parent 5218515508
commit 6967578728
40 changed files with 261 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archival/dpkg.c
View File

@ -1026,8 +1026,8 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
if (package_edge->type == EDGE_CONFLICTS) { if (package_edge->type == EDGE_CONFLICTS) {
const unsigned package_num = const unsigned package_num =
search_package_hashtable(package_edge->name, search_package_hashtable(package_edge->name,
package_edge->version, package_edge->version,
package_edge->operator); package_edge->operator);
int result = 0; int result = 0;
if (package_hashtable[package_num] != NULL) { if (package_hashtable[package_num] != NULL) {
status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]); status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]);
@ -1114,7 +1114,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
*/ */
if (root_of_alternatives && package_edge->type != root_of_alternatives->type - 1) if (root_of_alternatives && package_edge->type != root_of_alternatives->type - 1)
bb_error_msg_and_die("fatal error, package dependencies corrupt: %d != %d - 1", bb_error_msg_and_die("fatal error, package dependencies corrupt: %d != %d - 1",
package_edge->type, root_of_alternatives->type); package_edge->type, root_of_alternatives->type);
if (package_hashtable[package_num] != NULL) if (package_hashtable[package_num] != NULL)
result = !package_satisfies_dependency(package_num, package_edge->type); result = !package_satisfies_dependency(package_num, package_edge->type);

16
archival/gzip.c
View File

@ -1179,7 +1179,7 @@ static void gen_codes(ct_data * tree, int max_code)
* must be all ones. * must be all ones.
*/ */
Assert(code + G2.bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1, Assert(code + G2.bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
"inconsistent bit counts"); "inconsistent bit counts");
Tracev((stderr, "\ngen_codes: max_code %d ", max_code)); Tracev((stderr, "\ngen_codes: max_code %d ", max_code));
for (n = 0; n <= max_code; n++) { for (n = 0; n <= max_code; n++) {
@ -1527,9 +1527,9 @@ static int ct_tally(int dist, int lc)
} }
out_length >>= 3; out_length >>= 3;
Trace((stderr, Trace((stderr,
"\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ", "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ",
G2.last_lit, G2.last_dist, in_length, out_length, G2.last_lit, G2.last_dist, in_length, out_length,
100L - out_length * 100L / in_length)); 100L - out_length * 100L / in_length));
if (G2.last_dist < G2.last_lit / 2 && out_length < in_length / 2) if (G2.last_dist < G2.last_lit / 2 && out_length < in_length / 2)
return 1; return 1;
} }
@ -1621,9 +1621,9 @@ static ulg flush_block(char *buf, ulg stored_len, int eof)
static_lenb = (G2.static_len + 3 + 7) >> 3; static_lenb = (G2.static_len + 3 + 7) >> 3;
Trace((stderr, Trace((stderr,
"\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ", "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ",
opt_lenb, G2.opt_len, static_lenb, G2.static_len, stored_len, opt_lenb, G2.opt_len, static_lenb, G2.static_len, stored_len,
G2.last_lit, G2.last_dist)); G2.last_lit, G2.last_dist));
if (static_lenb <= opt_lenb) if (static_lenb <= opt_lenb)
opt_lenb = static_lenb; opt_lenb = static_lenb;
@ -1661,7 +1661,7 @@ static ulg flush_block(char *buf, ulg stored_len, int eof)
} else { } else {
send_bits((DYN_TREES << 1) + eof, 3); send_bits((DYN_TREES << 1) + eof, 3);
send_all_trees(G2.l_desc.max_code + 1, G2.d_desc.max_code + 1, send_all_trees(G2.l_desc.max_code + 1, G2.d_desc.max_code + 1,
max_blindex + 1); max_blindex + 1);
compress_block((ct_data *) G2.dyn_ltree, (ct_data *) G2.dyn_dtree); compress_block((ct_data *) G2.dyn_ltree, (ct_data *) G2.dyn_dtree);
G2.compressed_len += 3 + G2.opt_len; G2.compressed_len += 3 + G2.opt_len;
} }

2
archival/lzop.c
View File

@ -350,7 +350,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
// LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b); // LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b);
*out_len = pd(op, out); *out_len = pd(op, out);
return (ip == ip_end ? LZO_E_OK : return (ip == ip_end ? LZO_E_OK :
(ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
} }
/**********************************************************************/ /**********************************************************************/

14
archival/tar.c
View File

@ -333,13 +333,13 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
&& (filesize <= 0x3fffffffffffffffffffffffLL) && (filesize <= 0x3fffffffffffffffffffffffLL)
#endif #endif
) { ) {
/* GNU tar uses "base-256 encoding" for very large numbers. /* GNU tar uses "base-256 encoding" for very large numbers.
* Encoding is binary, with highest bit always set as a marker * Encoding is binary, with highest bit always set as a marker
* and sign in next-highest bit: * and sign in next-highest bit:
* 80 00 .. 00 - zero * 80 00 .. 00 - zero
* bf ff .. ff - largest positive number * bf ff .. ff - largest positive number
* ff ff .. ff - minus 1 * ff ff .. ff - minus 1
* c0 00 .. 00 - smallest negative number * c0 00 .. 00 - smallest negative number
*/ */
char *p8 = header.size + sizeof(header.size); char *p8 = header.size + sizeof(header.size);
do { do {

7
console-tools/setlogcons.c
View File

@ -22,9 +22,10 @@ int setlogcons_main(int argc UNUSED_PARAM, char **argv)
struct { struct {
char fn; char fn;
char subarg; char subarg;
} arg = { 11, /* redirect kernel messages */ } arg = {
0 /* to specified console (current as default) */ 11, /* redirect kernel messages */
}; 0 /* to specified console (current as default) */
};
if (argv[1]) if (argv[1])
arg.subarg = xatou_range(argv[1], 0, 63); arg.subarg = xatou_range(argv[1], 0, 63);

4
coreutils/cal.c
View File

@ -167,8 +167,8 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
day_array(month, year, dp); day_array(month, year, dp);
len = sprintf(lineout, "%s %d", month_names[month - 1], year); len = sprintf(lineout, "%s %d", month_names[month - 1], year);
printf("%*s%s\n%s\n", printf("%*s%s\n%s\n",
((7*julian + WEEK_LEN) - len) / 2, "", ((7*julian + WEEK_LEN) - len) / 2, "",
lineout, day_headings); lineout, day_headings);
for (row = 0; row < 6; row++) { for (row = 0; row < 6; row++) {
build_row(lineout, dp)[0] = '\0'; build_row(lineout, dp)[0] = '\0';
dp += 7; dp += 7;

2
coreutils/cut.c
View File

@ -212,7 +212,7 @@ int cut_main(int argc UNUSED_PARAM, char **argv)
if (opt & CUT_OPT_SUPPRESS_FLGS) { if (opt & CUT_OPT_SUPPRESS_FLGS) {
bb_error_msg_and_die bb_error_msg_and_die
("suppressing non-delimited lines makes sense%s", ("suppressing non-delimited lines makes sense%s",
_op_on_field); _op_on_field);
} }
if (delim != '\t') { if (delim != '\t') {
bb_error_msg_and_die bb_error_msg_and_die

4
coreutils/df.c
View File

@ -112,7 +112,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
/* From the manpage of df from coreutils-6.10: /* From the manpage of df from coreutils-6.10:
Disk space is shown in 1K blocks by default, unless the environment Disk space is shown in 1K blocks by default, unless the environment
variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used. variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
*/ */
if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */ if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */
df_disp_hr = 512; df_disp_hr = 512;
@ -221,7 +221,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
} }
#else #else
if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX)) if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX))
printf("\n%-20s", ""); printf("\n%-20s", "");
#endif #endif
#if ENABLE_FEATURE_HUMAN_READABLE #if ENABLE_FEATURE_HUMAN_READABLE

2
coreutils/id.c
View File

@ -174,7 +174,7 @@ int id_main(int argc UNUSED_PARAM, char **argv)
/* Don't allow -n -r -nr -ug -rug -nug -rnug -uZ -gZ -GZ*/ /* Don't allow -n -r -nr -ug -rug -nug -rnug -uZ -gZ -GZ*/
/* Don't allow more than one username */ /* Don't allow more than one username */
opt_complementary = "?1:u--g:g--u:G--u:u--G:g--G:G--g:r?ugG:n?ugG" opt_complementary = "?1:u--g:g--u:G--u:u--G:g--G:G--g:r?ugG:n?ugG"
IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G"); IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G");
opt = getopt32(argv, "rnugG" IF_SELINUX("Z")); opt = getopt32(argv, "rnugG" IF_SELINUX("Z"));
} }

4
coreutils/ls.c
View File

@ -260,7 +260,7 @@ enum {
/* TODO: simple toggles may be stored as OPT_xxx bits instead */ /* TODO: simple toggles may be stored as OPT_xxx bits instead */
static const uint32_t opt_flags[] = { static const uint32_t opt_flags[] = {
STYLE_COLUMNAR, /* C */ STYLE_COLUMNAR, /* C */
DISP_HIDDEN | DISP_DOT, /* a */ DISP_HIDDEN | DISP_DOT, /* a */
DISP_NOLIST, /* d */ DISP_NOLIST, /* d */
LIST_INO, /* i */ LIST_INO, /* i */
@ -720,7 +720,7 @@ static struct dnode *my_stat(const char *fullname, const char *name, int force_f
if ((option_mask32 & OPT_L) || force_follow) { if ((option_mask32 & OPT_L) || force_follow) {
#if ENABLE_SELINUX #if ENABLE_SELINUX
if (is_selinux_enabled()) { if (is_selinux_enabled()) {
getfilecon(fullname, &cur->sid); getfilecon(fullname, &cur->sid);
} }
#endif #endif
if (stat(fullname, &statbuf)) { if (stat(fullname, &statbuf)) {

2
coreutils/md5_sha1_sum.c
View File

@ -223,7 +223,7 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
} }
if (count_failed && !(flags & FLAG_SILENT)) { if (count_failed && !(flags & FLAG_SILENT)) {
bb_error_msg("WARNING: %d of %d computed checksums did NOT match", bb_error_msg("WARNING: %d of %d computed checksums did NOT match",
count_failed, count_total); count_failed, count_total);
} }
fclose_if_not_stdin(pre_computed_stream); fclose_if_not_stdin(pre_computed_stream);
} else { } else {

4
e2fsprogs/fsck.c
View File

@ -478,7 +478,7 @@ static int wait_one(int flags)
instance_list = inst->next; instance_list = inst->next;
if (verbose > 1) if (verbose > 1)
printf("Finished with %s (exit status %d)\n", printf("Finished with %s (exit status %d)\n",
inst->device, status); inst->device, status);
num_running--; num_running--;
free_instance(inst); free_instance(inst);
@ -844,7 +844,7 @@ static int check_all(void)
if (verbose > 1) if (verbose > 1)
printf("--waiting-- (pass %d)\n", passno); printf("--waiting-- (pass %d)\n", passno);
status |= wait_many(pass_done ? FLAG_WAIT_ALL : status |= wait_many(pass_done ? FLAG_WAIT_ALL :
FLAG_WAIT_ATLEAST_ONE); FLAG_WAIT_ATLEAST_ONE);
if (pass_done) { if (pass_done) {
if (verbose > 1) if (verbose > 1)
puts("----------------------------------"); puts("----------------------------------");

4
findutils/find.c
View File

@ -878,8 +878,8 @@ static action*** parse_params(char **argv)
IF_FEATURE_FIND_EXEC( "-exec\0" ) IF_FEATURE_FIND_EXEC( "-exec\0" )
IF_FEATURE_FIND_PAREN( "(\0" ) IF_FEATURE_FIND_PAREN( "(\0" )
/* All options/actions starting from here require argument */ /* All options/actions starting from here require argument */
"-name\0" "-name\0"
"-iname\0" "-iname\0"
IF_FEATURE_FIND_PATH( "-path\0" ) IF_FEATURE_FIND_PATH( "-path\0" )
#if ENABLE_DESKTOP #if ENABLE_DESKTOP
IF_FEATURE_FIND_PATH( "-wholename\0") IF_FEATURE_FIND_PATH( "-wholename\0")

2
miscutils/fbsplash.c
View File

@ -150,7 +150,7 @@ static void fb_open(const char *strfb_device)
// map the device in memory // map the device in memory
G.addr = mmap(NULL, G.addr = mmap(NULL,
G.scr_var.yres * G.scr_fix.line_length, G.scr_var.yres * G.scr_fix.line_length,
PROT_WRITE, MAP_SHARED, fbfd, 0); PROT_WRITE, MAP_SHARED, fbfd, 0);
if (G.addr == MAP_FAILED) if (G.addr == MAP_FAILED)
bb_perror_msg_and_die("mmap"); bb_perror_msg_and_die("mmap");

4
miscutils/last.c
View File

@ -71,7 +71,7 @@ int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
file = xopen(bb_path_wtmp_file, O_RDONLY); file = xopen(bb_path_wtmp_file, O_RDONLY);
printf("%-10s %-14s %-18s %-12.12s %s\n", printf("%-10s %-14s %-18s %-12.12s %s\n",
"USER", "TTY", "HOST", "LOGIN", "TIME"); "USER", "TTY", "HOST", "LOGIN", "TIME");
/* yikes. We reverse over the file and that is a not too elegant way */ /* yikes. We reverse over the file and that is a not too elegant way */
pos = xlseek(file, 0, SEEK_END); pos = xlseek(file, 0, SEEK_END);
pos = lseek(file, pos - sizeof(ut), SEEK_SET); pos = lseek(file, pos - sizeof(ut), SEEK_SET);
@ -131,7 +131,7 @@ int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
* but some systems have it wrong */ * but some systems have it wrong */
t_tmp = (time_t)ut.ut_tv.tv_sec; t_tmp = (time_t)ut.ut_tv.tv_sec;
printf("%-10s %-14s %-18s %-12.12s\n", printf("%-10s %-14s %-18s %-12.12s\n",
ut.ut_user, ut.ut_line, ut.ut_host, ctime(&t_tmp) + 4); ut.ut_user, ut.ut_line, ut.ut_host, ctime(&t_tmp) + 4);
next: next:
pos -= sizeof(ut); pos -= sizeof(ut);
if (pos <= 0) if (pos <= 0)

6
modutils/depmod.c
View File

@ -31,7 +31,7 @@ typedef struct module_info {
} module_info; } module_info;
static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM, static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM,
void *data, int depth UNUSED_PARAM) void *data, int depth UNUSED_PARAM)
{ {
char modname[MODULE_NAME_LEN]; char modname[MODULE_NAME_LEN];
module_info **first = (module_info **) data; module_info **first = (module_info **) data;
@ -95,7 +95,7 @@ static module_info *find_module(module_info *modules, const char *modname)
} }
static void order_dep_list(module_info *modules, module_info *start, static void order_dep_list(module_info *modules, module_info *start,
llist_t *add) llist_t *add)
{ {
module_info *m; module_info *m;
llist_t *n; llist_t *n;
@ -216,7 +216,7 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
} while (*++argv); } while (*++argv);
} else { } else {
recursive_action(".", ACTION_RECURSE, recursive_action(".", ACTION_RECURSE,
parse_module, NULL, &modules, 0); parse_module, NULL, &modules, 0);
} }
/* Generate dependency and alias files */ /* Generate dependency and alias files */

14
networking/arp.c
View File

@ -214,7 +214,7 @@ static int arp_del(char **args)
/* Get the hardware address to a specified interface name */ /* Get the hardware address to a specified interface name */
static void arp_getdevhw(char *ifname, struct sockaddr *sa, static void arp_getdevhw(char *ifname, struct sockaddr *sa,
const struct hwtype *hwt) const struct hwtype *hwt)
{ {
struct ifreq ifr; struct ifreq ifr;
const struct hwtype *xhw; const struct hwtype *xhw;
@ -233,8 +233,8 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa,
xhw = get_hwntype(-1); xhw = get_hwntype(-1);
} }
bb_error_msg("device '%s' has HW address %s '%s'", bb_error_msg("device '%s' has HW address %s '%s'",
ifname, xhw->name, ifname, xhw->name,
xhw->print((unsigned char *) &ifr.ifr_hwaddr.sa_data)); xhw->print((unsigned char *) &ifr.ifr_hwaddr.sa_data));
} }
} }
@ -345,7 +345,7 @@ static int arp_set(char **args)
/* Print the contents of an ARP request block. */ /* Print the contents of an ARP request block. */
static void static void
arp_disp(const char *name, char *ip, int type, int arp_flags, arp_disp(const char *name, char *ip, int type, int arp_flags,
char *hwa, char *mask, char *dev) char *hwa, char *mask, char *dev)
{ {
static const int arp_masks[] = { static const int arp_masks[] = {
ATF_PERM, ATF_PUBL, ATF_PERM, ATF_PUBL,
@ -428,7 +428,7 @@ static int arp_show(char *name)
/* All these strings can't overflow /* All these strings can't overflow
* because fgets above reads limited amount of data */ * because fgets above reads limited amount of data */
num = sscanf(line, "%s 0x%x 0x%x %s %s %s\n", num = sscanf(line, "%s 0x%x 0x%x %s %s %s\n",
ip, &type, &flags, hwa, mask, dev); ip, &type, &flags, hwa, mask, dev);
if (num < 4) if (num < 4)
break; break;
@ -461,7 +461,7 @@ static int arp_show(char *name)
} }
if (option_mask32 & ARP_OPT_v) if (option_mask32 & ARP_OPT_v)
printf("Entries: %d\tSkipped: %d\tFound: %d\n", printf("Entries: %d\tSkipped: %d\tFound: %d\n",
entries, entries - shown, shown); entries, entries - shown, shown);
if (!shown) { if (!shown) {
if (hw_set || host || device[0]) if (hw_set || host || device[0])
@ -517,7 +517,7 @@ int arp_main(int argc UNUSED_PARAM, char **argv)
if (hw->alen <= 0) { if (hw->alen <= 0) {
bb_error_msg_and_die("%s: %s without ARP support", bb_error_msg_and_die("%s: %s without ARP support",
hw->name, "hardware type"); hw->name, "hardware type");
} }
/* Now see what we have to do here... */ /* Now see what we have to do here... */

6
networking/ether-wake.c
View File

@ -238,9 +238,9 @@ int ether_wake_main(int argc UNUSED_PARAM, char **argv)
{ {
unsigned char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data; unsigned char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data;
printf("The hardware address (SIOCGIFHWADDR) of %s is type %d " printf("The hardware address (SIOCGIFHWADDR) of %s is type %d "
"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n\n", ifname, "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n\n", ifname,
if_hwaddr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1], if_hwaddr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1],
hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]); hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);
} }
# endif # endif
} }

6
networking/httpd.c
View File

@ -796,9 +796,9 @@ static void parse_conf(const char *path, int flag)
/* the line is not recognized */ /* the line is not recognized */
config_error: config_error:
bb_error_msg("config error '%s' in '%s'", buf, filename); bb_error_msg("config error '%s' in '%s'", buf, filename);
} /* while (fgets) */ } /* while (fgets) */
fclose(f); fclose(f);
} }
#if ENABLE_FEATURE_HTTPD_ENCODE_URL_STR #if ENABLE_FEATURE_HTTPD_ENCODE_URL_STR
@ -1708,7 +1708,7 @@ static int pam_talker(int num_msg,
case PAM_PROMPT_ECHO_OFF: case PAM_PROMPT_ECHO_OFF:
s = userinfo->pw; s = userinfo->pw;
break; break;
case PAM_ERROR_MSG: case PAM_ERROR_MSG:
case PAM_TEXT_INFO: case PAM_TEXT_INFO:
s = ""; s = "";
break; break;

2
networking/httpd_ssi.c
View File

@ -133,7 +133,7 @@ static void process_includes(const char *filename)
process_includes(include_directive); process_includes(include_directive);
/* Print everything after directive */ /* Print everything after directive */
if (end) { if (end) {
fputs(end, stdout); fputs(end, stdout);
free(end); free(end);
} }

2
networking/ifconfig.c
View File

@ -449,7 +449,7 @@ int ifconfig_main(int argc UNUSED_PARAM, char **argv)
} }
#endif #endif
memcpy( (((char *)&ifr) + a1op->ifr_offset), memcpy( (((char *)&ifr) + a1op->ifr_offset),
p, sizeof(struct sockaddr)); p, sizeof(struct sockaddr));
} else { } else {
/* FIXME: error check?? */ /* FIXME: error check?? */
unsigned long i = strtoul(*argv, NULL, 0); unsigned long i = strtoul(*argv, NULL, 0);

29
networking/interface.c
View File

@ -950,8 +950,8 @@ static void ife_print6(struct interface *ptr)
(struct sockaddr *) &sap.sin6_addr); (struct sockaddr *) &sap.sin6_addr);
sap.sin6_family = AF_INET6; sap.sin6_family = AF_INET6;
printf(" inet6 addr: %s/%d", printf(" inet6 addr: %s/%d",
INET6_sprint((struct sockaddr *) &sap, 1), INET6_sprint((struct sockaddr *) &sap, 1),
plen); plen);
printf(" Scope:"); printf(" Scope:");
switch (scope & IPV6_ADDR_SCOPE_MASK) { switch (scope & IPV6_ADDR_SCOPE_MASK) {
case 0: case 0:
@ -1019,7 +1019,7 @@ static void ife_print(struct interface *ptr)
if (ptr->has_ip) { if (ptr->has_ip) {
printf(" %s addr:%s ", ap->name, printf(" %s addr:%s ", ap->name,
ap->sprint(&ptr->addr, 1)); ap->sprint(&ptr->addr, 1));
if (ptr->flags & IFF_POINTOPOINT) { if (ptr->flags & IFF_POINTOPOINT) {
printf(" P-t-P:%s ", ap->sprint(&ptr->dstaddr, 1)); printf(" P-t-P:%s ", ap->sprint(&ptr->dstaddr, 1));
} }
@ -1102,17 +1102,17 @@ static void ife_print(struct interface *ptr)
printf(" "); printf(" ");
printf("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n", printf("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n",
ptr->stats.rx_packets, ptr->stats.rx_errors, ptr->stats.rx_packets, ptr->stats.rx_errors,
ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors, ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
ptr->stats.rx_frame_errors); ptr->stats.rx_frame_errors);
if (can_compress) if (can_compress)
printf(" compressed:%lu\n", printf(" compressed:%lu\n",
ptr->stats.rx_compressed); ptr->stats.rx_compressed);
printf(" "); printf(" ");
printf("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n", printf("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n",
ptr->stats.tx_packets, ptr->stats.tx_errors, ptr->stats.tx_packets, ptr->stats.tx_errors,
ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors, ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
ptr->stats.tx_carrier_errors); ptr->stats.tx_carrier_errors);
printf(" collisions:%lu ", ptr->stats.collisions); printf(" collisions:%lu ", ptr->stats.collisions);
if (can_compress) if (can_compress)
printf("compressed:%lu ", ptr->stats.tx_compressed); printf("compressed:%lu ", ptr->stats.tx_compressed);
@ -1129,13 +1129,12 @@ static void ife_print(struct interface *ptr)
printf(" "); printf(" ");
if (ptr->map.irq) if (ptr->map.irq)
printf("Interrupt:%d ", ptr->map.irq); printf("Interrupt:%d ", ptr->map.irq);
if (ptr->map.base_addr >= 0x100) /* Only print devices using it for if (ptr->map.base_addr >= 0x100) /* Only print devices using it for I/O maps */
I/O maps */
printf("Base address:0x%lx ", printf("Base address:0x%lx ",
(unsigned long) ptr->map.base_addr); (unsigned long) ptr->map.base_addr);
if (ptr->map.mem_start) { if (ptr->map.mem_start) {
printf("Memory:%lx-%lx ", ptr->map.mem_start, printf("Memory:%lx-%lx ", ptr->map.mem_start,
ptr->map.mem_end); ptr->map.mem_end);
} }
if (ptr->map.dma) if (ptr->map.dma)
printf("DMA chan:%x ", ptr->map.dma); printf("DMA chan:%x ", ptr->map.dma);
@ -1168,7 +1167,7 @@ static struct interface *lookup_interface(char *name)
#ifdef UNUSED #ifdef UNUSED
static int for_all_interfaces(int (*doit) (struct interface *, void *), static int for_all_interfaces(int (*doit) (struct interface *, void *),
void *cookie) void *cookie)
{ {
struct interface *ife; struct interface *ife;

2
networking/nc.c
View File

@ -120,7 +120,7 @@ int nc_main(int argc, char **argv)
/* getopt32 is _almost_ usable: /* getopt32 is _almost_ usable:
** it cannot handle "... -e PROG -prog-opt" */ ** it cannot handle "... -e PROG -prog-opt" */
while ((opt = getopt(argc, argv, while ((opt = getopt(argc, argv,
"" IF_NC_SERVER("lp:") IF_NC_EXTRA("w:i:f:e:") )) > 0 "" IF_NC_SERVER("lp:") IF_NC_EXTRA("w:i:f:e:") )) > 0
) { ) {
if (ENABLE_NC_SERVER && opt == 'l') if (ENABLE_NC_SERVER && opt == 'l')
IF_NC_SERVER(do_listen++); IF_NC_SERVER(do_listen++);

11
networking/ntpd.c
View File

@ -1854,7 +1854,7 @@ recv_and_process_client_pkt(void /*int fd*/)
msg.m_status = G.stratum < MAXSTRAT ? G.ntp_status : LI_ALARM; msg.m_status = G.stratum < MAXSTRAT ? G.ntp_status : LI_ALARM;
msg.m_status |= (query_status & VERSION_MASK); msg.m_status |= (query_status & VERSION_MASK);
msg.m_status |= ((query_status & MODE_MASK) == MODE_CLIENT) ? msg.m_status |= ((query_status & MODE_MASK) == MODE_CLIENT) ?
MODE_SERVER : MODE_SYM_PAS; MODE_SERVER : MODE_SYM_PAS;
msg.m_stratum = G.stratum; msg.m_stratum = G.stratum;
msg.m_ppoll = G.poll_exp; msg.m_ppoll = G.poll_exp;
msg.m_precision_exp = G_precision_exp; msg.m_precision_exp = G_precision_exp;
@ -2328,14 +2328,13 @@ set_freq(double freq) /* frequency update */
if (pps_enable) { if (pps_enable) {
if (!(pll_status & STA_PPSTIME)) if (!(pll_status & STA_PPSTIME))
report_event(EVNT_KERN, report_event(EVNT_KERN,
NULL, "PPS enabled"); NULL, "PPS enabled");
ntv.status |= STA_PPSTIME | STA_PPSFREQ; ntv.status |= STA_PPSTIME | STA_PPSFREQ;
} else { } else {
if (pll_status & STA_PPSTIME) if (pll_status & STA_PPSTIME)
report_event(EVNT_KERN, report_event(EVNT_KERN,
NULL, "PPS disabled"); NULL, "PPS disabled");
ntv.status &= ~(STA_PPSTIME | ntv.status &= ~(STA_PPSTIME | STA_PPSFREQ);
STA_PPSFREQ);
} }
if (sys_leap == LEAP_ADDSECOND) if (sys_leap == LEAP_ADDSECOND)
ntv.status |= STA_INS; ntv.status |= STA_INS;
@ -2351,7 +2350,7 @@ set_freq(double freq) /* frequency update */
if (ntp_adjtime(&ntv) == TIME_ERROR) { if (ntp_adjtime(&ntv) == TIME_ERROR) {
if (!(ntv.status & STA_PPSSIGNAL)) if (!(ntv.status & STA_PPSSIGNAL))
report_event(EVNT_KERN, NULL, report_event(EVNT_KERN, NULL,
"PPS no signal"); "PPS no signal");
} }
pll_status = ntv.status; pll_status = ntv.status;
#ifdef STA_NANO #ifdef STA_NANO

2
networking/ntpd_simple.c
View File

@ -710,7 +710,7 @@ recv_and_process_client_pkt(void /*int fd*/)
msg.m_status = G.synced ? G.leap : LI_ALARM; msg.m_status = G.synced ? G.leap : LI_ALARM;
msg.m_status |= (query_status & VERSION_MASK); msg.m_status |= (query_status & VERSION_MASK);
msg.m_status |= ((query_status & MODE_MASK) == MODE_CLIENT) ? msg.m_status |= ((query_status & MODE_MASK) == MODE_CLIENT) ?
MODE_SERVER : MODE_SYM_PAS; MODE_SERVER : MODE_SYM_PAS;
msg.m_stratum = G.stratum; msg.m_stratum = G.stratum;
msg.m_ppoll = query_ppoll; msg.m_ppoll = query_ppoll;
msg.m_precision_exp = G_precision_exp; msg.m_precision_exp = G_precision_exp;

2
networking/ping.c
View File

@ -724,7 +724,7 @@ static void ping6(len_and_sockaddr *lsa)
ICMP6_FILTER_SETPASSALL(&filt); ICMP6_FILTER_SETPASSALL(&filt);
} }
if (setsockopt(pingsock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt, if (setsockopt(pingsock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt,
sizeof(filt)) < 0) sizeof(filt)) < 0)
bb_error_msg_and_die("setsockopt(ICMP6_FILTER)"); bb_error_msg_and_die("setsockopt(ICMP6_FILTER)");
} }
#endif /*ICMP6_FILTER*/ #endif /*ICMP6_FILTER*/

14
networking/route.c
View File

@ -409,7 +409,7 @@ static NOINLINE void INET6_setroute(int action, char **args)
bb_error_msg_and_die("resolving %s", args_m1); bb_error_msg_and_die("resolving %s", args_m1);
} }
memcpy(&rt.rtmsg_gateway, sa6.sin6_addr.s6_addr, memcpy(&rt.rtmsg_gateway, sa6.sin6_addr.s6_addr,
sizeof(struct in6_addr)); sizeof(struct in6_addr));
rt.rtmsg_flags |= RTF_GATEWAY; rt.rtmsg_flags |= RTF_GATEWAY;
continue; continue;
} }
@ -498,11 +498,11 @@ void FAST_FUNC bb_displayroutes(int noresolve, int netstatfmt)
FILE *fp = xfopen_for_read("/proc/net/route"); FILE *fp = xfopen_for_read("/proc/net/route");
printf("Kernel IP routing table\n" printf("Kernel IP routing table\n"
"Destination Gateway Genmask Flags %s Iface\n", "Destination Gateway Genmask Flags %s Iface\n",
netstatfmt ? " MSS Window irtt" : "Metric Ref Use"); netstatfmt ? " MSS Window irtt" : "Metric Ref Use");
if (fscanf(fp, "%*[^\n]\n") < 0) { /* Skip the first line. */ if (fscanf(fp, "%*[^\n]\n") < 0) { /* Skip the first line. */
goto ERROR; /* Empty or missing line, or read error. */ goto ERROR; /* Empty or missing line, or read error. */
} }
while (1) { while (1) {
int r; int r;
@ -567,8 +567,8 @@ static void INET6_displayroutes(void)
FILE *fp = xfopen_for_read("/proc/net/ipv6_route"); FILE *fp = xfopen_for_read("/proc/net/ipv6_route");
printf("Kernel IPv6 routing table\n%-44s%-40s" printf("Kernel IPv6 routing table\n%-44s%-40s"
"Flags Metric Ref Use Iface\n", "Flags Metric Ref Use Iface\n",
"Destination", "Next Hop"); "Destination", "Next Hop");
while (1) { while (1) {
int r; int r;
@ -618,8 +618,8 @@ static void INET6_displayroutes(void)
(struct sockaddr *) &snaddr6.sin6_addr); (struct sockaddr *) &snaddr6.sin6_addr);
snaddr6.sin6_family = AF_INET6; snaddr6.sin6_family = AF_INET6;
naddr6 = INET6_rresolve((struct sockaddr_in6 *) &snaddr6, naddr6 = INET6_rresolve((struct sockaddr_in6 *) &snaddr6,
0x0fff /* Apparently, upstream never resolves. */ 0x0fff /* Apparently, upstream never resolves. */
); );
if (!r) { /* 1st pass */ if (!r) { /* 1st pass */
snprintf(addr6, sizeof(addr6), "%s/%d", naddr6, prefix_len); snprintf(addr6, sizeof(addr6), "%s/%d", naddr6, prefix_len);

2
procps/powertop.c
View File

@ -493,7 +493,7 @@ static NOINLINE int process_timer_stats(void)
* Get information about CPU using CPUID opcode. * Get information about CPU using CPUID opcode.
*/ */
static void cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx, static void cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx,
unsigned int *edx) unsigned int *edx)
{ {
/* EAX value specifies what information to return */ /* EAX value specifies what information to return */
__asm__( __asm__(

2
procps/sysctl.c
View File

@ -205,7 +205,7 @@ static int sysctl_act_recursive(const char *path)
continue; /* d_name is "." or ".." */ continue; /* d_name is "." or ".." */
/* if path was ".", drop "./" prefix: */ /* if path was ".", drop "./" prefix: */
retval |= sysctl_act_recursive((next[0] == '.' && next[1] == '/') ? retval |= sysctl_act_recursive((next[0] == '.' && next[1] == '/') ?
next + 2 : next); next + 2 : next);
free(next); free(next);
} }
closedir(dirp); closedir(dirp);

2
sysklogd/syslogd.c
View File

@ -253,7 +253,7 @@ enum {
#define OPTION_PARAM &opt_m, &(G.logFile.path), &opt_l \ #define OPTION_PARAM &opt_m, &(G.logFile.path), &opt_l \
IF_FEATURE_ROTATE_LOGFILE(,&opt_s) \ IF_FEATURE_ROTATE_LOGFILE(,&opt_s) \
IF_FEATURE_ROTATE_LOGFILE(,&opt_b) \ IF_FEATURE_ROTATE_LOGFILE(,&opt_b) \
IF_FEATURE_REMOTE_LOG( ,&remoteAddrList) \ IF_FEATURE_REMOTE_LOG( ,&remoteAddrList) \
IF_FEATURE_IPC_SYSLOG( ,&opt_C) \ IF_FEATURE_IPC_SYSLOG( ,&opt_C) \
IF_FEATURE_SYSLOGD_CFG( ,&opt_f) IF_FEATURE_SYSLOGD_CFG( ,&opt_f)

2
util-linux/fdformat.c
View File

@ -116,7 +116,7 @@ int fdformat_main(int argc UNUSED_PARAM, char **argv)
/* Check backwards so we don't need a counter */ /* Check backwards so we don't need a counter */
while (--read_bytes >= 0) { while (--read_bytes >= 0) {
if (data[read_bytes] != FD_FILL_BYTE) { if (data[read_bytes] != FD_FILL_BYTE) {
printf("bad data in cyl %d\nContinuing... ", cyl); printf("bad data in cyl %d\nContinuing... ", cyl);
} }
} }
} }

2
util-linux/fdisk.c
View File

@ -3023,7 +3023,7 @@ int fdisk_main(int argc UNUSED_PARAM, char **argv)
printf("\nThe current boot file is: %s\n", printf("\nThe current boot file is: %s\n",
sgi_get_bootfile()); sgi_get_bootfile());
if (read_maybe_empty("Please enter the name of the " if (read_maybe_empty("Please enter the name of the "
"new boot file: ") == '\n') "new boot file: ") == '\n')
printf("Boot file unchanged\n"); printf("Boot file unchanged\n");
else else
sgi_set_bootfile(line_ptr); sgi_set_bootfile(line_ptr);

2
util-linux/flock.c
View File

@ -45,7 +45,7 @@ int flock_main(int argc UNUSED_PARAM, char **argv)
if (argv[1]) { if (argv[1]) {
fd = open(argv[0], O_RDONLY|O_NOCTTY|O_CREAT, 0666); fd = open(argv[0], O_RDONLY|O_NOCTTY|O_CREAT, 0666);
if (fd < 0 && errno == EISDIR) if (fd < 0 && errno == EISDIR)
fd = open(argv[0], O_RDONLY|O_NOCTTY); fd = open(argv[0], O_RDONLY|O_NOCTTY);
if (fd < 0) if (fd < 0)
bb_perror_msg_and_die("can't open '%s'", argv[0]); bb_perror_msg_and_die("can't open '%s'", argv[0]);
//TODO? close_on_exec_on(fd); //TODO? close_on_exec_on(fd);

6
util-linux/ipcrm.c
View File

@ -160,7 +160,7 @@ int ipcrm_main(int argc, char **argv)
/* convert key to id */ /* convert key to id */
id = ((c == 'q') ? msgget(key, 0) : id = ((c == 'q') ? msgget(key, 0) :
(c == 'm') ? shmget(key, 0, 0) : semget(key, 0, 0)); (c == 'm') ? shmget(key, 0, 0) : semget(key, 0, 0));
if (id < 0) { if (id < 0) {
const char *errmsg; const char *errmsg;
@ -189,8 +189,8 @@ int ipcrm_main(int argc, char **argv)
} }
result = ((c == 'q') ? msgctl(id, IPC_RMID, NULL) : result = ((c == 'q') ? msgctl(id, IPC_RMID, NULL) :
(c == 'm') ? shmctl(id, IPC_RMID, NULL) : (c == 'm') ? shmctl(id, IPC_RMID, NULL) :
semctl(id, 0, IPC_RMID, arg)); semctl(id, 0, IPC_RMID, arg));
if (result) { if (result) {
const char *errmsg; const char *errmsg;

254
util-linux/ipcs.c
View File

@ -154,52 +154,52 @@ static NOINLINE void do_shm(void)
/* glibc 2.1.3 and all earlier libc's have ints as fields /* glibc 2.1.3 and all earlier libc's have ints as fields
of struct shminfo; glibc 2.1.91 has unsigned long; ach */ of struct shminfo; glibc 2.1.91 has unsigned long; ach */
printf("max number of segments = %lu\n" printf("max number of segments = %lu\n"
"max seg size (kbytes) = %lu\n" "max seg size (kbytes) = %lu\n"
"max total shared memory (pages) = %lu\n" "max total shared memory (pages) = %lu\n"
"min seg size (bytes) = %lu\n", "min seg size (bytes) = %lu\n",
(unsigned long) shminfo.shmmni, (unsigned long) shminfo.shmmni,
(unsigned long) (shminfo.shmmax >> 10), (unsigned long) (shminfo.shmmax >> 10),
(unsigned long) shminfo.shmall, (unsigned long) shminfo.shmall,
(unsigned long) shminfo.shmmin); (unsigned long) shminfo.shmmin);
return; return;
case STATUS: case STATUS:
printf("------ Shared Memory %s --------\n", "Status"); printf("------ Shared Memory %s --------\n", "Status");
printf( "segments allocated %d\n" printf("segments allocated %d\n"
"pages allocated %ld\n" "pages allocated %ld\n"
"pages resident %ld\n" "pages resident %ld\n"
"pages swapped %ld\n" "pages swapped %ld\n"
"Swap performance: %ld attempts\t%ld successes\n", "Swap performance: %ld attempts\t%ld successes\n",
shm_info.used_ids, shm_info.used_ids,
shm_info.shm_tot, shm_info.shm_tot,
shm_info.shm_rss, shm_info.shm_rss,
shm_info.shm_swp, shm_info.shm_swp,
shm_info.swap_attempts, shm_info.swap_successes); shm_info.swap_attempts, shm_info.swap_successes);
return; return;
case CREATOR: case CREATOR:
printf("------ Shared Memory %s --------\n", "Segment Creators/Owners"); printf("------ Shared Memory %s --------\n", "Segment Creators/Owners");
printf( "%-10s %-10s %-10s %-10s %-10s %-10s\n", printf("%-10s %-10s %-10s %-10s %-10s %-10s\n",
"shmid", "perms", "cuid", "cgid", "uid", "gid"); "shmid", "perms", "cuid", "cgid", "uid", "gid");
break; break;
case TIME: case TIME:
printf("------ Shared Memory %s --------\n", "Attach/Detach/Change Times"); printf("------ Shared Memory %s --------\n", "Attach/Detach/Change Times");
printf( "%-10s %-10s %-20s %-20s %-20s\n", printf("%-10s %-10s %-20s %-20s %-20s\n",
"shmid", "owner", "attached", "detached", "changed"); "shmid", "owner", "attached", "detached", "changed");
break; break;
case PID: case PID:
printf("------ Shared Memory %s --------\n", "Creator/Last-op"); printf("------ Shared Memory %s --------\n", "Creator/Last-op");
printf( "%-10s %-10s %-10s %-10s\n", printf("%-10s %-10s %-10s %-10s\n",
"shmid", "owner", "cpid", "lpid"); "shmid", "owner", "cpid", "lpid");
break; break;
default: default:
printf("------ Shared Memory %s --------\n", "Segments"); printf("------ Shared Memory %s --------\n", "Segments");
printf( "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", printf("%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n",
"key", "shmid", "owner", "perms", "bytes", "nattch", "key", "shmid", "owner", "perms", "bytes", "nattch",
"status"); "status");
break; break;
} }
@ -220,11 +220,11 @@ static NOINLINE void do_shm(void)
printf("%-10d %-10d", shmid, ipcp->uid); printf("%-10d %-10d", shmid, ipcp->uid);
/* ctime uses static buffer: use separate calls */ /* ctime uses static buffer: use separate calls */
printf(" %-20.16s", shmseg.shm_atime printf(" %-20.16s", shmseg.shm_atime
? ctime(&shmseg.shm_atime) + 4 : "Not set"); ? ctime(&shmseg.shm_atime) + 4 : "Not set");
printf(" %-20.16s", shmseg.shm_dtime printf(" %-20.16s", shmseg.shm_dtime
? ctime(&shmseg.shm_dtime) + 4 : "Not set"); ? ctime(&shmseg.shm_dtime) + 4 : "Not set");
printf(" %-20.16s\n", shmseg.shm_ctime printf(" %-20.16s\n", shmseg.shm_ctime
? ctime(&shmseg.shm_ctime) + 4 : "Not set"); ? ctime(&shmseg.shm_ctime) + 4 : "Not set");
break; break;
case PID: case PID:
if (pw) if (pw)
@ -241,17 +241,17 @@ static NOINLINE void do_shm(void)
else else
printf("%-10d %-10d", shmid, ipcp->uid); printf("%-10d %-10d", shmid, ipcp->uid);
printf(" %-10o %-10lu %-10ld %-6s %-6s\n", ipcp->mode & 0777, printf(" %-10o %-10lu %-10ld %-6s %-6s\n", ipcp->mode & 0777,
/* /*
* earlier: int, Austin has size_t * earlier: int, Austin has size_t
*/ */
(unsigned long) shmseg.shm_segsz, (unsigned long) shmseg.shm_segsz,
/* /*
* glibc-2.1.3 and earlier has unsigned short; * glibc-2.1.3 and earlier has unsigned short;
* Austin has shmatt_t * Austin has shmatt_t
*/ */
(long) shmseg.shm_nattch, (long) shmseg.shm_nattch,
ipcp->mode & SHM_DEST ? "dest" : " ", ipcp->mode & SHM_DEST ? "dest" : " ",
ipcp->mode & SHM_LOCKED ? "locked" : " "); ipcp->mode & SHM_LOCKED ? "locked" : " ");
break; break;
} }
} }
@ -281,32 +281,32 @@ static NOINLINE void do_sem(void)
if ((semctl(0, 0, IPC_INFO, arg)) < 0) if ((semctl(0, 0, IPC_INFO, arg)) < 0)
return; return;
printf("max number of arrays = %d\n" printf("max number of arrays = %d\n"
"max semaphores per array = %d\n" "max semaphores per array = %d\n"
"max semaphores system wide = %d\n" "max semaphores system wide = %d\n"
"max ops per semop call = %d\n" "max ops per semop call = %d\n"
"semaphore max value = %d\n", "semaphore max value = %d\n",
seminfo.semmni, seminfo.semmni,
seminfo.semmsl, seminfo.semmsl,
seminfo.semmns, seminfo.semopm, seminfo.semvmx); seminfo.semmns, seminfo.semopm, seminfo.semvmx);
return; return;
case STATUS: case STATUS:
printf("------ Semaphore %s --------\n", "Status"); printf("------ Semaphore %s --------\n", "Status");
printf( "used arrays = %d\n" printf("used arrays = %d\n"
"allocated semaphores = %d\n", "allocated semaphores = %d\n",
seminfo.semusz, seminfo.semaem); seminfo.semusz, seminfo.semaem);
return; return;
case CREATOR: case CREATOR:
printf("------ Semaphore %s --------\n", "Arrays Creators/Owners"); printf("------ Semaphore %s --------\n", "Arrays Creators/Owners");
printf( "%-10s %-10s %-10s %-10s %-10s %-10s\n", printf("%-10s %-10s %-10s %-10s %-10s %-10s\n",
"semid", "perms", "cuid", "cgid", "uid", "gid"); "semid", "perms", "cuid", "cgid", "uid", "gid");
break; break;
case TIME: case TIME:
printf("------ Shared Memory %s --------\n", "Operation/Change Times"); printf("------ Shared Memory %s --------\n", "Operation/Change Times");
printf( "%-8s %-10s %-26.24s %-26.24s\n", printf("%-8s %-10s %-26.24s %-26.24s\n",
"shmid", "owner", "last-op", "last-changed"); "shmid", "owner", "last-op", "last-changed");
break; break;
case PID: case PID:
@ -314,8 +314,8 @@ static NOINLINE void do_sem(void)
default: default:
printf("------ Semaphore %s --------\n", "Arrays"); printf("------ Semaphore %s --------\n", "Arrays");
printf( "%-10s %-10s %-10s %-10s %-10s\n", printf("%-10s %-10s %-10s %-10s %-10s\n",
"key", "semid", "owner", "perms", "nsems"); "key", "semid", "owner", "perms", "nsems");
break; break;
} }
@ -337,9 +337,9 @@ static NOINLINE void do_sem(void)
printf("%-8d %-10d", semid, ipcp->uid); printf("%-8d %-10d", semid, ipcp->uid);
/* ctime uses static buffer: use separate calls */ /* ctime uses static buffer: use separate calls */
printf(" %-26.24s", semary.sem_otime printf(" %-26.24s", semary.sem_otime
? ctime(&semary.sem_otime) : "Not set"); ? ctime(&semary.sem_otime) : "Not set");
printf(" %-26.24s\n", semary.sem_ctime printf(" %-26.24s\n", semary.sem_ctime
? ctime(&semary.sem_ctime) : "Not set"); ? ctime(&semary.sem_ctime) : "Not set");
break; break;
case PID: case PID:
break; break;
@ -351,13 +351,13 @@ static NOINLINE void do_sem(void)
else else
printf("%-10d %-9d", semid, ipcp->uid); printf("%-10d %-9d", semid, ipcp->uid);
printf(" %-10o %-10ld\n", ipcp->mode & 0777, printf(" %-10o %-10ld\n", ipcp->mode & 0777,
/* /*
* glibc-2.1.3 and earlier has unsigned short; * glibc-2.1.3 and earlier has unsigned short;
* glibc-2.1.91 has variation between * glibc-2.1.91 has variation between
* unsigned short and unsigned long * unsigned short and unsigned long
* Austin prescribes unsigned short. * Austin prescribes unsigned short.
*/ */
(long) semary.sem_nsems); (long) semary.sem_nsems);
break; break;
} }
} }
@ -383,42 +383,42 @@ static NOINLINE void do_msg(void)
if ((msgctl(0, IPC_INFO, (struct msqid_ds *) (void *) &msginfo)) < 0) if ((msgctl(0, IPC_INFO, (struct msqid_ds *) (void *) &msginfo)) < 0)
return; return;
printf("------ Message%s --------\n", "s: Limits"); printf("------ Message%s --------\n", "s: Limits");
printf( "max queues system wide = %d\n" printf("max queues system wide = %d\n"
"max size of message (bytes) = %d\n" "max size of message (bytes) = %d\n"
"default max size of queue (bytes) = %d\n", "default max size of queue (bytes) = %d\n",
msginfo.msgmni, msginfo.msgmax, msginfo.msgmnb); msginfo.msgmni, msginfo.msgmax, msginfo.msgmnb);
return; return;
case STATUS: case STATUS:
printf("------ Message%s --------\n", "s: Status"); printf("------ Message%s --------\n", "s: Status");
printf( "allocated queues = %d\n" printf("allocated queues = %d\n"
"used headers = %d\n" "used headers = %d\n"
"used space = %d bytes\n", "used space = %d bytes\n",
msginfo.msgpool, msginfo.msgmap, msginfo.msgtql); msginfo.msgpool, msginfo.msgmap, msginfo.msgtql);
return; return;
case CREATOR: case CREATOR:
printf("------ Message%s --------\n", " Queues: Creators/Owners"); printf("------ Message%s --------\n", " Queues: Creators/Owners");
printf( "%-10s %-10s %-10s %-10s %-10s %-10s\n", printf("%-10s %-10s %-10s %-10s %-10s %-10s\n",
"msqid", "perms", "cuid", "cgid", "uid", "gid"); "msqid", "perms", "cuid", "cgid", "uid", "gid");
break; break;
case TIME: case TIME:
printf("------ Message%s --------\n", " Queues Send/Recv/Change Times"); printf("------ Message%s --------\n", " Queues Send/Recv/Change Times");
printf( "%-8s %-10s %-20s %-20s %-20s\n", printf("%-8s %-10s %-20s %-20s %-20s\n",
"msqid", "owner", "send", "recv", "change"); "msqid", "owner", "send", "recv", "change");
break; break;
case PID: case PID:
printf("------ Message%s --------\n", " Queues PIDs"); printf("------ Message%s --------\n", " Queues PIDs");
printf( "%-10s %-10s %-10s %-10s\n", printf("%-10s %-10s %-10s %-10s\n",
"msqid", "owner", "lspid", "lrpid"); "msqid", "owner", "lspid", "lrpid");
break; break;
default: default:
printf("------ Message%s --------\n", " Queues"); printf("------ Message%s --------\n", " Queues");
printf( "%-10s %-10s %-10s %-10s %-12s %-12s\n", printf("%-10s %-10s %-10s %-10s %-12s %-12s\n",
"key", "msqid", "owner", "perms", "used-bytes", "messages"); "key", "msqid", "owner", "perms", "used-bytes", "messages");
break; break;
} }
@ -438,11 +438,11 @@ static NOINLINE void do_msg(void)
else else
printf("%-8d %-10d", msqid, ipcp->uid); printf("%-8d %-10d", msqid, ipcp->uid);
printf(" %-20.16s", msgque.msg_stime printf(" %-20.16s", msgque.msg_stime
? ctime(&msgque.msg_stime) + 4 : "Not set"); ? ctime(&msgque.msg_stime) + 4 : "Not set");
printf(" %-20.16s", msgque.msg_rtime printf(" %-20.16s", msgque.msg_rtime
? ctime(&msgque.msg_rtime) + 4 : "Not set"); ? ctime(&msgque.msg_rtime) + 4 : "Not set");
printf(" %-20.16s\n", msgque.msg_ctime printf(" %-20.16s\n", msgque.msg_ctime
? ctime(&msgque.msg_ctime) + 4 : "Not set"); ? ctime(&msgque.msg_ctime) + 4 : "Not set");
break; break;
case PID: case PID:
if (pw) if (pw)
@ -459,13 +459,13 @@ static NOINLINE void do_msg(void)
else else
printf("%-10d %-10d", msqid, ipcp->uid); printf("%-10d %-10d", msqid, ipcp->uid);
printf(" %-10o %-12ld %-12ld\n", ipcp->mode & 0777, printf(" %-10o %-12ld %-12ld\n", ipcp->mode & 0777,
/* /*
* glibc-2.1.3 and earlier has unsigned short; * glibc-2.1.3 and earlier has unsigned short;
* glibc-2.1.91 has variation between * glibc-2.1.91 has variation between
* unsigned short, unsigned long * unsigned short, unsigned long
* Austin has msgqnum_t * Austin has msgqnum_t
*/ */
(long) msgque.msg_cbytes, (long) msgque.msg_qnum); (long) msgque.msg_cbytes, (long) msgque.msg_qnum);
break; break;
} }
} }
@ -483,18 +483,18 @@ static void print_shm(int shmid)
} }
printf("\nShared memory Segment shmid=%d\n" printf("\nShared memory Segment shmid=%d\n"
"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n" "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
"mode=%#o\taccess_perms=%#o\n" "mode=%#o\taccess_perms=%#o\n"
"bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n", "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n",
shmid, shmid,
ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid, ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid,
ipcp->mode, ipcp->mode & 0777, ipcp->mode, ipcp->mode & 0777,
(long) shmds.shm_segsz, shmds.shm_lpid, shmds.shm_cpid, (long) shmds.shm_segsz, shmds.shm_lpid, shmds.shm_cpid,
(long) shmds.shm_nattch); (long) shmds.shm_nattch);
printf("att_time=%-26.24s\n", printf("att_time=%-26.24s\n",
shmds.shm_atime ? ctime(&shmds.shm_atime) : "Not set"); shmds.shm_atime ? ctime(&shmds.shm_atime) : "Not set");
printf("det_time=%-26.24s\n", printf("det_time=%-26.24s\n",
shmds.shm_dtime ? ctime(&shmds.shm_dtime) : "Not set"); shmds.shm_dtime ? ctime(&shmds.shm_dtime) : "Not set");
printf("change_time=%-26.24s\n\n", ctime(&shmds.shm_ctime)); printf("change_time=%-26.24s\n\n", ctime(&shmds.shm_ctime));
} }
@ -510,24 +510,24 @@ static void print_msg(int msqid)
} }
printf("\nMessage Queue msqid=%d\n" printf("\nMessage Queue msqid=%d\n"
"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n" "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n",
msqid, ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid, ipcp->mode, msqid, ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid, ipcp->mode,
/* /*
* glibc-2.1.3 and earlier has unsigned short; * glibc-2.1.3 and earlier has unsigned short;
* glibc-2.1.91 has variation between * glibc-2.1.91 has variation between
* unsigned short, unsigned long * unsigned short, unsigned long
* Austin has msgqnum_t (for msg_qbytes) * Austin has msgqnum_t (for msg_qbytes)
*/ */
(long) buf.msg_cbytes, (long) buf.msg_qbytes, (long) buf.msg_cbytes, (long) buf.msg_qbytes,
(long) buf.msg_qnum, buf.msg_lspid, buf.msg_lrpid); (long) buf.msg_qnum, buf.msg_lspid, buf.msg_lrpid);
printf("send_time=%-26.24s\n", printf("send_time=%-26.24s\n",
buf.msg_stime ? ctime(&buf.msg_stime) : "Not set"); buf.msg_stime ? ctime(&buf.msg_stime) : "Not set");
printf("rcv_time=%-26.24s\n", printf("rcv_time=%-26.24s\n",
buf.msg_rtime ? ctime(&buf.msg_rtime) : "Not set"); buf.msg_rtime ? ctime(&buf.msg_rtime) : "Not set");
printf("change_time=%-26.24s\n\n", printf("change_time=%-26.24s\n\n",
buf.msg_ctime ? ctime(&buf.msg_ctime) : "Not set"); buf.msg_ctime ? ctime(&buf.msg_ctime) : "Not set");
} }
static void print_sem(int semid) static void print_sem(int semid)
@ -544,19 +544,19 @@ static void print_sem(int semid)
} }
printf("\nSemaphore Array semid=%d\n" printf("\nSemaphore Array semid=%d\n"
"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n" "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
"mode=%#o, access_perms=%#o\n" "mode=%#o, access_perms=%#o\n"
"nsems = %ld\n" "nsems = %ld\n"
"otime = %-26.24s\n", "otime = %-26.24s\n",
semid, semid,
ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid, ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid,
ipcp->mode, ipcp->mode & 0777, ipcp->mode, ipcp->mode & 0777,
(long) semds.sem_nsems, (long) semds.sem_nsems,
semds.sem_otime ? ctime(&semds.sem_otime) : "Not set"); semds.sem_otime ? ctime(&semds.sem_otime) : "Not set");
printf("ctime = %-26.24s\n" printf("ctime = %-26.24s\n"
"%-10s %-10s %-10s %-10s %-10s\n", "%-10s %-10s %-10s %-10s %-10s\n",
ctime(&semds.sem_ctime), ctime(&semds.sem_ctime),
"semnum", "value", "ncount", "zcount", "pid"); "semnum", "value", "ncount", "zcount", "pid");
arg.val = 0; arg.val = 0;
for (i = 0; i < semds.sem_nsems; i++) { for (i = 0; i < semds.sem_nsems; i++) {

6
util-linux/lspci.c
View File

@ -74,11 +74,11 @@ static int FAST_FUNC fileAction(
if (option_mask32 & OPT_m) { if (option_mask32 & OPT_m) {
printf("%s \"Class %04x\" \"%04x\" \"%04x\" \"%04x\" \"%04x\"", printf("%s \"Class %04x\" \"%04x\" \"%04x\" \"%04x\" \"%04x\"",
pci_slot_name, pci_class, pci_vid, pci_did, pci_slot_name, pci_class, pci_vid, pci_did,
pci_subsys_vid, pci_subsys_did); pci_subsys_vid, pci_subsys_did);
} else { } else {
printf("%s Class %04x: %04x:%04x", printf("%s Class %04x: %04x:%04x",
pci_slot_name, pci_class, pci_vid, pci_did); pci_slot_name, pci_class, pci_vid, pci_did);
} }
if ((option_mask32 & OPT_k) && driver) { if ((option_mask32 & OPT_k) && driver) {

48
util-linux/mount.c
View File

@ -927,7 +927,7 @@ static bool_t xdr_fhandle(XDR *xdrs, fhandle objp)
static bool_t xdr_fhstatus(XDR *xdrs, fhstatus *objp) static bool_t xdr_fhstatus(XDR *xdrs, fhstatus *objp)
{ {
if (!xdr_u_int(xdrs, &objp->fhs_status)) if (!xdr_u_int(xdrs, &objp->fhs_status))
return FALSE; return FALSE;
if (objp->fhs_status == 0) if (objp->fhs_status == 0)
return xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle); return xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle);
return TRUE; return TRUE;
@ -941,8 +941,8 @@ static bool_t xdr_dirpath(XDR *xdrs, dirpath *objp)
static bool_t xdr_fhandle3(XDR *xdrs, fhandle3 *objp) static bool_t xdr_fhandle3(XDR *xdrs, fhandle3 *objp)
{ {
return xdr_bytes(xdrs, (char **)&objp->fhandle3_val, return xdr_bytes(xdrs, (char **)&objp->fhandle3_val,
(unsigned int *) &objp->fhandle3_len, (unsigned int *) &objp->fhandle3_len,
FHSIZE3); FHSIZE3);
} }
static bool_t xdr_mountres3_ok(XDR *xdrs, mountres3_ok *objp) static bool_t xdr_mountres3_ok(XDR *xdrs, mountres3_ok *objp)
@ -950,10 +950,10 @@ static bool_t xdr_mountres3_ok(XDR *xdrs, mountres3_ok *objp)
if (!xdr_fhandle3(xdrs, &objp->fhandle)) if (!xdr_fhandle3(xdrs, &objp->fhandle))
return FALSE; return FALSE;
return xdr_array(xdrs, &(objp->auth_flavours.auth_flavours_val), return xdr_array(xdrs, &(objp->auth_flavours.auth_flavours_val),
&(objp->auth_flavours.auth_flavours_len), &(objp->auth_flavours.auth_flavours_len),
~0, ~0,
sizeof(int), sizeof(int),
(xdrproc_t) xdr_int); (xdrproc_t) xdr_int);
} }
static bool_t xdr_mountstat3(XDR *xdrs, mountstat3 *objp) static bool_t xdr_mountstat3(XDR *xdrs, mountstat3 *objp)
@ -1522,19 +1522,19 @@ static NOINLINE int nfsmount(struct mntent *mp, unsigned long vfsflags, char *fi
switch (pm_mnt.pm_prot) { switch (pm_mnt.pm_prot) {
case IPPROTO_UDP: case IPPROTO_UDP:
mclient = clntudp_create(&mount_server_addr, mclient = clntudp_create(&mount_server_addr,
pm_mnt.pm_prog, pm_mnt.pm_prog,
pm_mnt.pm_vers, pm_mnt.pm_vers,
retry_timeout, retry_timeout,
&msock); &msock);
if (mclient) if (mclient)
break; break;
mount_server_addr.sin_port = htons(pm_mnt.pm_port); mount_server_addr.sin_port = htons(pm_mnt.pm_port);
msock = RPC_ANYSOCK; msock = RPC_ANYSOCK;
case IPPROTO_TCP: case IPPROTO_TCP:
mclient = clnttcp_create(&mount_server_addr, mclient = clnttcp_create(&mount_server_addr,
pm_mnt.pm_prog, pm_mnt.pm_prog,
pm_mnt.pm_vers, pm_mnt.pm_vers,
&msock, 0, 0); &msock, 0, 0);
break; break;
default: default:
mclient = NULL; mclient = NULL;
@ -1555,18 +1555,18 @@ static NOINLINE int nfsmount(struct mntent *mp, unsigned long vfsflags, char *fi
if (pm_mnt.pm_vers == 3) if (pm_mnt.pm_vers == 3)
clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT, clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,
(xdrproc_t) xdr_dirpath, (xdrproc_t) xdr_dirpath,
(caddr_t) &pathname, (caddr_t) &pathname,
(xdrproc_t) xdr_mountres3, (xdrproc_t) xdr_mountres3,
(caddr_t) &status, (caddr_t) &status,
total_timeout); total_timeout);
else else
clnt_stat = clnt_call(mclient, MOUNTPROC_MNT, clnt_stat = clnt_call(mclient, MOUNTPROC_MNT,
(xdrproc_t) xdr_dirpath, (xdrproc_t) xdr_dirpath,
(caddr_t) &pathname, (caddr_t) &pathname,
(xdrproc_t) xdr_fhstatus, (xdrproc_t) xdr_fhstatus,
(caddr_t) &status, (caddr_t) &status,
total_timeout); total_timeout);
if (clnt_stat == RPC_SUCCESS) if (clnt_stat == RPC_SUCCESS)
goto prepare_kernel_data; /* we're done */ goto prepare_kernel_data; /* we're done */

16
util-linux/readprofile.c
View File

@ -163,7 +163,7 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
while (fgets(mapline, S_LEN, map)) { while (fgets(mapline, S_LEN, map)) {
if (sscanf(mapline, "%llx %s %s", &fn_add, mode, fn_name) != 3) if (sscanf(mapline, "%llx %s %s", &fn_add, mode, fn_name) != 3)
bb_error_msg_and_die("%s(%i): wrong map line", bb_error_msg_and_die("%s(%i): wrong map line",
mapFile, maplineno); mapFile, maplineno);
if (!strcmp(fn_name, "_stext")) /* only elf works like this */ { if (!strcmp(fn_name, "_stext")) /* only elf works like this */ {
add0 = fn_add; add0 = fn_add;
@ -198,7 +198,7 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
if (indx >= len / sizeof(*buf)) if (indx >= len / sizeof(*buf))
bb_error_msg_and_die("profile address out of range. " bb_error_msg_and_die("profile address out of range. "
"Wrong map file?"); "Wrong map file?");
while (indx < (next_add-add0)/step) { while (indx < (next_add-add0)/step) {
if (optBins && (buf[indx] || optAll)) { if (optBins && (buf[indx] || optAll)) {
@ -220,10 +220,10 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
) { ) {
if (optVerbose) if (optVerbose)
printf("%016llx %-40s %6i %8.4f\n", fn_add, printf("%016llx %-40s %6i %8.4f\n", fn_add,
fn_name, this, this/(double)fn_len); fn_name, this, this/(double)fn_len);
else else
printf("%6i %-40s %8.4f\n", printf("%6i %-40s %8.4f\n",
this, fn_name, this/(double)fn_len); this, fn_name, this/(double)fn_len);
if (optSub) { if (optSub) {
unsigned long long scan; unsigned long long scan;
@ -233,8 +233,8 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
addr = (scan - 1)*step + add0; addr = (scan - 1)*step + add0;
printf("\t%#llx\t%s+%#llx\t%u\n", printf("\t%#llx\t%s+%#llx\t%u\n",
addr, fn_name, addr - fn_add, addr, fn_name, addr - fn_add,
buf[scan]); buf[scan]);
} }
} }
} }
@ -251,10 +251,10 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
/* trailer */ /* trailer */
if (optVerbose) if (optVerbose)
printf("%016x %-40s %6i %8.4f\n", printf("%016x %-40s %6i %8.4f\n",
0, "total", total, total/(double)(fn_add-add0)); 0, "total", total, total/(double)(fn_add-add0));
else else
printf("%6i %-40s %8.4f\n", printf("%6i %-40s %8.4f\n",
total, "total", total/(double)(fn_add-add0)); total, "total", total/(double)(fn_add-add0));
fclose(map); fclose(map);
free(buf); free(buf);

6
util-linux/volume_id/linux_raid.c
View File

@ -69,9 +69,9 @@ int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/,
volume_id_set_uuid(id, uuid, UUID_DCE); volume_id_set_uuid(id, uuid, UUID_DCE);
// snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u", // snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
// le32_to_cpu(mdp->major_version), // le32_to_cpu(mdp->major_version),
// le32_to_cpu(mdp->minor_version), // le32_to_cpu(mdp->minor_version),
// le32_to_cpu(mdp->patch_version)); // le32_to_cpu(mdp->patch_version));
dbg("found raid signature"); dbg("found raid signature");
// volume_id_set_usage(id, VOLUME_ID_RAID); // volume_id_set_usage(id, VOLUME_ID_RAID);

2
util-linux/volume_id/util.c
View File

@ -129,7 +129,7 @@ void volume_id_set_label_string(struct volume_id *id, const uint8_t *buf, size_t
void volume_id_set_label_unicode16(struct volume_id *id, const uint8_t *buf, enum endian endianess, size_t count) void volume_id_set_label_unicode16(struct volume_id *id, const uint8_t *buf, enum endian endianess, size_t count)
{ {
volume_id_set_unicode16(id->label, sizeof(id->label), buf, endianess, count); volume_id_set_unicode16(id->label, sizeof(id->label), buf, endianess, count);
} }
void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, enum uuid_format format) void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, enum uuid_format format)