← Commit list

8d0e0cdad

Denys Vlasenko
Denys Vlasenko
2011-01-25
FAILED Duration: 218s

Subject

move utmp.h include to libbb.h

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

Config.in +10 -10coreutils/who.c +0 -1include/libbb.h +3 -0init/halt.c +0 -1init/init.c +0 -3libbb/messages.c +6 -5libbb/utmp.c +0 -1loginutils/adduser.c +3 -3loginutils/getty.c +0 -3loginutils/login.c +0 -3miscutils/last.c +0 -1miscutils/last_fancy.c +0 -1miscutils/runlevel.c +0 -1miscutils/wall.c +0 -1networking/telnetd.c +0 -4shell/ash.c +2 -0
Config.in+10 -10
@@ -284,10 +284,19 @@ config FEATURE_CLEAN_UP
Don't enable this unless you have a really good reason to clean
things up manually.
+config FEATURE_UTMP
+ bool "Support utmp file"
+ default y
+ help
+ The file /var/run/utmp is used to track who is currently logged in.
+ With this option on, certain applets (getty, login, telnetd etc)
+ will create and delete entries there.
+ "who" applet requires this option.
+
config FEATURE_WTMP
bool "Support wtmp file"
default y
- select FEATURE_UTMP
+ 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.
@@ -295,15 +304,6 @@ config FEATURE_WTMP
will append new entries there.
"last" applet requires this option.
-config FEATURE_UTMP
- bool "Support utmp file"
- default y
- help
- The file /var/run/utmp is used to track who is currently logged in.
- With this option on, certain applets (getty, login, telnetd etc)
- will create and delete entries there.
- "who" applet requires this option.
-
config FEATURE_PIDFILE
bool "Support writing pidfiles"
default y
coreutils/who.c+0 -1
@@ -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)
{
include/libbb.h+3 -0
@@ -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
init/halt.c+0 -1
@@ -74,7 +74,6 @@
#if ENABLE_FEATURE_WTMP
#include <sys/utsname.h>
-#include <utmp.h>
static void write_wtmp(void)
{
init/init.c+0 -3
@@ -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
libbb/messages.c+6 -5
@@ -48,15 +48,16 @@ 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
+# if defined _PATH_WTMP
_PATH_WTMP;
-#elif defined WTMP_FILE
+# elif defined WTMP_FILE
WTMP_FILE;
-#else
-#error unknown path to wtmp file
+# else
+# error unknown path to wtmp file
+# endif
#endif
/* We use it for "global" data via *(struct global*)&bb_common_bufsiz1.
libbb/utmp.c+0 -1
@@ -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)
{
loginutils/adduser.c+3 -3
@@ -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");
}
loginutils/getty.c+0 -3
@@ -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
loginutils/login.c+0 -3
@@ -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
miscutils/last.c+0 -1
@@ -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 */
miscutils/last_fancy.c+0 -1
@@ -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 */
miscutils/runlevel.c+0 -1
@@ -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)
miscutils/wall.c+0 -1
@@ -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)
networking/telnetd.c+0 -4
@@ -31,10 +31,6 @@
#endif
#include <arpa/telnet.h>
-#if ENABLE_FEATURE_UTMP
-# include <utmp.h> /* LOGIN_PROCESS */
-#endif
-
struct tsession {
struct tsession *next;
shell/ash.c+2 -0
@@ -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 */