commit 66919c4a1b4fc782c25d469a828f4b45cbbfdbb3
author Gavin Howard <yzena.tech@gmail.com> Mon Mar 12 18:19:23 2018 -0600
committer Gavin Howard <yzena.tech@gmail.com> Tue Aug 28 17:10:57 2018 -0600
tree 01b77f0eb9a968e7f23fd73de69a82530efe1f9c
parent c05f499ad35757f0679790a6eafa79220e6bba27

Update toybox style

include/io.h

diff --git a/include/io.h b/include/io.h
index 99f0975..f1af805 100644
--- a/include/io.h
+++ b/include/io.h
@@ -31,7 +31,7 @@
 typedef int (*BcIoGetc)(void*);
 
 // ** Exclude start. **
-long bc_io_frag(char *buf, long len, int term, BcIoGetc bcgetc, void *ctx);
+long bc_io_frag(char *buf, long len, int term, BcIoGetc bc_getc, void *ctx);
 
 long bc_io_fgets(char * buf, int n, FILE* fp);
 

src/bc/io.c

diff --git a/src/bc/io.c b/src/bc/io.c
index e62bea8..10ecc03 100644
--- a/src/bc/io.c
+++ b/src/bc/io.c
@@ -26,16 +26,16 @@
 #include <bc.h>
 #include <io.h>
 
-long bc_io_frag(char *buf, long len, int term, BcIoGetc bcgetc, void *ctx) {
+long bc_io_frag(char *buf, long len, int term, BcIoGetc bc_getc, void *ctx) {
 
   long i;
   int c;
 
-  if (!buf || len < 0 || !bcgetc) return -1;
+  if (!buf || len < 0 || !bc_getc) return -1;
 
   for (c = (~term) | 1, i = 0; i < len; i++) {
 
-    if (c == (int) '\0' || c == term || (c = bcgetc(ctx)) == EOF) {
+    if (c == (int) '\0' || c == term || (c = bc_getc(ctx)) == EOF) {
       buf[i] = '\0';
       break;
     }

toybox/header.c

diff --git a/toybox/header.c b/toybox/header.c
index 33b20ed..f55c044 100644
--- a/toybox/header.c
+++ b/toybox/header.c
@@ -48,5 +48,3 @@
     long bc_signal;
 )
 
-#define bcg (TT)
-

toybox/release.py

diff --git a/toybox/release.py b/toybox/release.py
index 6fb74d4..7e280e8 100755
--- a/toybox/release.py
+++ b/toybox/release.py
@@ -65,14 +65,29 @@
 	'^#define BC.*_H$',
 	'^#endif \/\/ BC.*_H$',
 	'^extern.*$',
-	'^#define TT.*$',
 	'^static ',
+	'^#define BC_FLAG_WARN \(1<<0\)$',
+	'^#define BC_FLAG_STANDARD \(1<<1\)$',
+	'^#define BC_FLAG_QUIET \(1<<2\)$',
+	'^#define BC_FLAG_MATHLIB \(1<<3\)$',
+	'^#define BC_FLAG_INTERACTIVE \(1<<4\)$',
+	'^#define BC_FLAG_CODE \(1<<5\)$',
 ]
 
 regexes_all = [
 	'^// \*\* Exclude start. \*\*$.*?^// \*\* Exclude end. \*\*$'
 ]
 
+replacements = [
+	[ 'bcg.', 'TT.' ],
+	[ 'BC_FLAG_WARN', 'FLAG_w' ],
+	[ 'BC_FLAG_STANDARD', 'FLAG_s' ],
+	[ 'BC_FLAG_QUIET', 'FLAG_q' ],
+	[ 'BC_FLAG_MATHLIB', 'FLAG_l' ],
+	[ 'BC_FLAG_INTERACTIVE', 'FLAG_i' ],
+	[ 'BC_FLAG_CODE', 'FLAG_c' ],
+]
+
 for reg in regexes:
 	r = re.compile(reg, re.M)
 	content = r.sub('', content)
@@ -81,6 +96,10 @@
 	r = re.compile(reg, re.M | re.DOTALL)
 	content = r.sub('', content)
 
+for rep in replacements:
+	r = re.compile(rep[0], re.M)
+	content = r.sub(rep[1], content)
+
 with open(testdir + "/header.c") as f:
 	content = f.read() + content