search for: send_file_end

...+ if (send_file_write(buffer, r) < 0) { + pclose(fp); - while ((r = fread (buffer, 1, sizeof buffer, fp)) > 0) { - if (send_file_write (buffer, r) < 0) { - pclose (fp); return -1; } - } - if (ferror (fp)) { - fprintf (stderr, "fread: %m"); - send_file_end (1); /* Cancel. */ - pclose (fp); + if (ferror(fp)) { + fprintf(stderr, "fread: %m"); + send_file_end(1); /* Cancel. */ + pclose(fp); + return -1; } - if (pclose (fp) != 0) { - fprintf (stderr, "pclose: %m"); - send_file_end (1); /* Cancel. */ +...

...ncel the transfer. + */ + reply (NULL, NULL); + + while ((r = fread (buffer, 1, sizeof buffer, fp)) > 0) { + if (send_file_write (buffer, r) < 0) { + pclose (fp); + return -1; + } + } + + if (ferror (fp)) { + fprintf (stderr, "fread: %ld: %m\n", inode); + send_file_end (1); /* Cancel. */ + pclose (fp); + return -1; + } + + if (pclose (fp) != 0) { + fprintf (stderr, "pclose: %ld: %m\n", inode); + send_file_end (1); /* Cancel. */ + return -1; + } + + if (send_file_end (0)) /* Normal end of file. */ + return -1; + + return 0; +} di...

...we can only cancel the transfer. + */ + reply (NULL, NULL); + + while ((r = fread (buffer, 1, sizeof buffer, fp)) > 0) { + if (send_file_write (buffer, r) < 0) { + pclose (fp); + return -1; + } + } + + if (ferror (fp)) { + fprintf (stderr, "fread: %m"); + send_file_end (1); /* Cancel. */ + pclose (fp); + return -1; + } + + if (pclose (fp) != 0) { + fprintf (stderr, "pclose: %m"); + send_file_end (1); /* Cancel. */ + return -1; + } + + if (send_file_end (0)) /* Normal end of file. */ + return -1; + + return 0; +} diff --git a/dae...

...1, sizeof buffer, fp)) > 0) { >> + if (send_file_write (buffer, r) < 0) { >> + pclose (fp); >> + return -1; >> + } >> + } >> + >> + if (ferror (fp)) { >> + fprintf (stderr, "fread: %ld: %m\n", inode); >> + send_file_end (1); /* Cancel. */ >> + pclose (fp); >> + return -1; >> + } >> + >> + if (pclose (fp) != 0) { >> + fprintf (stderr, "pclose: %ld: %m\n", inode); >> + send_file_end (1); /* Cancel. */ >> + return -1; >> + } >>...

"icat" name comes from the employed command line tool which might be replaced later on with a different implementation. The command name is a bit confusing because it's similar to "cat" but act as "donwload". Therefore I am renaming it with a more clear name. At the same time I cleaned up a bit the code and improved it's readability and code comments. This

