Add some debug logging.

rnpgp · Nov 13, 2023 · dd52f66 · dd52f66
1 parent 1f7759f
commit dd52f66
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 1 deletion.
diff --git a/src/lib/rnp.cpp b/src/lib/rnp.cpp
@@ -3132,14 +3132,17 @@ rnp_verify_dest_provider(pgp_parse_handler_t *handler,
                          const char *         filename,
                          uint32_t             mtime)
 {
+    RNP_LOG("here");
     rnp_op_verify_t op = (rnp_op_verify_t) handler->param;
     if (!op->output) {
+        RNP_LOG("here");
         return false;
     }
     *dst = &(op->output->dst);
     *closedst = false;
     op->filename = filename ? std::string(filename) : "";
     op->file_mtime = mtime;
+    RNP_LOG("here");
     return true;
 }
 

diff --git a/src/librepgp/stream-common.cpp b/src/librepgp/stream-common.cpp
@@ -55,16 +55,18 @@ bool
 src_read(pgp_source_t *src, void *buf, size_t len, size_t *readres)
 {
     size_t              left = len;
-    size_t              read;
+    size_t              read = 0;
     pgp_source_cache_t *cache = src->cache;
     bool                readahead = cache ? cache->readahead : false;
 
     if (src->error) {
+        RNP_LOG("here");
         return false;
     }
 
     if (src->eof || (len == 0)) {
         *readres = 0;
+        RNP_LOG("here");
         return true;
     }
 
@@ -96,11 +98,14 @@ src_read(pgp_source_t *src, void *buf, size_t len, size_t *readres)
             // If there is no cache or chunk is larger then read directly
             if (!src->read(src, buf, left, &read)) {
                 src->error = 1;
+                RNP_LOG("here");
                 return false;
             }
+            // RNP_LOG("here: %p %zu", src->read, read);
             if (!read) {
                 src->eof = 1;
                 len = len - left;
+                RNP_LOG("here: %zu", len);
                 goto finish;
             }
             left -= read;
@@ -109,11 +114,14 @@ src_read(pgp_source_t *src, void *buf, size_t len, size_t *readres)
             // Try to fill the cache to avoid small reads
             if (!src->read(src, &cache->buf[0], sizeof(cache->buf), &read)) {
                 src->error = 1;
+                RNP_LOG("here");
                 return false;
             }
+            // RNP_LOG("here: %p %zu", src->read, read);
             if (!read) {
                 src->eof = 1;
                 len = len - left;
+                RNP_LOG("here: %zu", len);
                 goto finish;
             } else if (read < left) {
                 memcpy(buf, &cache->buf[0], read);
@@ -129,6 +137,7 @@ src_read(pgp_source_t *src, void *buf, size_t len, size_t *readres)
     }
 
 finish:
+    // RNP_LOG("here: %p", src->read);
     src->readb += len;
     if (src->knownsize && (src->readb == src->size)) {
         src->eof = 1;