aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-06-02 20:56:16 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-06-02 20:56:16 +0000
commite15d7573a1263fb364d1678c3a46be47a8b5e5ea (patch)
tree09e7b482b38ac571a01e936fb91df16dd1eeef42 /init
parentecae66ac16338d8cddb55e1782ebd8c5f670ff53 (diff)
downloadbusybox-e15d7573a1263fb364d1678c3a46be47a8b5e5ea.tar.gz
busybox-e15d7573a1263fb364d1678c3a46be47a8b5e5ea.tar.bz2
- move #include busybox.h to the very top so we pull in the config
and eventual platform specific includes in early.
Diffstat (limited to 'init')
-rw-r--r--init/halt.c5
-rw-r--r--init/init_shared.c2
-rw-r--r--init/init_shared.h6
-rw-r--r--init/mesg.c21
4 files changed, 14 insertions, 20 deletions
diff --git a/init/halt.c b/init/halt.c
index f3627f206..d1f561b63 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -7,10 +7,9 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
+#include "busybox.h"
#include <signal.h>
#include <sys/reboot.h>
-#include "busybox.h"
-
#include <unistd.h>
int halt_main(int argc, char *argv[])
@@ -40,7 +39,7 @@ RB_AUTOBOOT
flags = bb_getopt_ulflags(argc, argv, "d:nf", &delay);
if (flags&1) sleep(atoi(delay));
if (!(flags&2)) sync();
-
+
/* Perform action. */
if (ENABLE_INIT && !(flags & 4)) {
if (ENABLE_FEATURE_INITRD) {
diff --git a/init/init_shared.c b/init/init_shared.c
index 722d57c6f..0abe72fdf 100644
--- a/init/init_shared.c
+++ b/init/init_shared.c
@@ -7,6 +7,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
+#include "busybox.h"
#include <signal.h>
#include <stdlib.h>
#include <sys/types.h>
@@ -14,7 +15,6 @@
#include <getopt.h>
#include <sys/reboot.h>
#include <sys/syslog.h>
-#include "busybox.h"
#include "init_shared.h"
const char * const init_sending_format = "Sending SIG%s to all processes.";
diff --git a/init/init_shared.h b/init/init_shared.h
index 0f3fe5b48..6df8de484 100644
--- a/init/init_shared.h
+++ b/init/init_shared.h
@@ -1,3 +1,9 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Helper functions shared by init et al.
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
extern int kill_init(int sig);
extern int bb_shutdown_system(unsigned long magic);
extern const char * const init_sending_format;
diff --git a/init/mesg.c b/init/mesg.c
index 874c22089..7e47644c3 100644
--- a/init/mesg.c
+++ b/init/mesg.c
@@ -1,26 +1,15 @@
+/* vi: set sw=4 ts=4: */
/*
- * mesg implementation for busybox
+ * mesg implementation for busybox
*
- * Copyright (c) 2002 Manuel Novoa III <mjn3@codepoet.org>
+ * Copyright (c) 2002 Manuel Novoa III <mjn3@codepoet.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
+#include "busybox.h"
#include <unistd.h>
#include <stdlib.h>
-#include "busybox.h"
#ifdef USE_TTY_GROUP
#define S_IWGRP_OR_S_IWOTH S_IWGRP