[RISU,v3,05/22] risu: add zlib indication to help text

Message ID 20180613125601.14371-6-alex.bennee@linaro.org
State Superseded
Headers show
Series
  • SVE support and various misc fixes
Related show

Commit Message

Alex Bennée June 13, 2018, 12:55 p.m.
This is a simple aide-memoir as it can be tricky to determine this
with a simple statically compiled binary.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 risu.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
2.17.1

Comments

Richard Henderson June 14, 2018, 5:47 a.m. | #1
On 06/13/2018 02:55 AM, Alex Bennée wrote:
> This is a simple aide-memoir as it can be tricky to determine this

> with a simple statically compiled binary.

> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  risu.c | 5 ++++-

>  1 file changed, 4 insertions(+), 1 deletion(-)


Eh, sure.  Or we could simply require zlib...

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~
Alex Bennée June 14, 2018, 8:34 a.m. | #2
Richard Henderson <richard.henderson@linaro.org> writes:

> On 06/13/2018 02:55 AM, Alex Bennée wrote:

>> This is a simple aide-memoir as it can be tricky to determine this

>> with a simple statically compiled binary.

>>

>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

>> ---

>>  risu.c | 5 ++++-

>>  1 file changed, 4 insertions(+), 1 deletion(-)

>

> Eh, sure.  Or we could simply require zlib...

>

> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


I would be some cross compilers (or more correctly multiarch setups) are
broken in this regard. There was a time before I moved to 18.04 that I
couldn't have multiple zlib1g-dev packages installed due to clashing
files.

As risu accepts stdin/stdout for trace files you can work around this
with pipes and native gzip so a non-zlib enabled risu is still usable.
But I'm happy to defer to Peter on this one.

--
Alex Bennée

Patch

diff --git a/risu.c b/risu.c
index 616fc33..c684c90 100644
--- a/risu.c
+++ b/risu.c
@@ -39,6 +39,9 @@  size_t signal_count;
 #ifdef HAVE_ZLIB
 #include <zlib.h>
 gzFile gz_trace_file;
+#define TRACE_TYPE "compressed"
+#else
+#define TRACE_TYPE "uncompressed"
 #endif
 
 sigjmp_buf jmpbuf;
@@ -273,7 +276,7 @@  void usage(void)
     fprintf(stderr, "between master and apprentice risu processes.\n\n");
     fprintf(stderr, "Options:\n");
     fprintf(stderr, "  --master          Be the master (server)\n");
-    fprintf(stderr, "  -t, --trace=FILE  Record/playback trace file\n");
+    fprintf(stderr, "  -t, --trace=FILE  Record/playback " TRACE_TYPE " trace file\n");
     fprintf(stderr,
             "  -h, --host=HOST   Specify master host machine (apprentice only)"
             "\n");