D11749.id31742.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D11749.id31742.diff
View Options

	Index: bin/df/df.1
	===================================================================
	--- bin/df/df.1
	+++ bin/df/df.1
	@@ -29,7 +29,7 @@
	.\" @(#)df.1 8.3 (Berkeley) 5/8/95
	.\" $FreeBSD$
	.\"
	-.Dd December 1, 2015
	+.Dd July 27, 2017
	.Dt DF 1
	.Os
	.Sh NAME
	@@ -97,7 +97,7 @@
	Use unit suffixes: Byte, Kibibyte, Mebibyte, Gibibyte, Tebibyte and
	Pebibyte (based on powers of 1024) in order to reduce the number of
	digits to four or fewer.
	-.It Fl H
	+.It Fl H , Fl Fl si
	.Dq Human-readable
	output.
	Use unit suffixes: Byte, Kilobyte, Megabyte,
	Index: bin/df/df.c
	===================================================================
	--- bin/df/df.c
	+++ bin/df/df.c
	@@ -54,6 +54,7 @@
	#include <ufs/ufs/ufsmount.h>
	#endif
	#include <err.h>
	+#include <getopt.h>
	#include <libutil.h>
	#include <locale.h>
	#ifdef MOUNT_CHAR_DEVS
	@@ -107,6 +108,12 @@
	static struct ufs_args mdev;
	#endif

	+static const struct option long_options[] =
	+{
	+ { "si", no_argument, NULL, 'H' },
	+ { NULL, no_argument, NULL, 0 },
	+};
	+
	int
	main(int argc, char *argv[])
	{
	@@ -142,7 +149,8 @@
	if (argc < 0)
	exit(1);

	- while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T,")) != -1)
	+ while ((ch = getopt_long(argc, argv, "+abcgHhiklmnPt:T,", long_options,
	+ NULL)) != -1)
	switch (ch) {
	case 'a':
	aflag = 1;