Run through indent, fix comments
This commit is contained in:
Glenn L McGrath
parent
e3906fcd94
commit
baf55a85fc
67
init/init.c
67
init/init.c
@ -162,12 +162,14 @@ static struct init_action *init_action_list = NULL;
|
||||
static int kernelVersion = 0;
|
||||
static char termType[32] = "TERM=linux";
|
||||
static char console[32] = _PATH_CONSOLE;
|
||||
|
||||
#ifndef CONFIG_SYSLOGD
|
||||
static char *log = VC_5;
|
||||
#endif
|
||||
static sig_atomic_t got_cont = 0;
|
||||
static const int LOG = 0x1;
|
||||
static const int CONSOLE = 0x2;
|
||||
|
||||
#if defined CONFIG_FEATURE_EXTRA_QUIET
|
||||
static const int MAYBE_CONSOLE = 0x0;
|
||||
#else
|
||||
@ -177,6 +179,7 @@ static const int MAYBE_CONSOLE = 0x0;
|
||||
static const int RB_HALT_SYSTEM = 0xcdef0123;
|
||||
static const int RB_ENABLE_CAD = 0x89abcdef;
|
||||
static const int RB_DISABLE_CAD = 0;
|
||||
|
||||
#define RB_POWER_OFF 0x4321fedc
|
||||
static const int RB_AUTOBOOT = 0x01234567;
|
||||
#endif
|
||||
@ -195,11 +198,14 @@ static void loop_forever(void)
|
||||
/* Print a message to the specified device.
|
||||
* Device may be bitwise-or'd from LOG | CONSOLE */
|
||||
#ifdef DEBUG_INIT
|
||||
static inline messageND(int device, char *fmt, ...) { }
|
||||
static inline messageND(int device, char *fmt, ...)
|
||||
{
|
||||
}
|
||||
#else
|
||||
#define messageND message
|
||||
#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, ...)
|
||||
{
|
||||
va_list arguments;
|
||||
@ -237,9 +243,9 @@ static void message(int device, char *fmt, ...)
|
||||
|
||||
if (device & CONSOLE) {
|
||||
/* Always send console messages to /dev/console so people will see them. */
|
||||
if (
|
||||
(fd =
|
||||
device_open(_PATH_CONSOLE, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0) {
|
||||
if ((fd =
|
||||
device_open(_PATH_CONSOLE,
|
||||
O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0) {
|
||||
va_start(arguments, fmt);
|
||||
vdprintf(fd, fmt, 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.4.0 return info.mem_unit in bytes. */
|
||||
u = info.mem_unit;
|
||||
if (u==0) u=1;
|
||||
while ( (u&1) == 0 && s > 0 ) { u>>=1; s--; }
|
||||
if (u == 0)
|
||||
u = 1;
|
||||
while ((u & 1) == 0 && s > 0) {
|
||||
u >>= 1;
|
||||
s--;
|
||||
}
|
||||
result = (info.totalram >> s) + (info.totalswap >> s);
|
||||
result = result * u;
|
||||
if (result < 0) result = INT_MAX;
|
||||
if (result < 0)
|
||||
result = INT_MAX;
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -389,6 +400,7 @@ static void console_init(void)
|
||||
static void fixup_argv(int argc, char **argv, char *new_argv0)
|
||||
{
|
||||
int len;
|
||||
|
||||
/* Fix up argv[0] to be certain we claim to be init */
|
||||
len = strlen(argv[0]);
|
||||
memset(argv[0], 0, len);
|
||||
@ -425,8 +437,7 @@ static void check_memory(void)
|
||||
#endif
|
||||
|
||||
goodnight:
|
||||
message(CONSOLE,
|
||||
"\rSorry, your computer does not have enough memory.\n");
|
||||
message(CONSOLE, "\rSorry, your computer does not have enough memory.\n");
|
||||
loop_forever();
|
||||
}
|
||||
|
||||
@ -470,8 +481,7 @@ static pid_t run(struct init_action *a)
|
||||
sigaddset(&nmask, SIGCHLD);
|
||||
sigprocmask(SIG_BLOCK, &nmask, &omask);
|
||||
|
||||
if ((pid = fork()) == 0)
|
||||
{
|
||||
if ((pid = fork()) == 0) {
|
||||
/* Clean up */
|
||||
close(0);
|
||||
close(1);
|
||||
@ -539,8 +549,7 @@ static pid_t run(struct init_action *a)
|
||||
signal(SIGCHLD, SIG_DFL);
|
||||
|
||||
/* 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 */
|
||||
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) */
|
||||
strcpy(buf, a->command);
|
||||
s = buf;
|
||||
for (tmpCmd = buf, i = 0;
|
||||
(tmpCmd = strsep(&s, " \t")) != NULL;) {
|
||||
for (tmpCmd = buf, i = 0; (tmpCmd = strsep(&s, " \t")) != NULL;) {
|
||||
if (*tmpCmd != '\0') {
|
||||
cmd[i] = tmpCmd;
|
||||
i++;
|
||||
@ -624,7 +632,8 @@ static pid_t run(struct init_action *a)
|
||||
* be allowed to start a shell or whatever an init script
|
||||
* 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);
|
||||
write(fileno(stdout), press_enter, sizeof(press_enter) - 1);
|
||||
getc(stdin);
|
||||
@ -637,6 +646,7 @@ static pid_t run(struct init_action *a)
|
||||
#if defined CONFIG_FEATURE_INIT_COREDUMPS
|
||||
if (stat(CORE_ENABLE_FLAG_FILE, &sb) == 0) {
|
||||
struct rlimit limit;
|
||||
|
||||
limit.rlim_cur = RLIM_INFINITY;
|
||||
limit.rlim_max = RLIM_INFINITY;
|
||||
setrlimit(RLIMIT_CORE, &limit);
|
||||
@ -681,7 +691,8 @@ static void run_actions(int action)
|
||||
for (a = init_action_list; a; a = tmp) {
|
||||
tmp = a->next;
|
||||
if (a->action == action) {
|
||||
if (a->action & (SYSINIT|WAIT|CTRLALTDEL|SHUTDOWN|RESTART)) {
|
||||
if (a->
|
||||
action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
|
||||
waitfor(a);
|
||||
delete_init_action(a);
|
||||
} else if (a->action & ONCE) {
|
||||
@ -829,7 +840,8 @@ static void stop_handler(int sig)
|
||||
int saved_errno = errno;
|
||||
|
||||
got_cont = 0;
|
||||
while(!got_cont) pause();
|
||||
while (!got_cont)
|
||||
pause();
|
||||
got_cont = 0;
|
||||
errno = saved_errno;
|
||||
}
|
||||
@ -872,8 +884,8 @@ static void new_init_action(int action, char *command, char *cons)
|
||||
new_action->action = action;
|
||||
strcpy(new_action->terminal, cons);
|
||||
new_action->pid = 0;
|
||||
// message(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n",
|
||||
// new_action->command, new_action->action, new_action->terminal);
|
||||
/* message(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n",
|
||||
new_action->command, new_action->action, new_action->terminal); */
|
||||
}
|
||||
|
||||
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
|
||||
* _is_ defined, but /etc/inittab is missing, this
|
||||
* results in the same set of default behaviors.
|
||||
* */
|
||||
*/
|
||||
static void parse_inittab(void)
|
||||
{
|
||||
#ifdef CONFIG_FEATURE_USE_INITTAB
|
||||
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;
|
||||
const struct init_action_type *a = actions;
|
||||
int foundIt;
|
||||
@ -1020,6 +1033,7 @@ extern int init_main(int argc, char **argv)
|
||||
if (argc > 1 && !strcmp(argv[1], "-q")) {
|
||||
/* don't assume init's pid == 1 */
|
||||
long *pid = find_pid_by_name("init");
|
||||
|
||||
if (!pid || *pid <= 0) {
|
||||
pid = find_pid_by_name("linuxrc");
|
||||
if (!pid || *pid <= 0)
|
||||
@ -1028,15 +1042,13 @@ extern int init_main(int argc, char **argv)
|
||||
kill(*pid, SIGHUP);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
#ifndef DEBUG_INIT
|
||||
/* Expect to be invoked as init with PID=1 or be invoked as linuxrc */
|
||||
if (getpid() != 1
|
||||
#ifdef CONFIG_FEATURE_INITRD
|
||||
&& strstr(applet_name, "linuxrc") == NULL
|
||||
#endif
|
||||
)
|
||||
{
|
||||
) {
|
||||
show_usage();
|
||||
}
|
||||
/* 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 (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();
|
||||
}
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* Foundation; either version 2 of the License, or (at
|
||||
* 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 <stdlib.h>
|
||||
#include <string.h> // strcmp and friends
|
||||
#include <ctype.h> // isdigit and friends
|
||||
#include <string.h> /* strcmp and friends */
|
||||
#include <ctype.h> /* isdigit and friends */
|
||||
#include <stddef.h> /* offsetof */
|
||||
#include <sys/ioctl.h>
|
||||
#include <net/if_arp.h>
|
||||
@ -264,6 +264,7 @@ int ifconfig_main(int argc, char **argv)
|
||||
{
|
||||
struct ifreq ifr;
|
||||
struct sockaddr_in sai;
|
||||
|
||||
#if CONFIG_FEATURE_IPV6
|
||||
struct sockaddr_in6 sai6;
|
||||
#endif
|
||||
@ -299,7 +300,8 @@ int ifconfig_main(int argc, char **argv)
|
||||
#ifdef CONFIG_FEATURE_IFCONFIG_STATUS
|
||||
return display_interfaces(argc ? *argv : NULL);
|
||||
#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
|
||||
}
|
||||
|
||||
@ -381,15 +383,18 @@ int ifconfig_main(int argc, char **argv)
|
||||
sai.sin_addr.s_addr = INADDR_ANY;
|
||||
#if CONFIG_FEATURE_IPV6
|
||||
} else
|
||||
if (inet_pton(AF_INET6, host, &sai6.sin6_addr) > 0) {
|
||||
if (inet_pton(AF_INET6, host, &sai6.sin6_addr) >
|
||||
0) {
|
||||
int sockfd6;
|
||||
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));
|
||||
|
||||
/* 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");
|
||||
}
|
||||
if (ioctl(sockfd6, SIOGIFINDEX, &ifr) < 0) {
|
||||
@ -430,6 +435,7 @@ int ifconfig_main(int argc, char **argv)
|
||||
p, sizeof(struct sockaddr));
|
||||
} else {
|
||||
unsigned int i = strtoul(*argv, NULL, 0);
|
||||
|
||||
p = ((char *) (&ifr)) + a1op->ifr_offset;
|
||||
#ifdef CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
|
||||
if (mask & A_MAP_TYPE) {
|
||||
@ -458,7 +464,6 @@ int ifconfig_main(int argc, char **argv)
|
||||
++goterr;
|
||||
continue;
|
||||
}
|
||||
|
||||
#ifdef QUESTIONABLE_ALIAS_CASE
|
||||
if (mask & A_COLON_CHK) {
|
||||
/*
|
||||
@ -470,6 +475,7 @@ int ifconfig_main(int argc, char **argv)
|
||||
*/
|
||||
char *ptr;
|
||||
short int found_colon = 0;
|
||||
|
||||
for (ptr = ifr.ifr_name; *ptr; ptr++) {
|
||||
if (*ptr == ':') {
|
||||
found_colon++;
|
||||
@ -512,8 +518,7 @@ int ifconfig_main(int argc, char **argv)
|
||||
|
||||
#ifdef CONFIG_FEATURE_IFCONFIG_HW
|
||||
/* Input an Ethernet address and convert to binary. */
|
||||
static int
|
||||
in_ether(char *bufp, struct sockaddr *sap)
|
||||
static int in_ether(char *bufp, struct sockaddr *sap)
|
||||
{
|
||||
unsigned char *ptr;
|
||||
int i, j;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user