- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Revert r253748,253749

This WIP should not have been committed yet.

Pointyhat to: avg

remove needless inclusion of machine/cpu.h in userland

MFC after: 21 days

- Move 'showthreads' check out of fmt.c.
- Update shadow copy of fmt_argv() prototype in w.c and fix calls for
additional parameter.

Set showthread = 0 for w(1).

X-MFC: together with r245610

Fix whitespace.

MFC after: 1 week

Use CLOCK_UPTIME to get the uptime.

Bump date missed in r202756

PR: docs/171624
Submitted by: bdrewery
Approved by: gabor
MFC after: 3 days

Add missing static keywords to w(1)

Only print entries for which ut_host points to a character device.

Now that we use utmpx, we more often have entries for which the ut_line
is left blank. To prevent us from returning struct stat for "/dev/",
check that the resulting stat structure belongs to a character device.

Remove the advertising clause from UCB copyrighted files in usr.bin. This
is in accordance with the information provided at
ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change

Also add $FreeBSD$ to a few files to keep svn happy.

Discussed with: imp, rwatson

Initialize the execfile argument to NULL instead of _PATH_DEVNULL. This allows the -M option to be used without specifying -N.

PR: bin/138146
Approved by: rrs (mentor)
MFC after: 3 days

Remove stale references to utmp(5) and its corresponding filenames.

I removed utmp and its manpage, but not other manpages referring to it.

Port w(1) to utmpx.

Let it print "-" when the TTY string is empty. In this case, it must
also make sure it doesn't match processes who also have no controlling
TTY. Otherwise it will print random kernel processes when trying to pick
the best matching process.

Eventually it should look at the value of ut_pid as well.

This now passes a make universe with WARNS=6.

Shuffle parens to avoid type-punning warning.

Build usr.bin/ with WARNS=6 by default.

Also add some missing $FreeBSD$ to keep svn happy.

Revert most part of 200420 as requested, as more review and polish is
needed.

Remove unneeded header includes from usr.bin/ except contributed code.

Tested with: make universe

Let w(1) use utmpx.

We don't have UT_*SIZE anymore. One of the reasons for that is because
all strings are null terminated, there is no need for apps to copy
strings out of the utmpx structure. This means we can define W_DISP*SIZE
lengths for all columns.

While there, adjust the sizes a little. Steal some bytes from the
username column, while extending the hostname column quite a bit.

When -n is specified, attempt to turn hostnames found in utmp into IP
addresses, again. However, change a hostname into an IP address, only
when a host has just one A/AAAA RR.

Requested by: candy__at__kgc.co.jp
MFC after: 2 weeks

Constify format string pointer, otherwise this would trigger warning when
higher warning level is enabled.

Fix the problem that the entry broke into two lines with multi-byte
AM/PM format.

Reported by: takawata

w(1) uses strftime %b with to print the abbreviated month name
if a user logged in more than a week ago.
This may contain multibyte characters (e.g. when using UTF-8).
This string is then aligned on byte-length rathern than char-length,
resulting in misalignment and unfinished multibyte characters.

PR: 126657
Submitted by: Johan van Selst <johans@stack.nl>

Fix markup.

Use sysctlbyname

Obtain true uptime through clock_gettime(CLOCK_MONOTONIC, struct *timespec)
instead of subtracting 'bootime' from 'now'.

Sponsored by: TCP/IP Optimization Fundraise 2005

Use the ki_udata field that was recently-added to kinfo_proc, instead of
stealing ki_spare[0] to hold a pointer.

Expand *n't contractions.

Sort sections.

Include <sys/proc.h> instead of depending on namespace pollution in
<sys/user.h> for the definition of TDF_SINTR. Fixed anachronous
spelling of TDF_SINTR in a comment

Demangled VCS ids. There were 2 misplaced copies of $FreeBSD$ and of
the include before it. The vendor id infrastructure was edited.

Fixed the only other remaining style bug since rev.1.1 (expansion of
struct member names made a line too long).

Do not print the result of strftime() in case of failure, the content is
indeterminate in such a case. The correct value for 2nd argument is
sizeof(buf). Do not NUL-terminate the result string, strftime() will do it
for us.

utmp.ut_time is not a time_t, do not pass a pointer to it to pr_attime().

Fix warning when calling w(1) when logged in via xdm/kdm. This is
really a problem with utmp/wtmp, but takes the same approach as who(1).

Reviewed by: knu (mentor), mini, silence on -audit
Approved by: knu (mentor), mini

