Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 May 2018 05:36:47 +0000 (UTC)
From:      Devin Teske <dteske@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r333513 - head/cddl/usr.sbin/dwatch
Message-ID:  <201805120536.w4C5alqL025931@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dteske
Date: Sat May 12 05:36:47 2018
New Revision: 333513
URL: https://svnweb.freebsd.org/changeset/base/333513

Log:
  dwatch(1): Bugfix, usage displayed with `-1Q'
  
  A return statement should have been an exit in list_profiles().
  If the user passed `-Q' to list profiles and asked for one-line
  per profile (`-1'), list_profiles() would not exit as should.
  
  Sponsored by:	Smule, Inc.

Modified:
  head/cddl/usr.sbin/dwatch/dwatch

Modified: head/cddl/usr.sbin/dwatch/dwatch
==============================================================================
--- head/cddl/usr.sbin/dwatch/dwatch	Sat May 12 03:45:30 2018	(r333512)
+++ head/cddl/usr.sbin/dwatch/dwatch	Sat May 12 05:36:47 2018	(r333513)
@@ -47,7 +47,7 @@ DTRACE_PRAGMA="
 
 ############################################################ GLOBALS
 
-VERSION='$Version: 1.1 $' # -V
+VERSION='$Version: 1.2 $' # -V
 
 pgm="${0##*/}" # Program basename
 
@@ -490,8 +490,7 @@ list_profiles()
 			function ans(s) { return cons ? "\033[" s "m" : "" }
 			gsub(filter, ans("31;1") "&" ans("39;22"))
 		' # END-QUOTE
-		return $SUCCESS
-		# NOTREACHED
+		exit $SUCCESS
 	fi
 
 	[ "$quiet" ] || echo PROFILES:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805120536.w4C5alqL025931>