Mercurial > hg > toybox

diff toys/other/mountpoint.c @ 674:7e846e281e38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate.
author Rob Landley <rob@landley.net>
date Mon, 08 Oct 2012 00:02:30 -0500
parents 6df4ccc0acbe
children 786841fdb1e0
line wrap: on
line diff
--- a/toys/other/mountpoint.c	Sun Oct 07 23:53:25 2012 -0500
+++ b/toys/other/mountpoint.c	Mon Oct 08 00:02:30 2012 -0500
@@ -17,19 +17,20 @@
 	  -x Print major/minor device number of the block device
 */
 
+#define FOR_mountpoint
 #include "toys.h"
 
 void mountpoint_main(void)
 {
 	struct stat st1, st2;
 	int res = 0;
-	int quiet = toys.optflags & 0x4;
+	int quiet = toys.optflags & FLAG_q;
 	toys.exitval = 1; // be pessimistic
 	strncpy(toybuf, toys.optargs[0], sizeof(toybuf));
-	if (((toys.optflags & 0x1) && lstat(toybuf, &st1)) || stat(toybuf, &st1))
+	if (((toys.optflags & FLAG_x) && lstat(toybuf, &st1)) || stat(toybuf, &st1))
 		perror_exit("%s", toybuf);
 
-	if (toys.optflags & 0x1){
+	if (toys.optflags & FLAG_x){
 		if (S_ISBLK(st1.st_mode)) {
 			if (!quiet) printf("%u:%u\n", major(st1.st_rdev), minor(st1.st_rdev));
 			toys.exitval = 0;
@@ -48,7 +49,7 @@
 	res = (st1.st_dev != st2.st_dev) ||
 		(st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino);
 	if (!quiet) printf("%s is %sa mountpoint\n", toys.optargs[0], res ? "" : "not ");
-	if (toys.optflags & 0x2)
+	if (toys.optflags & FLAG_d)
 		printf("%u:%u\n", major(st1.st_dev), minor(st1.st_dev));
 	toys.exitval = res ? 0 : 1;
 }