...&img, &fs); > + if (ret < 0) > + return ret; > + > + reply (NULL, NULL); /* Reply message. */ > + > + ret = tsk_fs_dir_walk (fs, fs->root_inum, flags, > + findblk_callback, (void *) &block); > + if (ret == 0) > + ret = send_file_end (0); /* File transfer end. */ > + else > + send_file_end (1); /* Cancel file transfer. */ > + > + fs->close (fs); > + img->close (img); > + > + return ret; > +} > + > + (One extra empty line.) > +static TSK_WALK_RET_ENUM > +findblk_callback (TSK_...

...< 0) > + return ret; > + > + reply (NULL, NULL); /* Reply message. */ > + > + ret = tsk_fs_dir_walk (fs, fs->root_inum, flags, ifind_callback, > + (void *) &inode); Here 'inode' is int64_t ... > + if (ret == 0) > + ret = send_file_end (0); /* File transfer end. */ > + else > + send_file_end (1); /* Cancel file transfer. */ > + > + fs->close (fs); > + img->close (img); > + > + return ret; > +} > + > /* Inspect the device and initialises the img and fs structures. > * Return 0 on...

...> + while ((r = fread (buffer, 1, sizeof buffer, fp)) > 0) { > + if (send_file_write (buffer, r) < 0) { > + pclose (fp); > + return -1; > + } > + } > + > + if (ferror (fp)) { > + fprintf (stderr, "fread: %ld: %m\n", inode); > + send_file_end (1); /* Cancel. */ > + pclose (fp); > + return -1; > + } > + > + if (pclose (fp) != 0) { > + fprintf (stderr, "pclose: %ld: %m\n", inode); > + send_file_end (1); /* Cancel. */ > + return -1; > + } > + > + if (send_file_end (0)) /* Norm...

...ret < 0) > > > + return ret; > > > + > > > + reply (NULL, NULL); /* Reply message. */ > > > + > > > + ret = tsk_fs_dir_walk (fs, fs->root_inum, flags, fswalk_callback, > > NULL); > > > + if (ret == 0) > > > + ret = send_file_end (0); /* File transfer end. */ > > > + else > > > + send_file_end (1); /* Cancel file transfer. */ > > > + > > > + fs->close (fs); > > > + img->close (img); > > > + > > > + return ret; > > > +} > > > + &g...

...we can only cancel the transfer. + */ + reply (NULL, NULL); + + while ((r = fread (buffer, 1, sizeof buffer, fp)) > 0) { + if (send_file_write (buffer, r) < 0) { + pclose (fp); + return -1; + } + } + + if (ferror (fp)) { + fprintf (stderr, "fread: %m"); + send_file_end (1); /* Cancel. */ + pclose (fp); + return -1; + } + + if (pclose (fp) != 0) { + fprintf (stderr, "pclose: %m"); + send_file_end (1); /* Cancel. */ + return -1; + } + + if (send_file_end (0)) /* Normal end of file. */ + return -1; + + return 0; +} diff --git a/gen...

...; >>+ if (send_file_write (buffer, r) < 0) { > >>+ pclose (fp); > >>+ return -1; > >>+ } > >>+ } > >>+ > >>+ if (ferror (fp)) { > >>+ fprintf (stderr, "fread: %ld: %m\n", inode); > >>+ send_file_end (1); /* Cancel. */ > >>+ pclose (fp); > >>+ return -1; > >>+ } > >>+ > >>+ if (pclose (fp) != 0) { > >>+ fprintf (stderr, "pclose: %ld: %m\n", inode); > >>+ send_file_end (1); /* Cancel. */ > >>+ re...

...we can only cancel the transfer. + */ + reply (NULL, NULL); + + while ((r = fread (buffer, 1, sizeof buffer, fp)) > 0) { + if (send_file_write (buffer, r) < 0) { + pclose (fp); + return -1; + } + } + + if (ferror (fp)) { + fprintf (stderr, "fread: %m"); + send_file_end (1); /* Cancel. */ + pclose (fp); + return -1; + } + + if (pclose (fp) != 0) { + fprintf (stderr, "pclose: %m"); + send_file_end (1); /* Cancel. */ + return -1; + } + + if (send_file_end (0)) /* Normal end of file. */ + return -1; + + return 0; +} diff --git a/gen...

The command name is a bit confusing because it's similar to "cat" but act as "donwload". Therefore I am renaming it with a more clear name. At the same go I cleaned up a bit the code following the standards and improved the API documentation. This patch is ready for review. Code available at: https://github.com/noxdafox/libguestfs/tree/download_inode Matteo Cafasso (3):

