Snap for 6249303 from b1685456634b431614932360371c48921e9fb466 to rvc-release
Change-Id: I71bfeeb09c558000f4fc02a6f7f4e30985f69598
diff --git a/.config-linux b/.config-linux
index 339a99d..5347792 100644
--- a/.config-linux
+++ b/.config-linux
@@ -336,4 +336,4 @@
CONFIG_XXD=y
# CONFIG_XZCAT is not set
# CONFIG_YES is not set
-# CONFIG_ZCAT is not set
+CONFIG_ZCAT=y
diff --git a/.config-mac b/.config-mac
index bf601ad..00d838c 100644
--- a/.config-mac
+++ b/.config-mac
@@ -336,4 +336,4 @@
CONFIG_XXD=y
# CONFIG_XZCAT is not set
# CONFIG_YES is not set
-# CONFIG_ZCAT is not set
+CONFIG_ZCAT=y
diff --git a/android/linux/generated/config.h b/android/linux/generated/config.h
index 0e65aae..7fdfaeb 100644
--- a/android/linux/generated/config.h
+++ b/android/linux/generated/config.h
@@ -646,5 +646,5 @@
#define USE_XZCAT(...)
#define CFG_YES 0
#define USE_YES(...)
-#define CFG_ZCAT 0
-#define USE_ZCAT(...)
+#define CFG_ZCAT 1
+#define USE_ZCAT(...) __VA_ARGS__
diff --git a/android/linux/generated/flags.h b/android/linux/generated/flags.h
index ec5ceb0..63c9182 100644
--- a/android/linux/generated/flags.h
+++ b/android/linux/generated/flags.h
@@ -3403,7 +3403,7 @@
#undef FOR_yes
#endif
-// zcat cdfk123456789[-123456789]
+// zcat cdfk123456789[-123456789] cdfk123456789[-123456789]
#undef OPTSTR_zcat
#define OPTSTR_zcat "cdfk123456789[-123456789]"
#ifdef CLEANUP_zcat
@@ -6285,18 +6285,18 @@
#ifndef TT
#define TT this.zcat
#endif
-#define FLAG_9 (FORCED_FLAG<<0)
-#define FLAG_8 (FORCED_FLAG<<1)
-#define FLAG_7 (FORCED_FLAG<<2)
-#define FLAG_6 (FORCED_FLAG<<3)
-#define FLAG_5 (FORCED_FLAG<<4)
-#define FLAG_4 (FORCED_FLAG<<5)
-#define FLAG_3 (FORCED_FLAG<<6)
-#define FLAG_2 (FORCED_FLAG<<7)
-#define FLAG_1 (FORCED_FLAG<<8)
-#define FLAG_k (FORCED_FLAG<<9)
-#define FLAG_f (FORCED_FLAG<<10)
-#define FLAG_d (FORCED_FLAG<<11)
-#define FLAG_c (FORCED_FLAG<<12)
+#define FLAG_9 (1<<0)
+#define FLAG_8 (1<<1)
+#define FLAG_7 (1<<2)
+#define FLAG_6 (1<<3)
+#define FLAG_5 (1<<4)
+#define FLAG_4 (1<<5)
+#define FLAG_3 (1<<6)
+#define FLAG_2 (1<<7)
+#define FLAG_1 (1<<8)
+#define FLAG_k (1<<9)
+#define FLAG_f (1<<10)
+#define FLAG_d (1<<11)
+#define FLAG_c (1<<12)
#endif
diff --git a/android/mac/generated/config.h b/android/mac/generated/config.h
index 0a08be9..07b3de5 100644
--- a/android/mac/generated/config.h
+++ b/android/mac/generated/config.h
@@ -646,5 +646,5 @@
#define USE_XZCAT(...)
#define CFG_YES 0
#define USE_YES(...)
-#define CFG_ZCAT 0
-#define USE_ZCAT(...)
+#define CFG_ZCAT 1
+#define USE_ZCAT(...) __VA_ARGS__
diff --git a/android/mac/generated/flags.h b/android/mac/generated/flags.h
index 018ba65..8159897 100644
--- a/android/mac/generated/flags.h
+++ b/android/mac/generated/flags.h
@@ -3403,7 +3403,7 @@
#undef FOR_yes
#endif
-// zcat cdfk123456789[-123456789]
+// zcat cdfk123456789[-123456789] cdfk123456789[-123456789]
#undef OPTSTR_zcat
#define OPTSTR_zcat "cdfk123456789[-123456789]"
#ifdef CLEANUP_zcat
@@ -6285,18 +6285,18 @@
#ifndef TT
#define TT this.zcat
#endif
-#define FLAG_9 (FORCED_FLAG<<0)
-#define FLAG_8 (FORCED_FLAG<<1)
-#define FLAG_7 (FORCED_FLAG<<2)
-#define FLAG_6 (FORCED_FLAG<<3)
-#define FLAG_5 (FORCED_FLAG<<4)
-#define FLAG_4 (FORCED_FLAG<<5)
-#define FLAG_3 (FORCED_FLAG<<6)
-#define FLAG_2 (FORCED_FLAG<<7)
-#define FLAG_1 (FORCED_FLAG<<8)
-#define FLAG_k (FORCED_FLAG<<9)
-#define FLAG_f (FORCED_FLAG<<10)
-#define FLAG_d (FORCED_FLAG<<11)
-#define FLAG_c (FORCED_FLAG<<12)
+#define FLAG_9 (1<<0)
+#define FLAG_8 (1<<1)
+#define FLAG_7 (1<<2)
+#define FLAG_6 (1<<3)
+#define FLAG_5 (1<<4)
+#define FLAG_4 (1<<5)
+#define FLAG_3 (1<<6)
+#define FLAG_2 (1<<7)
+#define FLAG_1 (1<<8)
+#define FLAG_k (1<<9)
+#define FLAG_f (1<<10)
+#define FLAG_d (1<<11)
+#define FLAG_c (1<<12)
#endif
