Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: If08fad6afedbedcceb989675895f4dd2a3f276b0

6 files changed, 9 insertions, 15 deletions

diff --git a/android/device/generated/flags.h b/android/device/generated/flags.h
index c9ac1dee..d6884d92 100644
--- a/android/device/generated/flags.h
+++ b/android/device/generated/flags.h
@@ -1016,9 +1016,9 @@
 #undef FLAG_only_values
 #endif
 
-// getopt   ^(alternative)a(name)n:(options)o:(long)(longoptions)l*Tu
+// getopt   ^a(alternative)n:(name)o:(options)l*(long)(longoptions)Tu
 #undef OPTSTR_getopt
-#define OPTSTR_getopt "^(alternative)a(name)n:(options)o:(long)(longoptions)l*Tu"
+#define OPTSTR_getopt "^a(alternative)n:(name)o:(options)l*(long)(longoptions)Tu"
 #ifdef CLEANUP_getopt
 #undef CLEANUP_getopt
 #undef FOR_getopt
@@ -1028,7 +1028,6 @@
 #undef FLAG_o
 #undef FLAG_n
 #undef FLAG_a
-#undef FLAG_alternative
 #endif
 
 // getty   <2t#<0H:I:l:f:iwnmLh
@@ -4246,7 +4245,6 @@
 #define FLAG_o (FORCED_FLAG<<3)
 #define FLAG_n (FORCED_FLAG<<4)
 #define FLAG_a (FORCED_FLAG<<5)
-#define FLAG_alternative (FORCED_FLAG<<6)
 #endif
 
 #ifdef FOR_getty
diff --git a/android/device/generated/newtoys.h b/android/device/generated/newtoys.h
index fc36a4d1..7b39d64e 100644
--- a/android/device/generated/newtoys.h
+++ b/android/device/generated/newtoys.h
@@ -93,7 +93,7 @@ USE_FTPPUT(OLDTOY(ftpput, ftpget, TOYFLAG_USR|TOYFLAG_BIN))
 USE_GETCONF(NEWTOY(getconf, ">2al", TOYFLAG_USR|TOYFLAG_BIN))
 USE_GETENFORCE(NEWTOY(getenforce, ">0", TOYFLAG_USR|TOYFLAG_SBIN))
 USE_GETFATTR(NEWTOY(getfattr, "(only-values)dhn:", TOYFLAG_USR|TOYFLAG_BIN))
-USE_GETOPT(NEWTOY(getopt, "^(alternative)a(name)n:(options)o:(long)(longoptions)l*Tu", TOYFLAG_USR|TOYFLAG_BIN))
+USE_GETOPT(NEWTOY(getopt, "^a(alternative)n:(name)o:(options)l*(long)(longoptions)Tu", TOYFLAG_USR|TOYFLAG_BIN))
 USE_GETTY(NEWTOY(getty, "<2t#<0H:I:l:f:iwnmLh",TOYFLAG_SBIN))
 USE_GREP(NEWTOY(grep, "(line-buffered)(color):;(exclude-dir)*S(exclude)*M(include)*ZzEFHIab(byte-offset)h(no-filename)ino(only-matching)rRsvwcl(files-with-matches)q(quiet)(silent)e*f*C#B#A#m#x[!wx][!EFw]", TOYFLAG_BIN|TOYFLAG_ARGFAIL(2)))
 USE_GROUPADD(NEWTOY(groupadd, "<1>2g#<0S", TOYFLAG_NEEDROOT|TOYFLAG_SBIN))
diff --git a/android/linux/generated/flags.h b/android/linux/generated/flags.h
index b69e6541..ad33a145 100644
--- a/android/linux/generated/flags.h
+++ b/android/linux/generated/flags.h
@@ -1016,9 +1016,9 @@
 #undef FLAG_only_values
 #endif
 
-// getopt   ^(alternative)a(name)n:(options)o:(long)(longoptions)l*Tu
+// getopt   ^a(alternative)n:(name)o:(options)l*(long)(longoptions)Tu
 #undef OPTSTR_getopt
-#define OPTSTR_getopt "^(alternative)a(name)n:(options)o:(long)(longoptions)l*Tu"
+#define OPTSTR_getopt "^a(alternative)n:(name)o:(options)l*(long)(longoptions)Tu"
 #ifdef CLEANUP_getopt
 #undef CLEANUP_getopt
 #undef FOR_getopt
@@ -1028,7 +1028,6 @@
 #undef FLAG_o
 #undef FLAG_n
 #undef FLAG_a
-#undef FLAG_alternative
 #endif
 
 // getty   <2t#<0H:I:l:f:iwnmLh
@@ -4246,7 +4245,6 @@
 #define FLAG_o (FORCED_FLAG<<3)
 #define FLAG_n (FORCED_FLAG<<4)
 #define FLAG_a (FORCED_FLAG<<5)
-#define FLAG_alternative (FORCED_FLAG<<6)
 #endif
 
 #ifdef FOR_getty
