CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-07-28 19:39:52 +02:00
Code Issues Projects Releases Wiki Activity

(UT_TYPE_UNDEF, UT_TYPE, IS_USER_PROCESS): Define.

Browse Source 
(print_line): Use "%-8.8s" for the format: the user name is not
always NUL terminated.
(scan_entries) [need_users]: Use IS_USER_PROCESS, so that this works
even on systems without ut_type.
This commit is contained in:
Jim Meyering
2002-04-16 10:39:29 +00:00
parent aef17cff0f
commit 6f0db0ac6e
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/who.c
+16 -3
View File
@@ -106,6 +106,20 @@
# define UT_EXIT_E_EXIT(U) 0
#endif
#define UT_TYPE_UNDEF 255
#if HAVE_STRUCT_XTMP_UT_TYPE
# define UT_TYPE(U) ((U)->ut_type)
#else
# define UT_TYPE(U) UT_TYPE_UNDEF
#endif
#define IS_USER_PROCESS(U) \
(UT_USER (utmp_buf)[0] \
&& (UT_TYPE (utmp_buf) == USER_PROCESS \
|| (UT_TYPE (utmp_buf) == UT_TYPE_UNDEF \
&& UT_TIME_MEMBER (utmp_buf) != 0)))
int gethostname ();
char *ttyname ();
char *canon_host ();
@@ -244,7 +258,7 @@ print_line (const char *user, const char state, const char *line,
const char *time_str, const char *idle, const char *pid,
const char *comment, const char *exitstr)
{
printf ("%-8s", user ? user : " .");
printf ("%-8.8s", user ? user : " .");
if (include_mesg)
printf (" %c", state);
printf (" %-12s", line);
@@ -517,8 +531,7 @@ scan_entries (int n, const STRUCT_UTMP *utmp_buf)
strncmp (ttyname_b, utmp_buf->ut_line,
sizeof (utmp_buf->ut_line)) == 0)
{
if (need_users && UT_USER (utmp_buf)[0]
&& UT_TYPE (utmp_buf) == USER_PROCESS)
if (need_users && IS_USER_PROCESS (utmp_buf))
print_user (utmp_buf);
else if (need_runlevel && UT_TYPE (utmp_buf) == RUN_LVL)
print_runlevel (utmp_buf);