From: Pierre-Jean Texier <pjtexier@koncepto.io>
Date: Thu, 23 Jan 2020 21:42:40 +0000 (+0100)
Subject: unzck: fix build with musl libc
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~29^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6ecc73ed7464d6979252fe4927cba96555fc8436;p=zchunk.git

unzck: fix build with musl libc

On musl libc "stdout" is a preprocessor macro whose expansion leads to
compilation errors.

Fixes:

| In file included from ../git/src/unzck.c:31:
| ../git/src/unzck.c: In function 'parse_opt':
| ../git/src/unzck.c:78:24: error: expected identifier before '(' token
|    78 |             arguments->stdout = true;
|       |                        ^~~~~~
| ../git/src/unzck.c: In function 'main':
| ../git/src/unzck.c:141:20: error: expected identifier before '(' token
|   141 |     if(!(arguments.stdout)) {
|       |                    ^~~~~~

Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
---

diff --git a/src/unzck.c b/src/unzck.c
index 8d6c62a..acb72d5 100644
--- a/src/unzck.c
+++ b/src/unzck.c
@@ -58,7 +58,7 @@ struct arguments {
   char *args[1];
   zck_log_type log_level;
   bool dict;
-  bool stdout;
+  bool std_out;
   bool exit;
 };
 
@@ -75,7 +75,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) {
                 arguments->log_level = ZCK_LOG_DDEBUG;
             break;
         case 'c':
-            arguments->stdout = true;
+            arguments->std_out = true;
             break;
         case 'V':
             version();
@@ -138,7 +138,7 @@ int main (int argc, char *argv[]) {
         snprintf(out_name + strlen(base_name) - 4, 7, ".zdict");
 
     int dst_fd = STDOUT_FILENO;
-    if(!arguments.stdout) {
+    if(!arguments.std_out) {
         dst_fd = open(out_name, O_TRUNC | O_WRONLY | O_CREAT, 0666);
         if(dst_fd < 0) {
             dprintf(STDERR_FILENO, "Unable to open %s", out_name);