diff options
Diffstat (limited to 'login')
| -rw-r--r-- | login/Makefile | 2 | ||||
| -rw-r--r-- | login/getutent_r.c | 6 | ||||
| -rw-r--r-- | login/getutid_r.c | 2 | ||||
| -rw-r--r-- | login/getutline_r.c | 2 | ||||
| -rw-r--r-- | login/lastlog.h | 2 | ||||
| -rw-r--r-- | login/logout.c | 2 | ||||
| -rw-r--r-- | login/pty.h | 4 | ||||
| -rw-r--r-- | login/utmp-private.h | 3 | ||||
| -rw-r--r-- | login/utmp.h | 7 | ||||
| -rw-r--r-- | login/utmpname.c | 2 |
10 files changed, 14 insertions, 18 deletions
diff --git a/login/Makefile b/login/Makefile index e4f9a9e9be..6ee21d2285 100644 --- a/login/Makefile +++ b/login/Makefile @@ -22,7 +22,7 @@ subdir := login -headers := utmp.h utmpbits.h lastlog.h pty.h +headers := utmp.h bits/utmp.h lastlog.h pty.h routines := getutent getutent_r getutid getutline getutid_r getutline_r \ utmp_file utmp_daemon utmpname updwtmp diff --git a/login/getutent_r.c b/login/getutent_r.c index 9e1d4e8768..340e4747bd 100644 --- a/login/getutent_r.c +++ b/login/getutent_r.c @@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA. */ #include <assert.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <stdio.h> #include <string.h> #include <unistd.h> @@ -52,7 +52,7 @@ struct utfuncs *__libc_utmp_jump_table = &__libc_utmp_unknown_functions; /* We need to protect the opening of the file. */ __libc_lock_define_initialized (, __libc_utmp_lock) - + void __setutent (void) { @@ -90,7 +90,7 @@ setutent_unknown (int reset) (*__libc_utmp_file_functions.setutent) (reset); __libc_utmp_jump_table = &__libc_utmp_file_functions; } - + return 0; } diff --git a/login/getutid_r.c b/login/getutid_r.c index 52b83cd862..ee3a39a3bd 100644 --- a/login/getutid_r.c +++ b/login/getutid_r.c @@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA. */ #include <errno.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <string.h> #include <unistd.h> #include <utmp.h> diff --git a/login/getutline_r.c b/login/getutline_r.c index 2285248ece..9b4180fe4a 100644 --- a/login/getutline_r.c +++ b/login/getutline_r.c @@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA. */ #include <errno.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <string.h> #include <unistd.h> #include <utmp.h> diff --git a/login/lastlog.h b/login/lastlog.h index f2443eb702..8cc4254364 100644 --- a/login/lastlog.h +++ b/login/lastlog.h @@ -1,4 +1,4 @@ /* This header file is used in 4.3BSD to define `struct lastlog', - which we define in <utmpbits.h>. */ + which we define in <bits/utmp.h>. */ #include <utmp.h> diff --git a/login/logout.c b/login/logout.c index 5ab5e618fb..8a406c01ca 100644 --- a/login/logout.c +++ b/login/logout.c @@ -59,7 +59,7 @@ logout (const char *line) ut->ut_type = DEAD_PROCESS; #endif - if (pututline (ut) >= 0) + if (pututline (ut) != NULL) result = 1; } diff --git a/login/pty.h b/login/pty.h index 731ab12d82..0005f10e2d 100644 --- a/login/pty.h +++ b/login/pty.h @@ -18,11 +18,11 @@ Boston, MA 02111-1307, USA. */ #ifndef _PTY_H - #define _PTY_H 1 + #include <features.h> -#include <ioctl-types.h> +#include <bits/ioctl-types.h> #include <termios.h> diff --git a/login/utmp-private.h b/login/utmp-private.h index c5e7742a4d..87860d5d33 100644 --- a/login/utmp-private.h +++ b/login/utmp-private.h @@ -49,6 +49,3 @@ extern struct utfuncs *__libc_utmp_jump_table; extern const char *__libc_utmp_file_name; #endif /* utmp-private.h */ - - - diff --git a/login/utmp.h b/login/utmp.h index 799b1a17ac..82f3fcce9a 100644 --- a/login/utmp.h +++ b/login/utmp.h @@ -16,10 +16,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _UTMP_H +#define _UTMP_H 1 -#ifndef _UTMP_H_ - -#define _UTMP_H_ 1 #include <features.h> #include <sys/types.h> @@ -28,7 +27,7 @@ __BEGIN_DECLS /* Get system dependent values and data structures. */ -#include <utmpbits.h> +#include <bits/utmp.h> /* Compatibility names for the strings of the canonical file names. */ #define UTMP_FILE _PATH_UTMP diff --git a/login/utmpname.c b/login/utmpname.c index 2692b71ff9..c0b6df2ce7 100644 --- a/login/utmpname.c +++ b/login/utmpname.c @@ -17,7 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <stdlib.h> #include <string.h> #include <utmp.h> |