...ransfer. + */ + reply (NULL, NULL); + + while ((r = fread (buffer, 1, GUESTFS_MAX_CHUNK_SIZE, fp)) > 0) { + if (send_file_write (buffer, r) < 0) { + fclose (fp); + return -1; + } + } + + if (ferror (fp)) { + fprintf (stderr, "fread: %s: %m\n", tmpfile); + send_file_end (1); /* Cancel. */ + fclose (fp); + return -1; + } + + if (fclose (fp) != 0) { + fprintf (stderr, "fclose: %s: %m\n", tmpfile); + send_file_end (1); /* Cancel. */ + return -1; + } + + if (send_file_end (0)) /* Normal end of file. */ + return -1; + + return 0; +} d...

...(); I don't think that's the right place for yr_finalize. > + return -1; > + } > + > + reply (NULL, NULL); /* Reply message. */ > + > + ret = yr_rules_scan_fd (rules, fd, 0, yara_rules_callback, (void *) path, 0); > + if (ret == ERROR_SUCCESS) > + ret = send_file_end (0); /* File transfer end. */ > + else > + send_file_end (1); /* Cancel file transfer. */ > + > + return 0; > +} > + > /* Upload rules file on a temporary file. > * Return 0 on success, -1 on error. > */ > @@ -209,6 +244,58 @@ compile_error_callback(int lev...

...r ("asprintf"); return -1; } @@ -311,14 +311,14 @@ do_ntfscat_i (const mountable_t *mountable, int64_t inode) } if (ferror (fp)) { - fprintf (stderr, "fread: %ld: %m\n", inode); + fprintf (stderr, "fread: %" PRIi64 ": %m\n", inode); send_file_end (1); /* Cancel. */ pclose (fp); return -1; } if (pclose (fp) != 0) { - fprintf (stderr, "pclose: %ld: %m\n", inode); + fprintf (stderr, "pclose: %" PRIi64 ": %m\n", inode); send_file_end (1); /* Cancel. */ return -1; } -- 2.5.0

v2: - use boolean field in struct - move refactoring to previous series Matteo Cafasso (3): New API: internal_find_block New API: find_block find_block: added API tests daemon/tsk.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ generator/actions.ml | 25 ++++++++++++ src/MAX_PROC_NR | 2 +- src/tsk.c | 17 +++++++++

...ncel the transfer. + */ + reply (NULL, NULL); + + while ((r = fread (buffer, 1, sizeof buffer, fp)) > 0) { + if (send_file_write (buffer, r) < 0) { + pclose (fp); + return -1; + } + } + + if (ferror (fp)) { + fprintf (stderr, "fread: %ld: %m\n", inode); + send_file_end (1); /* Cancel. */ + pclose (fp); + return -1; + } + + if (pclose (fp) != 0) { + fprintf (stderr, "pclose: %ld: %m\n", inode); + send_file_end (1); /* Cancel. */ + return -1; + } + + if (send_file_end (0)) /* Normal end of file. */ + return -1; + + return 0; +} di...

...ret = open_filesystem (mountable->device, &img, &fs); + if (ret < 0) + return ret; + + reply (NULL, NULL); /* Reply message. */ + + ret = tsk_fs_dir_walk (fs, fs->root_inum, flags, + findino_callback, (void *) &inode); + if (ret == 0) + ret = send_file_end (0); /* File transfer end. */ + else + send_file_end (1); /* Cancel file transfer. */ + + fs->close (fs); + img->close (img); + + return ret; +} + /* Inspect the device and initialises the img and fs structures. * Return 0 on success, -1 on error. */ @@ -120,6 +150,28 @@ fswalk_...

...ret = open_filesystem (mountable->device, &img, &fs); + if (ret < 0) + return ret; + + reply (NULL, NULL); /* Reply message. */ + + ret = tsk_fs_dir_walk (fs, fs->root_inum, flags, + findino_callback, (void *) &inode); + if (ret == 0) + ret = send_file_end (0); /* File transfer end. */ + else + send_file_end (1); /* Cancel file transfer. */ + + fs->close (fs); + img->close (img); + + return ret; +} + /* Inspect the device and initialises the img and fs structures. * Return 0 on success, -1 on error. */ @@ -120,6 +150,28 @@ fswalk_...