From: Craig Small <csmall@enc.com.au>
Date: Sat, 3 Mar 2012 03:39:43 +0000 (+1100)
Subject: Merge commit 'refs/merge-requests/1' of git://gitorious.org/procps/procps
X-Git-Tag: v3.3.3~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35d6960b5a11156a9a243ba1e23a0dbaa17341c1;p=procps-ng

Merge commit 'refs/merge-requests/1' of git://gitorious.org/procps/procps
---

35d6960b5a11156a9a243ba1e23a0dbaa17341c1
diff --cc watch.c
index dc119868,2c4a4b04..69d3a0ae
--- a/watch.c
+++ b/watch.c
@@@ -67,9 -67,9 +67,10 @@@ static void __attribute__ ((__noreturn_
  	fputs(USAGE_OPTIONS, out);
  	fputs(_("  -b, --beep             beep if command has a non-zero exit\n"
  		"  -c, --color            interpret ANSI color sequences\n"
 -		"  -d, --differences      highlight changes between updates\n"
 +		"  -d, --differences[=<permanent>]\n"
 +                "                         highlight changes between updates\n"
  		"  -e, --errexit          exit if command has a non-zero exit\n"
+ 		"  -g, --chgexit          exit when output from command changes\n"
  		"  -n, --interval <secs>  seconds to wait between updates\n"
  		"  -p, --precise          attempt run command in precise intervals\n"
  		"  -t, --no-title         turn off header\n"
@@@ -706,7 -722,9 +723,7 @@@ int main(int argc, char *argv[]
  				usleep(next_loop - cur_time);
  		} else
  			usleep(interval * 1000000);
- 	}
+ 	} while (!exit_early);
  
 -	endwin();
 -
 -	return EXIT_SUCCESS;
 +	return EXIT_FAILURE;
  }