ANSI style function declarations.

Replace /kernel with /boot/kernel/kernel.

PR: docs/37757
Submitted by: Hiten Pandya <hiten@uk.FreeBSD.org>

remove __P

Back out part of rev 1.51. The lesser impact fix is to just remove
the unused global var.

WARNS=2 fix, use __FBSDID() and sort includes.

WARNS=2 not added to Makefile as it is to become default.

Compensate for "Compensate for header dethreading" by backing it out.

Fixing a bug that causes very short uptimes (less than one minute) to
be 30 seconds off. (Thanks to Vladimir B.Grebenschikov
<vova@express.ru> for the PR and ru for a more elegant fix.)

PR: bin/30680
Approved by: ru

KSE Milestone 2
Note ALL MODULES MUST BE RECOMPILED
make the kernel aware that there are smaller units of scheduling than the
process. (but only allow one thread per process at this time).
This is functionally equivalent to teh previousl -current except
that there is a thread associated with each process.

Sorry john! (your next MFC will be a doosie!)

Reviewed by: peter@freebsd.org, dillon@freebsd.org

X-MFC after: ha ha ha ha

When -n is specified, don't attempt to turn hostnames found in utmp
into addresses as we have no idea what address family they belong to.

When -n is not specified, resolve IPv6 as well as IPv4 addresses found
in the host field of utmp. Use realhostname_sa() to resolve addresses
(the old code was wrong).

Rename ``x'' to ``x_suffix'' to avoid confusion.

Hard code the host column width to 16 (against the imminent increase
of UT_HOSTSIZE in utmp.h).

Remove whitespace at EOL.

mdoc(7) police: removed HISTORY info from the .Os call.

Call kvm_close() before exit for consistency.

PR: 24654
Submitted by: Daniel Hemmerich zartik@yahoo.com

Fix the error buffer passed to kvm_openfiles to have a correct length
of _POSIX2_LINE_MAX.

MFC after: 1 week

Compensate for header dethreading.

MAN[1-9] -> MAN.

Fix width for printing time

Preserve comma as separator when it is not equal to radix character

Don't use "," as load avg. separator because it can be precision point in some
locales, so leads to confusion

Oops, remove tabs sneaked in wrong place

Use AM/PM time only when available in locale

Catch up to proc flag changes.

Hostnames are case-insensitive

If the utmp login time is greater than the tty atime, use it to calculate
the idle time instead of the atime.

This makes entries for people that have logged in but done nothing
else show up correctly.

Reviewed by: markk@knigma.org

Prepare for mdoc(7)NG.

Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.

mdoc(7) police: use the new features of the Nm macro.

Use the same technique as ps(1) to avoid the need for setgid. (ie: use
/dev/null as the default kernel and /dev/mem filenames, but still allow
the usual overrides)

Fix cosmetic bug in time display. Current day logins are now displayed
as plain time as originally intended, instead of displaying DayHH times
when the login time happens to be prior the GMT - TZ difference.
(Only noticable on systems operating east of GMT/UTC).
Local times are now used to determine the day.

$Id$ -> $FreeBSD$

New w ability: you can list multiple users on the command line and it will
match with all of them, rather than only supporting a single user.

PR: 11121
Kinda submitted by: James Howard <howardjp@byzantine.student.umd.edu>
Reviewed by: DES

Add $Id$, to make it simpler for members of the translation teams to
track.

The $Id$ line is normally at the bottom of the main comment block in the
man page, separated from the rest of the manpage by an empty comment,
like so;

.\" $Id$
.\"

