@@ -14,9 +14,12 @@
 		print "const char kpw_usage[] ="
 	}
 	globalc = 0
 }
-
+function cify(str) {
+	gsub(/[- ]/, "_", str);
+	return str;
+}
 function say(line) {
 	if (NF == 5) {
 		print "\tkpw_only_" $5 "(" line ") " end
 		globals[globalc] = $5
@@ -26,11 +29,11 @@
 	}
 }
 
 { optstr = optstr $1 }
-emit == "enum"   { say("arg_" $2 ",") }
-emit == "argtbl" { say("{ arg_" $2", \"" $2 "\" },") }
-emit == "olong"  { say("case arg_" $2 ": " $3 "; break;") }
+emit == "enum"   { say("arg_" cify($2) ",") }
+emit == "argtbl" { say("{ arg_" cify($2)", \"" $2 "\" },") }
+emit == "olong"  { say("case arg_" cify($2) ": " $3 "; break;") }
 emit == "oshort" { say("case '" $1 "': " $3 "; break;") }
 emit == "usage"  { say("\"\\t-"$1", --"$2": "$4"\\n\"") }
 
 emit == "cond" {