svn commit: r305139 - head/bin/df

[Conrad E. Meyer]

Author: cem
Date: Wed Aug 31 18:10:41 2016
New Revision: 305139
URL: https://svnweb.freebsd.org/changeset/base/305139

Log:
  df(1): Allow duplicate -l flags gracefully
  
  Rather than producing a misleading error message when duplicate -l flags are
  provided to df(1), simply ignore extra flags and proceed as if only one was
  specified.  This seems most reasonable given the usage for -l:
  
       -l      Only display information about locally-mounted file systems.
  
  l and t flags still conflict, as before.
  
  PR:		208169
  Reported by:	by at reorigin.com
  Reviewed by:	allanjude

Modified:
  head/bin/df/df.c

Modified: head/bin/df/df.c
==============================================================================
--- head/bin/df/df.c	Wed Aug 31 18:00:41 2016	(r305138)
+++ head/bin/df/df.c	Wed Aug 31 18:10:41 2016	(r305139)
@@ -166,6 +166,9 @@ main(int argc, char *argv[])
 			hflag = 0;
 			break;
 		case 'l':
+			/* Ignore duplicate -l */
+			if (lflag)
+				break;
 			if (vfslist != NULL)
 				xo_errx(1, "-l and -t are mutually exclusive.");
 			vfslist = makevfslist(makenetvfslist());