diff --git a/android/linux/generated/newtoys.h b/android/linux/generated/newtoys.h
index fc36a4d1..7b39d64e 100644
--- a/android/linux/generated/newtoys.h
+++ b/android/linux/generated/newtoys.h
@@ -93,7 +93,7 @@ USE_FTPPUT(OLDTOY(ftpput, ftpget, TOYFLAG_USR|TOYFLAG_BIN))
 USE_GETCONF(NEWTOY(getconf, ">2al", TOYFLAG_USR|TOYFLAG_BIN))
 USE_GETENFORCE(NEWTOY(getenforce, ">0", TOYFLAG_USR|TOYFLAG_SBIN))
 USE_GETFATTR(NEWTOY(getfattr, "(only-values)dhn:", TOYFLAG_USR|TOYFLAG_BIN))
-USE_GETOPT(NEWTOY(getopt, "^(alternative)a(name)n:(options)o:(long)(longoptions)l*Tu", TOYFLAG_USR|TOYFLAG_BIN))
+USE_GETOPT(NEWTOY(getopt, "^a(alternative)n:(name)o:(options)l*(long)(longoptions)Tu", TOYFLAG_USR|TOYFLAG_BIN))
 USE_GETTY(NEWTOY(getty, "<2t#<0H:I:l:f:iwnmLh",TOYFLAG_SBIN))
 USE_GREP(NEWTOY(grep, "(line-buffered)(color):;(exclude-dir)*S(exclude)*M(include)*ZzEFHIab(byte-offset)h(no-filename)ino(only-matching)rRsvwcl(files-with-matches)q(quiet)(silent)e*f*C#B#A#m#x[!wx][!EFw]", TOYFLAG_BIN|TOYFLAG_ARGFAIL(2)))
 USE_GROUPADD(NEWTOY(groupadd, "<1>2g#<0S", TOYFLAG_NEEDROOT|TOYFLAG_SBIN))
diff --git a/android/mac/generated/flags.h b/android/mac/generated/flags.h
index 225667b4..8a2916ac 100644
--- a/android/mac/generated/flags.h
+++ b/android/mac/generated/flags.h
@@ -1016,9 +1016,9 @@
 #undef FLAG_only_values
 #endif
 
-// getopt   ^(alternative)a(name)n:(options)o:(long)(longoptions)l*Tu
+// getopt   ^a(alternative)n:(name)o:(options)l*(long)(longoptions)Tu
 #undef OPTSTR_getopt
-#define OPTSTR_getopt "^(alternative)a(name)n:(options)o:(long)(longoptions)l*Tu"
+#define OPTSTR_getopt "^a(alternative)n:(name)o:(options)l*(long)(longoptions)Tu"
 #ifdef CLEANUP_getopt
 #undef CLEANUP_getopt
 #undef FOR_getopt
@@ -1028,7 +1028,6 @@
 #undef FLAG_o
 #undef FLAG_n
 #undef FLAG_a
-#undef FLAG_alternative
 #endif
 
 // getty   <2t#<0H:I:l:f:iwnmLh
@@ -4246,7 +4245,6 @@
 #define FLAG_o (FORCED_FLAG<<3)
 #define FLAG_n (FORCED_FLAG<<4)
 #define FLAG_a (FORCED_FLAG<<5)
-#define FLAG_alternative (FORCED_FLAG<<6)
 #endif
 
 #ifdef FOR_getty
diff --git a/android/mac/generated/newtoys.h b/android/mac/generated/newtoys.h
index fc36a4d1..7b39d64e 100644
--- a/android/mac/generated/newtoys.h
+++ b/android/mac/generated/newtoys.h
@@ -93,7 +93,7 @@ USE_FTPPUT(OLDTOY(ftpput, ftpget, TOYFLAG_USR|TOYFLAG_BIN))
 USE_GETCONF(NEWTOY(getconf, ">2al", TOYFLAG_USR|TOYFLAG_BIN))
 USE_GETENFORCE(NEWTOY(getenforce, ">0", TOYFLAG_USR|TOYFLAG_SBIN))
 USE_GETFATTR(NEWTOY(getfattr, "(only-values)dhn:", TOYFLAG_USR|TOYFLAG_BIN))
-USE_GETOPT(NEWTOY(getopt, "^(alternative)a(name)n:(options)o:(long)(longoptions)l*Tu", TOYFLAG_USR|TOYFLAG_BIN))
+USE_GETOPT(NEWTOY(getopt, "^a(alternative)n:(name)o:(options)l*(long)(longoptions)Tu", TOYFLAG_USR|TOYFLAG_BIN))
 USE_GETTY(NEWTOY(getty, "<2t#<0H:I:l:f:iwnmLh",TOYFLAG_SBIN))
 USE_GREP(NEWTOY(grep, "(line-buffered)(color):;(exclude-dir)*S(exclude)*M(include)*ZzEFHIab(byte-offset)h(no-filename)ino(only-matching)rRsvwcl(files-with-matches)q(quiet)(silent)e*f*C#B#A#m#x[!wx][!EFw]", TOYFLAG_BIN|TOYFLAG_ARGFAIL(2)))
 USE_GROUPADD(NEWTOY(groupadd, "<1>2g#<0S", TOYFLAG_NEEDROOT|TOYFLAG_SBIN))