If the immediately preceding comment is a @(#) format ID marker than the
the $Id$ will line up underneath it with no intervening blank lines.
Otherwise, an additional blank line is inserted.

Approved by: bde

Clean up some ambiguous nested if/elses.

fix -n with 16-chars hostnames, modified patch from PR

PR: 11286
Submitted by: Hans Huebner <hans@chaosradio.berlin.ccc.de>

Get things right for tty names of length UT_LINESIZE.
Cosmetic: Don't shadow the `p' variable.
Remove two unused variables.
PR: 3638

Fix the annoying bug introduced in rev 1.18 that caused each line to be
one character shorter than the previous in a stairstep fashion when long
idle times were involved.

A couple of nits:
- spelling/typo fix.
- some of the easier style(9) fixes where it was bothering me.
- Handle 100+ days idle time (ha!). Probably the right thing to do is
to do a snprintf into a buffer and strlen the result rather than doing
hackery on magic numbers.

XXX the wide (and mostly unused) username and tty columns annoy me since
it it could be used for more useful information for the command. We should
actually count the largest username and tty and adjust like 'ls -l' does.

No __profname bozoness, no strstr() bozoness... test argv[0] against
"uptime" the right way. Sheesh.

Since argv is in scope, use argv[0] instead of __progname.

Suggested by: bde

Do a better job of determining if we were called as uptime(1).

PR: 8593

Remove unused strvisx.

Cosmetic fix. Compute header field widths from UT_{HOST,LINE,NAME}SIZE
instead of hardcoding header line.

PR: 6325

Allow `w' to treat a corrupted "utmp" as a non fatal error.

PR: bin/2832

Like most Unices FreeBSD should have a larger tty field at least
as large as UT_LINESIZE (/usr/include/utmp.h). If the tty name is logged
with this size why isn't the w command reporting it?

(We should probably report the tty/cua prefix then as well ? /phk)

PR: 4187
Reviewed by: phk
Submitted by: Jorge M. Goncalves <ee96199@tom.fe.up.pt>

Reword using who.1 as a good example of where to start.

Submitted by: bde

Reword the synopsis line so that it makes sense.

-Wall cleanup.

If uptime < 1 min print in in secs otherwise we got confusing message
"up 1 user"

Document newly added -d option and fix usage string

The "-d" option dumps out the entire process list on a per controlling
tty basis, instead of just the top level process.
Submitted by: terry

Revert some casts I introduced.
Requested by: Bruce.

Typo in usage(). Err -> errx when testing allocations.

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

Made sure the string formated by strftime() is properly
null-terminated.

Should go to RELENG_2_1 and RELENG_2_2.

Reviewed by guido@freebsd.org.

Revert $FreeBSD$ to $Id$

Reduce the command field width by one when idle time is > 9 days, to
eliminate unsightly blank line.

Possibly a 2.2 candidate.

Sort cross references.

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

comma typos

Increase username field to reflect utmp changes

Do not print herror message, if w -n gethostname failed to be 100%
compatible with any program
Suggested by: peter

Fix xterm/screen/(any program using just :xxx form) compatibility

Don't try convert "-" to numeric form for -n option

Fix w -n to really show numeric addresses, close PR 402
Partially submitted by: henrich@msu.edu (Charles Henrich)

Drop privileges if not using standard namelist or kernel file.
Submitted by: smpatel (Sujal Patel)

Change locale to LC_ALL, there is no bitmask

Add setlocale LC_TIME|LC_CTYPE

Fix one column wrong offset in previous change days->day

Print "1day" instead of "1days"

Increase the tty column width from 2 to 3 characters.

This gives us more room to breath with tty names, especially with drivers
that support large numbers of ports.. eg: specialix and digiboard.

This does not actually change the current tty names, it just allows room
for reporting more characters if the drivers use them.

Delete bogus referneces to timezone code internal header file `tzfile.h',
which is no longer bogusly installed in /usr/include.

When 'w' finds an IP address in the ut_host field, it attempts to do
a gethostbyname() on it. That can take a long time... (especially
if the reason the IP address is in there in the first place is because
login/rlogind/telnetd couldn't find it either....)
This patch reduces the gethostbyaddr lookup time to 2 seconds, the idea being
that if the local nameserver knows the answer, it'll answer within that time,
otherwise we dont care... :-)
This change doesn't do anything about whether or not w should do this in the
first place, but at least it will make the current behavior less painful.
Reviewed by: David Greenman

Fix the 'w' command so that the -h option correctly supresses the heading
as per the manual page. Closes PR578.
Reviewed by:
Submitted by: Kenneth D. Merry
Obtained from:

Remove trailing whitespace.

If an ut_host field in an utmp entry contains a ':' (e.g. for an xterm session)
w doesn't handle the non-'\0' terminated char arrays in struct utmp properly.

Submitted by: jarle@idt.unit.no

Install with default BINOWN (as it once used to be).

Install setgid kmem rather than setuid root. The problem with procfs that
was breaking this before has been fixed.

Correct the grammar for the label of the number of users.
It is plural when zero and >1 users are logged in.

idle time == 0 printed now as "-" like in good old BSD
skip cua* 3 chars as tty* 3 lchars

Make it set-uid until procfs is fixed.

More merry makefile munging for man page compatability.

Converted 'vmunix' to 'kernel'.

This commit was generated by cvs2svn to compensate for changes in r1590,
which included commits to RCS files with non-trunk default branches.