Index: head/usr.bin/finger/sprint.c
===================================================================
--- head/usr.bin/finger/sprint.c	(revision 296872)
+++ head/usr.bin/finger/sprint.c	(revision 296873)
@@ -1,184 +1,184 @@
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Tony Nardo of the Johns Hopkins University/Applied Physics Lab.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
 #endif
 #endif
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <db.h>
 #include <err.h>
 #include <langinfo.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 #include <utmpx.h>
 #include "finger.h"
 
 static void	  stimeprint(WHERE *);
 
 void
 sflag_print(void)
 {
 	PERSON *pn;
 	WHERE *w;
 	int sflag, r, namelen;
 	char p[80];
 	PERSON *tmp;
 	DBT data, key;
 	struct tm *lc;
 
 	if (d_first < 0)
 		d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
 	/*
 	 * short format --
 	 *	login name
 	 *	real name
 	 *	terminal name (the XX of ttyXX)
 	 *	if terminal writeable (add an '*' to the terminal name
 	 *		if not)
 	 *	if logged in show idle time and day logged in, else
 	 *		show last login date and time.
 	 *		If > 6 months, show year instead of time.
 	 *	if (-o)
 	 *		office location
 	 *		office phone
 	 *	else
 	 *		remote host
 	 */
 #define	MAXREALNAME	16
 #define MAXHOSTNAME     17      /* in reality, hosts are never longer than 16 */
 	(void)printf("%-*s %-*s%s %s\n", MAXLOGNAME, "Login", MAXREALNAME,
 	    "Name", " TTY      Idle  Login  Time  ", (gflag) ? "" :
 	    oflag ? "Office  Phone" : "Where");
 
 	for (sflag = R_FIRST;; sflag = R_NEXT) {
 		r = (*db->seq)(db, &key, &data, sflag);
 		if (r == -1)
 			err(1, "db seq");
 		if (r == 1)
 			break;
 		memmove(&tmp, data.data, sizeof tmp);
 		pn = tmp;
 
 		for (w = pn->whead; w != NULL; w = w->next) {
 			namelen = MAXREALNAME;
 			if (w->info == LOGGEDIN && !w->writable)
 				--namelen;	/* leave space before `*' */
 			(void)printf("%-*.*s %-*.*s", MAXLOGNAME, MAXLOGNAME,
 				pn->name, MAXREALNAME, namelen,
 				pn->realname ? pn->realname : "");
 			if (!w->loginat) {
 				(void)printf("  *     *   No logins   ");
 				goto office;
 			}
 			(void)putchar(w->info == LOGGEDIN && !w->writable ?
 			    '*' : ' ');
 			if (*w->tty)
 				(void)printf("%-7.7s ",
 					     (strncmp(w->tty, "tty", 3)
 					      && strncmp(w->tty, "cua", 3))
 					     ? w->tty : w->tty + 3);
 			else
 				(void)printf("        ");
 			if (w->info == LOGGEDIN) {
 				stimeprint(w);
 				(void)printf("  ");
 			} else
 				(void)printf("    *  ");
 			lc = localtime(&w->loginat);
 #define SECSPERDAY 86400
 #define DAYSPERWEEK 7
 #define DAYSPERNYEAR 365
 			if (now - w->loginat < SECSPERDAY * (DAYSPERWEEK - 1)) {
 				(void)strftime(p, sizeof(p), "%a", lc);
 			} else {
 				(void)strftime(p, sizeof(p),
 					     d_first ? "%e %b" : "%b %e", lc);
 			}
 			(void)printf("%-6.6s", p);
 			if (now - w->loginat >= SECSPERDAY * DAYSPERNYEAR / 2) {
 				(void)strftime(p, sizeof(p), "%Y", lc);
 			} else {
 				(void)strftime(p, sizeof(p), "%R", lc);
 			}
 			(void)printf(" %-5.5s", p);
 office:
 			if (gflag)
 				goto no_gecos;
 			if (oflag) {
 				if (pn->office)
 					(void)printf(" %-7.7s", pn->office);
 				else if (pn->officephone)
 					(void)printf(" %-7.7s", " ");
 				if (pn->officephone)
-					(void)printf(" %-.9s",
+					(void)printf(" %-.15s",
 					    prphone(pn->officephone));
 			} else
 				(void)printf(" %.*s", MAXHOSTNAME, w->host);
 no_gecos:
 			putchar('\n');
 		}
 	}
 }
 
 static void
 stimeprint(WHERE *w)
 {
 	struct tm *delta;
 
 	if (w->idletime == -1) {
 		(void)printf("     ");
 		return;
 	}
 
 	delta = gmtime(&w->idletime);
 	if (!delta->tm_yday)
 		if (!delta->tm_hour)
 			if (!delta->tm_min)
 				(void)printf("     ");
 			else
 				(void)printf("%5d", delta->tm_min);
 		else
 			(void)printf("%2d:%02d",
 			    delta->tm_hour, delta->tm_min);
 	else
 		(void)printf("%4dd", delta->tm_yday);
 }