[Midnightbsd-cvs] src [11266] trunk/usr.bin/unexpand: sync unexpand with freebsd 10

[laffer1 at midnightbsd.org]

Revision: 11266
          http://svnweb.midnightbsd.org/src/?rev=11266
Author:   laffer1
Date:     2018-07-03 19:55:52 -0400 (Tue, 03 Jul 2018)
Log Message:
-----------
sync unexpand with freebsd 10

Modified Paths:
--------------
    trunk/usr.bin/unexpand/Makefile
    trunk/usr.bin/unexpand/unexpand.c

Modified: trunk/usr.bin/unexpand/Makefile
===================================================================
--- trunk/usr.bin/unexpand/Makefile	2018-07-03 23:54:50 UTC (rev 11265)
+++ trunk/usr.bin/unexpand/Makefile	2018-07-03 23:55:52 UTC (rev 11266)
@@ -1,7 +1,8 @@
+# $MidnightBSD$
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/unexpand/Makefile 276486 2014-12-31 23:25:37Z ngie $
 
 PROG=	unexpand
-NO_MAN=
+MAN=
 
 .include <bsd.prog.mk>

Modified: trunk/usr.bin/unexpand/unexpand.c
===================================================================
--- trunk/usr.bin/unexpand/unexpand.c	2018-07-03 23:54:50 UTC (rev 11265)
+++ trunk/usr.bin/unexpand/unexpand.c	2018-07-03 23:55:52 UTC (rev 11266)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -29,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/unexpand/unexpand.c 317794 2017-05-04 14:50:25Z pfg $");
 
 #ifndef lint
 static const char copyright[] =
@@ -55,9 +56,9 @@
 #include <wchar.h>
 #include <wctype.h>
 
-int	all;
-int	nstops;
-int	tabstops[100];
+static int	all;
+static int	nstops;
+static int	tabstops[100];
 
 static void getstops(const char *);
 static void usage(void);
@@ -132,8 +133,8 @@
 				    tabstops[0];
 				continue;
 			} else {
-				for (n = 0; tabstops[n] - 1 < dcol &&
-				    n < nstops; n++)
+				for (n = 0; n < nstops &&
+				    tabstops[n] - 1 < dcol; n++)
 					;
 				if (n < nstops - 1 && tabstops[n] - 1 < limit) {
 					dcol = tabstops[n];
@@ -154,7 +155,7 @@
 				    tabstops[0];
 			}
 		} else {
-			for (n = 0; tabstops[n] - 1 < ocol && n < nstops; n++)
+			for (n = 0; n < nstops && tabstops[n] - 1 < ocol; n++)
 				;
 			while (ocol < dcol && n < nstops && ocol < limit) {
 				putwchar('\t');