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

Run through indent, fix comments

Browse Source
This commit is contained in:
Glenn L McGrath
2002-08-22 18:22:10 +00:00
parent e3906fcd94
commit baf55a85fc
2 changed files with 230 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
init/init.c
View File

@@ -162,12 +162,14 @@ static struct init_action *init_action_list = NULL;
static int kernelVersion = 0; static int kernelVersion = 0;
static char termType[32] = "TERM=linux"; static char termType[32] = "TERM=linux";
static char console[32] = _PATH_CONSOLE; static char console[32] = _PATH_CONSOLE;
#ifndef CONFIG_SYSLOGD #ifndef CONFIG_SYSLOGD
static char *log = VC_5; static char *log = VC_5;
#endif #endif
static sig_atomic_t got_cont = 0; static sig_atomic_t got_cont = 0;
static const int LOG = 0x1; static const int LOG = 0x1;
static const int CONSOLE = 0x2; static const int CONSOLE = 0x2;
#if defined CONFIG_FEATURE_EXTRA_QUIET #if defined CONFIG_FEATURE_EXTRA_QUIET
static const int MAYBE_CONSOLE = 0x0; static const int MAYBE_CONSOLE = 0x0;
#else #else
@@ -177,6 +179,7 @@ static const int MAYBE_CONSOLE = 0x0;
static const int RB_HALT_SYSTEM = 0xcdef0123; static const int RB_HALT_SYSTEM = 0xcdef0123;
static const int RB_ENABLE_CAD = 0x89abcdef; static const int RB_ENABLE_CAD = 0x89abcdef;
static const int RB_DISABLE_CAD = 0; static const int RB_DISABLE_CAD = 0;
#define RB_POWER_OFF 0x4321fedc #define RB_POWER_OFF 0x4321fedc
static const int RB_AUTOBOOT = 0x01234567; static const int RB_AUTOBOOT = 0x01234567;
#endif #endif
@@ -195,11 +198,14 @@ static void loop_forever(void)
/* Print a message to the specified device. /* Print a message to the specified device.
* Device may be bitwise-or'd from LOG | CONSOLE */ * Device may be bitwise-or'd from LOG | CONSOLE */
#ifdef DEBUG_INIT #ifdef DEBUG_INIT
static inline messageND(int device, char *fmt, ...) { } static inline messageND(int device, char *fmt, ...)
{
}
#else #else
#define messageND message #define messageND message
#endif #endif
static void message(int device, char *fmt, ...) __attribute__ ((format (printf, 2, 3))); static void message(int device, char *fmt, ...)
__attribute__ ((format(printf, 2, 3)));
static void message(int device, char *fmt, ...) static void message(int device, char *fmt, ...)
{ {
va_list arguments; va_list arguments;
@@ -237,9 +243,9 @@ static void message(int device, char *fmt, ...)
if (device & CONSOLE) { if (device & CONSOLE) {
/* Always send console messages to /dev/console so people will see them. */ /* Always send console messages to /dev/console so people will see them. */
if ( if ((fd =
(fd = device_open(_PATH_CONSOLE,
device_open(_PATH_CONSOLE, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0) { O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0) {
va_start(arguments, fmt); va_start(arguments, fmt);
vdprintf(fd, fmt, arguments); vdprintf(fd, fmt, arguments);
va_end(arguments); va_end(arguments);
@@ -306,11 +312,16 @@ static int check_free_memory(void)
/* Kernels 2.0.x and 2.2.x return info.mem_unit==0 with values in bytes. /* Kernels 2.0.x and 2.2.x return info.mem_unit==0 with values in bytes.
* Kernels 2.4.0 return info.mem_unit in bytes. */ * Kernels 2.4.0 return info.mem_unit in bytes. */
u = info.mem_unit; u = info.mem_unit;
if (u==0) u=1; if (u == 0)
while ( (u&1) == 0 && s > 0 ) { u>>=1; s--; } u = 1;
while ((u & 1) == 0 && s > 0) {
u >>= 1;
s--;
}
result = (info.totalram >> s) + (info.totalswap >> s); result = (info.totalram >> s) + (info.totalswap >> s);
result = result * u; result = result * u;
if (result < 0) result = INT_MAX; if (result < 0)
result = INT_MAX;
return result; return result;
} }
@@ -389,6 +400,7 @@ static void console_init(void)
static void fixup_argv(int argc, char **argv, char *new_argv0) static void fixup_argv(int argc, char **argv, char *new_argv0)
{ {
int len; int len;
/* Fix up argv[0] to be certain we claim to be init */ /* Fix up argv[0] to be certain we claim to be init */
len = strlen(argv[0]); len = strlen(argv[0]);
memset(argv[0], 0, len); memset(argv[0], 0, len);
@@ -425,8 +437,7 @@ static void check_memory(void)
#endif #endif
goodnight: goodnight:
message(CONSOLE, message(CONSOLE, "\rSorry, your computer does not have enough memory.\n");
"\rSorry, your computer does not have enough memory.\n");
loop_forever(); loop_forever();
} }
@@ -470,8 +481,7 @@ static pid_t run(struct init_action *a)
sigaddset(&nmask, SIGCHLD); sigaddset(&nmask, SIGCHLD);
sigprocmask(SIG_BLOCK, &nmask, &omask); sigprocmask(SIG_BLOCK, &nmask, &omask);
if ((pid = fork()) == 0) if ((pid = fork()) == 0) {
{
/* Clean up */ /* Clean up */
close(0); close(0);
close(1); close(1);
@@ -539,8 +549,7 @@ static pid_t run(struct init_action *a)
signal(SIGCHLD, SIG_DFL); signal(SIGCHLD, SIG_DFL);
/* Wait for child to exit */ /* Wait for child to exit */
while ((tmp_pid = waitpid(pid, &junk, 0)) != pid) while ((tmp_pid = waitpid(pid, &junk, 0)) != pid);
;
/* See if stealing the controlling tty back is necessary */ /* See if stealing the controlling tty back is necessary */
pgrp = tcgetpgrp(0); pgrp = tcgetpgrp(0);
@@ -578,8 +587,7 @@ static pid_t run(struct init_action *a)
/* Convert command (char*) into cmd (char**, one word per string) */ /* Convert command (char*) into cmd (char**, one word per string) */
strcpy(buf, a->command); strcpy(buf, a->command);
s = buf; s = buf;
for (tmpCmd = buf, i = 0; for (tmpCmd = buf, i = 0; (tmpCmd = strsep(&s, " \t")) != NULL;) {
(tmpCmd = strsep(&s, " \t")) != NULL;) {
if (*tmpCmd != '\0') { if (*tmpCmd != '\0') {
cmd[i] = tmpCmd; cmd[i] = tmpCmd;
i++; i++;
@@ -624,7 +632,8 @@ static pid_t run(struct init_action *a)
* be allowed to start a shell or whatever an init script * be allowed to start a shell or whatever an init script
* specifies. * specifies.
*/ */
messageND(LOG, "Waiting for enter to start '%s' (pid %d, terminal %s)\n", messageND(LOG,
"Waiting for enter to start '%s' (pid %d, terminal %s)\n",
cmdpath, getpid(), a->terminal); cmdpath, getpid(), a->terminal);
write(fileno(stdout), press_enter, sizeof(press_enter) - 1); write(fileno(stdout), press_enter, sizeof(press_enter) - 1);
getc(stdin); getc(stdin);
@@ -637,6 +646,7 @@ static pid_t run(struct init_action *a)
#if defined CONFIG_FEATURE_INIT_COREDUMPS #if defined CONFIG_FEATURE_INIT_COREDUMPS
if (stat(CORE_ENABLE_FLAG_FILE, &sb) == 0) { if (stat(CORE_ENABLE_FLAG_FILE, &sb) == 0) {
struct rlimit limit; struct rlimit limit;
limit.rlim_cur = RLIM_INFINITY; limit.rlim_cur = RLIM_INFINITY;
limit.rlim_max = RLIM_INFINITY; limit.rlim_max = RLIM_INFINITY;
setrlimit(RLIMIT_CORE, &limit); setrlimit(RLIMIT_CORE, &limit);
@@ -681,7 +691,8 @@ static void run_actions(int action)
for (a = init_action_list; a; a = tmp) { for (a = init_action_list; a; a = tmp) {
tmp = a->next; tmp = a->next;
if (a->action == action) { if (a->action == action) {
if (a->action & (SYSINIT|WAIT|CTRLALTDEL|SHUTDOWN|RESTART)) { if (a->
action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
waitfor(a); waitfor(a);
delete_init_action(a); delete_init_action(a);
} else if (a->action & ONCE) { } else if (a->action & ONCE) {
@@ -829,7 +840,8 @@ static void stop_handler(int sig)
int saved_errno = errno; int saved_errno = errno;
got_cont = 0; got_cont = 0;
while(!got_cont) pause(); while (!got_cont)
pause();
got_cont = 0; got_cont = 0;
errno = saved_errno; errno = saved_errno;
} }
@@ -872,8 +884,8 @@ static void new_init_action(int action, char *command, char *cons)
new_action->action = action; new_action->action = action;
strcpy(new_action->terminal, cons); strcpy(new_action->terminal, cons);
new_action->pid = 0; new_action->pid = 0;
// message(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n", /* message(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n",
// new_action->command, new_action->action, new_action->terminal); new_action->command, new_action->action, new_action->terminal); */
} }
static void delete_init_action(struct init_action *action) static void delete_init_action(struct init_action *action)
@@ -899,12 +911,13 @@ static void delete_init_action(struct init_action * action)
* of "askfirst" shells). If CONFIG_FEATURE_USE_INITTAB * of "askfirst" shells). If CONFIG_FEATURE_USE_INITTAB
* _is_ defined, but /etc/inittab is missing, this * _is_ defined, but /etc/inittab is missing, this
* results in the same set of default behaviors. * results in the same set of default behaviors.
* */ */
static void parse_inittab(void) static void parse_inittab(void)
{ {
#ifdef CONFIG_FEATURE_USE_INITTAB #ifdef CONFIG_FEATURE_USE_INITTAB
FILE *file; FILE *file;
char buf[INIT_BUFFS_SIZE], lineAsRead[INIT_BUFFS_SIZE], tmpConsole[INIT_BUFFS_SIZE]; char buf[INIT_BUFFS_SIZE], lineAsRead[INIT_BUFFS_SIZE],
tmpConsole[INIT_BUFFS_SIZE];
char *id, *runlev, *action, *command, *eol; char *id, *runlev, *action, *command, *eol;
const struct init_action_type *a = actions; const struct init_action_type *a = actions;
int foundIt; int foundIt;
@@ -1020,6 +1033,7 @@ extern int init_main(int argc, char **argv)
if (argc > 1 && !strcmp(argv[1], "-q")) { if (argc > 1 && !strcmp(argv[1], "-q")) {
/* don't assume init's pid == 1 */ /* don't assume init's pid == 1 */
long *pid = find_pid_by_name("init"); long *pid = find_pid_by_name("init");
if (!pid || *pid <= 0) { if (!pid || *pid <= 0) {
pid = find_pid_by_name("linuxrc"); pid = find_pid_by_name("linuxrc");
if (!pid || *pid <= 0) if (!pid || *pid <= 0)
@@ -1028,15 +1042,13 @@ extern int init_main(int argc, char **argv)
kill(*pid, SIGHUP); kill(*pid, SIGHUP);
exit(0); exit(0);
} }
#ifndef DEBUG_INIT #ifndef DEBUG_INIT
/* Expect to be invoked as init with PID=1 or be invoked as linuxrc */ /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */
if (getpid() != 1 if (getpid() != 1
#ifdef CONFIG_FEATURE_INITRD #ifdef CONFIG_FEATURE_INITRD
&& strstr(applet_name, "linuxrc") == NULL && strstr(applet_name, "linuxrc") == NULL
#endif #endif
) ) {
{
show_usage(); show_usage();
} }
/* Set up sig handlers -- be sure to /* Set up sig handlers -- be sure to
@@ -1118,7 +1130,8 @@ extern int init_main(int argc, char **argv)
/* If there is nothing else to do, stop */ /* If there is nothing else to do, stop */
if (init_action_list == NULL) { if (init_action_list == NULL) {
message(LOG | CONSOLE, "\rNo more tasks for init -- sleeping forever.\n"); message(LOG | CONSOLE,
"\rNo more tasks for init -- sleeping forever.\n");
loop_forever(); loop_forever();
} }

25
networking/ifconfig.c
View File

@@ -15,7 +15,7 @@
* Foundation; either version 2 of the License, or (at * Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* $Id: ifconfig.c,v 1.18 2002/07/11 11:11:52 andersen Exp $ * $Id: ifconfig.c,v 1.19 2002/08/22 18:22:10 bug1 Exp $
* *
*/ */
@@ -34,8 +34,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> // strcmp and friends #include <string.h> /* strcmp and friends */
#include <ctype.h> // isdigit and friends #include <ctype.h> /* isdigit and friends */
#include <stddef.h> /* offsetof */ #include <stddef.h> /* offsetof */
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <net/if_arp.h> #include <net/if_arp.h>
@@ -264,6 +264,7 @@ int ifconfig_main(int argc, char **argv)
{ {
struct ifreq ifr; struct ifreq ifr;
struct sockaddr_in sai; struct sockaddr_in sai;
#if CONFIG_FEATURE_IPV6 #if CONFIG_FEATURE_IPV6
struct sockaddr_in6 sai6; struct sockaddr_in6 sai6;
#endif #endif
@@ -299,7 +300,8 @@ int ifconfig_main(int argc, char **argv)
#ifdef CONFIG_FEATURE_IFCONFIG_STATUS #ifdef CONFIG_FEATURE_IFCONFIG_STATUS
return display_interfaces(argc ? *argv : NULL); return display_interfaces(argc ? *argv : NULL);
#else #else
error_msg_and_die( "ifconfig was not compiled with interface status display support."); error_msg_and_die
("ifconfig was not compiled with interface status display support.");
#endif #endif
} }
@@ -381,15 +383,18 @@ int ifconfig_main(int argc, char **argv)
sai.sin_addr.s_addr = INADDR_ANY; sai.sin_addr.s_addr = INADDR_ANY;
#if CONFIG_FEATURE_IPV6 #if CONFIG_FEATURE_IPV6
} else } else
if (inet_pton(AF_INET6, host, &sai6.sin6_addr) > 0) { if (inet_pton(AF_INET6, host, &sai6.sin6_addr) >
0) {
int sockfd6; int sockfd6;
struct in6_ifreq ifr6; struct in6_ifreq ifr6;
memcpy((char *) &ifr6.ifr6_addr, (char *) &sai6.sin6_addr, memcpy((char *) &ifr6.ifr6_addr,
(char *) &sai6.sin6_addr,
sizeof(struct in6_addr)); sizeof(struct in6_addr));
/* Create a channel to the NET kernel. */ /* Create a channel to the NET kernel. */
if ((sockfd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { if ((sockfd6 =
socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
perror_msg_and_die("socket6"); perror_msg_and_die("socket6");
} }
if (ioctl(sockfd6, SIOGIFINDEX, &ifr) < 0) { if (ioctl(sockfd6, SIOGIFINDEX, &ifr) < 0) {
@@ -430,6 +435,7 @@ int ifconfig_main(int argc, char **argv)
p, sizeof(struct sockaddr)); p, sizeof(struct sockaddr));
} else { } else {
unsigned int i = strtoul(*argv, NULL, 0); unsigned int i = strtoul(*argv, NULL, 0);
p = ((char *) (&ifr)) + a1op->ifr_offset; p = ((char *) (&ifr)) + a1op->ifr_offset;
#ifdef CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ #ifdef CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
if (mask & A_MAP_TYPE) { if (mask & A_MAP_TYPE) {
@@ -458,7 +464,6 @@ int ifconfig_main(int argc, char **argv)
++goterr; ++goterr;
continue; continue;
} }
#ifdef QUESTIONABLE_ALIAS_CASE #ifdef QUESTIONABLE_ALIAS_CASE
if (mask & A_COLON_CHK) { if (mask & A_COLON_CHK) {
/* /*
@@ -470,6 +475,7 @@ int ifconfig_main(int argc, char **argv)
*/ */
char *ptr; char *ptr;
short int found_colon = 0; short int found_colon = 0;
for (ptr = ifr.ifr_name; *ptr; ptr++) { for (ptr = ifr.ifr_name; *ptr; ptr++) {
if (*ptr == ':') { if (*ptr == ':') {
found_colon++; found_colon++;
@@ -512,8 +518,7 @@ int ifconfig_main(int argc, char **argv)
#ifdef CONFIG_FEATURE_IFCONFIG_HW #ifdef CONFIG_FEATURE_IFCONFIG_HW
/* Input an Ethernet address and convert to binary. */ /* Input an Ethernet address and convert to binary. */
static int static int in_ether(char *bufp, struct sockaddr *sap)
in_ether(char *bufp, struct sockaddr *sap)
{ {
unsigned char *ptr; unsigned char *ptr;
int i, j; int i, j;