move utmp.h include to libbb.h

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-01-25 23:21:46 +01:00
parent 9aa599dc9d
commit 8d0e0cdadf
16 changed files with 25 additions and 39 deletions

View File

@ -284,17 +284,6 @@ config FEATURE_CLEAN_UP
Don't enable this unless you have a really good reason to clean
things up manually.
config FEATURE_WTMP
bool "Support wtmp file"
default y
select FEATURE_UTMP
help
The file /var/run/wtmp is used to track when users have logged into
and logged out of the system.
With this option on, certain applets (getty, login, telnetd etc)
will append new entries there.
"last" applet requires this option.
config FEATURE_UTMP
bool "Support utmp file"
default y
@ -304,6 +293,17 @@ config FEATURE_UTMP
will create and delete entries there.
"who" applet requires this option.
config FEATURE_WTMP
bool "Support wtmp file"
default y
depends on FEATURE_UTMP
help
The file /var/run/wtmp is used to track when users have logged into
and logged out of the system.
With this option on, certain applets (getty, login, telnetd etc)
will append new entries there.
"last" applet requires this option.
config FEATURE_PIDFILE
bool "Support writing pidfiles"
default y

View File

@ -19,7 +19,6 @@
/* BB_AUDIT SUSv3 _NOT_ compliant -- missing options -b, -d, -l, -m, -p, -q, -r, -s, -t, -T, -u; Missing argument 'file'. */
#include "libbb.h"
#include <utmp.h>
static void idle_string(char *str6, time_t t)
{

View File

@ -50,6 +50,9 @@
# include <selinux/flask.h>
# include <selinux/av_permissions.h>
#endif
#if ENABLE_FEATURE_UTMP
# include <utmp.h>
#endif
#if ENABLE_LOCALE_SUPPORT
# include <locale.h>
#else

View File

@ -74,7 +74,6 @@
#if ENABLE_FEATURE_WTMP
#include <sys/utsname.h>
#include <utmp.h>
static void write_wtmp(void)
{

View File

@ -115,9 +115,6 @@
#ifdef __linux__
#include <linux/vt.h>
#endif
#if ENABLE_FEATURE_UTMP
# include <utmp.h> /* DEAD_PROCESS */
#endif
#include "reboot.h" /* reboot() constants */
/* Used only for sanitizing purposes in set_sane_term() below. On systems where

View File

@ -48,7 +48,7 @@ const int const_int_1 = 1;
* and it will end up in bss */
const int const_int_0 = 0;
#include <utmp.h>
#if ENABLE_FEATURE_WTMP
/* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */
const char bb_path_wtmp_file[] ALIGN1 =
# if defined _PATH_WTMP
@ -58,6 +58,7 @@ const char bb_path_wtmp_file[] ALIGN1 =
# else
# error unknown path to wtmp file
# endif
#endif
/* We use it for "global" data via *(struct global*)&bb_common_bufsiz1.
* Since gcc insists on aligning struct global's members, it would be a pity

View File

@ -7,7 +7,6 @@
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
#include "libbb.h"
#include <utmp.h>
static void touch(const char *filename)
{

View File

@ -78,11 +78,11 @@ static void addgroup_wrapper(struct passwd *p, const char *group_name)
free(cmd);
}
static void passwd_wrapper(const char *login) NORETURN;
static void passwd_wrapper(const char *login_name) NORETURN;
static void passwd_wrapper(const char *login)
static void passwd_wrapper(const char *login_name)
{
BB_EXECLP("passwd", "passwd", login, NULL);
BB_EXECLP("passwd", "passwd", login_name, NULL);
bb_error_msg_and_die("can't execute passwd, you must set password manually");
}

View File

@ -24,9 +24,6 @@
#include "libbb.h"
#include <syslog.h>
#if ENABLE_FEATURE_UTMP
# include <utmp.h> /* LOGIN_PROCESS */
#endif
#ifndef IUCLC
# define IUCLC 0
#endif

View File

@ -4,9 +4,6 @@
*/
#include "libbb.h"
#include <syslog.h>
#if ENABLE_FEATURE_UTMP
# include <utmp.h> /* USER_PROCESS */
#endif
#include <sys/resource.h>
#if ENABLE_SELINUX

View File

@ -8,7 +8,6 @@
*/
#include "libbb.h"
#include <utmp.h>
/* NB: ut_name and ut_user are the same field, use only one name (ut_user)
* to reduce confusion */

View File

@ -8,7 +8,6 @@
*/
#include "libbb.h"
#include <utmp.h>
/* NB: ut_name and ut_user are the same field, use only one name (ut_user)
* to reduce confusion */

View File

@ -12,7 +12,6 @@
* initially busyboxified by Bernhard Reutner-Fischer
*/
#include "libbb.h"
#include <utmp.h>
int runlevel_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int runlevel_main(int argc UNUSED_PARAM, char **argv)

View File

@ -7,7 +7,6 @@
*/
#include "libbb.h"
#include <utmp.h>
int wall_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int wall_main(int argc UNUSED_PARAM, char **argv)

View File

@ -31,10 +31,6 @@
#endif
#include <arpa/telnet.h>
#if ENABLE_FEATURE_UTMP
# include <utmp.h> /* LOGIN_PROCESS */
#endif
struct tsession {
struct tsession *next;

View File

@ -4944,6 +4944,8 @@ stoppedjobs(void)
* Code for dealing with input/output redirection.
*/
#undef EMPTY
#undef CLOSED
#define EMPTY -2 /* marks an unused slot in redirtab */
#define CLOSED -3 /* marks a slot of previously-closed fd */