From: Jonathan Dieter <jdieter@gmail.com>
Date: Fri, 4 May 2018 15:13:31 +0000 (+0300)
Subject: Fix incomplete conversion to argp
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~286
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=33a03fd61aa715197cd47de692c1ea47eacd6963;p=zchunk.git

Fix incomplete conversion to argp

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---

diff --git a/src/zck.c b/src/zck.c
index 235e521..aad3722 100644
--- a/src/zck.c
+++ b/src/zck.c
@@ -184,7 +184,7 @@ int main (int argc, char *argv[]) {
     int in_fd = open(arguments.args[0], O_RDONLY);
     off_t in_size = 0;
     if(in_fd < 0) {
-        printf("Unable to open %s for reading", argv[1]);
+        printf("Unable to open %s for reading", arguments.args[0]);
         perror("");
         exit(1);
     }
@@ -210,7 +210,9 @@ int main (int argc, char *argv[]) {
             char *search = found;
             char *prev_srpm = memmem(search, in_size - (search-data), "<rpm:sourcerpm", 14);
             while(search) {
-                char *next = memmem(search, in_size - (search-data), argv[2], strlen(argv[2]));
+                char *next = memmem(search, in_size - (search-data),
+                                    arguments.split_string,
+                                    strlen(arguments.split_string));
                 if(next) {
                     char *next_srpm = memmem(next, in_size - (next-data), "<rpm:sourcerpm", 14);
 
diff --git a/src/zck_delta_size.c b/src/zck_delta_size.c
index 92614cf..584b879 100644
--- a/src/zck_delta_size.c
+++ b/src/zck_delta_size.c
@@ -133,9 +133,9 @@ int main (int argc, char *argv[]) {
 
     if(zck_get_chunk_hash_type(zck_tgt) != zck_get_chunk_hash_type(zck_src)) {
         printf("ERROR: Chunk hash types don't match:\n");
-        printf("   %s: %s\n", argv[1], zck_hash_name_from_type(zck_get_chunk_hash_type(zck_tgt)));
-        printf("   %s: %s\n", argv[2], zck_hash_name_from_type(zck_get_chunk_hash_type(zck_src)));
-        return 1;
+        printf("   %s: %s\n", arguments.args[0], zck_hash_name_from_type(zck_get_chunk_hash_type(zck_tgt)));
+        printf("   %s: %s\n", arguments.args[1], zck_hash_name_from_type(zck_get_chunk_hash_type(zck_src)));
+        exit(1);
     }
     zckIndex *tgt_info = zck_get_index(zck_tgt);
     if(tgt_info == NULL)
diff --git a/src/zck_dl.c b/src/zck_dl.c
index 82fe510..1b81881 100644
--- a/src/zck_dl.c
+++ b/src/zck_dl.c
@@ -128,7 +128,7 @@ int main (int argc, char *argv[]) {
     }
     zckCtx *zck_src = zck_init_read(src_fd);
     if(zck_src == NULL) {
-        printf("Unable to open %s\n", argv[1]);
+        printf("Unable to open %s\n", arguments.source);
         exit(1);
     }