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

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/rmmod.c	Sun Oct 07 23:53:25 2012 -0500
+++ b/toys/other/rmmod.c	Mon Oct 08 00:02:30 2012 -0500
@@ -18,6 +18,7 @@
 
 */
 
+#define FOR_rmmod
 #include "toys.h"
 
 #include <sys/syscall.h>
@@ -41,8 +42,8 @@
 	if (len > 3 && !strcmp(&mod_name[len-3], ".ko" ))
 		mod_name[len-3] = 0;
 
-	if (toys.optflags & 1) flags |= O_TRUNC;
-	if (toys.optflags & 2) flags &= ~O_NONBLOCK;
+	if (toys.optflags & FLAG_f) flags |= O_TRUNC;
+	if (toys.optflags & FLAG_w) flags &= ~O_NONBLOCK;
 
 	if (delete_module(mod_name, flags))
 		perror_exit("failed to unload %s", mod_name);