ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/src/trunk/usr.bin/comm/comm.c

Comparing trunk/usr.bin/comm/comm.c (file contents):
Revision 11576 by laffer1, Fri Dec 20 23:32:25 2013 UTC vs.
Revision 11577 by laffer1, Sun Jul 8 15:36:10 2018 UTC

#	Line 1 | Line 1
1	+	/* $MidnightBSD$ */
2		/*
3		* Copyright (c) 1989, 1993, 1994
4		*      The Regents of the University of California.  All rights reserved.
#	Line 43 | Line 44 | static char sccsid[] = "From: @(#)comm.c       8.4 (Berkeley
44		#endif
45
46		#include <sys/cdefs.h>
47	<	__MBSDID("$MidnightBSD$");
47	>	__FBSDID("$FreeBSD: stable/10/usr.bin/comm/comm.c 227235 2011-11-06 18:49:10Z ed $");
48
49		#include <err.h>
50		#include <limits.h>
#	Line 57 | Line 58 | __MBSDID("$MidnightBSD$");
58		#include <wchar.h>
59		#include <wctype.h>
60
61	<	int iflag;
62	<	const char *tabs[] = { "", "\t", "\t\t" };
61	>	static int iflag;
62	>	static const char *tabs[] = { "", "\t", "\t\t" };
63
64	<	FILE   *file(const char *);
65	<	wchar_t *convert(const char *);
66	<	void    show(FILE *, const char *, const char *, char **, size_t *);
64	>	static FILE     *file(const char *);
65	>	static wchar_t  *convert(const char *);
66	>	static void     show(FILE *, const char *, const char *, char **, size_t *);
67		static void     usage(void);
68
69		int
#	Line 189 | Line 190 | main(int argc, char *argv[])
190		exit(0);
191		}
192
193	<	wchar_t *
193	>	static wchar_t *
194		convert(const char *str)
195		{
196		size_t n;
#	Line 212 | Line 213 | convert(const char *str)
213		return (buf);
214		}
215
216	<	void
216	>	static void
217		show(FILE *fp, const char *fn, const char *offset, char **bufp, size_t *buflenp)
218		{
219		ssize_t n;
#	Line 228 | Line 229 | show(FILE *fp, const char *fn, const char *offset, cha
229		err(1, "%s", fn);
230		}
231
232	<	FILE *
232	>	static FILE *
233		file(const char *name)
234		{
235		FILE *fp;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines