From e63a48896365455e9832fd75c85ee8981e6a5194 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Wed, 25 Mar 2020 10:03:40 +0100 Subject: [PATCH] net: nfs: show file offset and improve progress display Always align progress display to the start of the column and show downloaded file offset. Signed-off-by: Marek Szyprowski Change-Id: Ia5e3185110e0dbfc89046854f8d612f6428af794 --- net/nfs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/nfs.c b/net/nfs.c index 9d6eb10..3dbeae4 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -711,6 +711,7 @@ static int nfs_read_reply(uchar *pkt, unsigned len) struct rpc_t rpc_pkt; int rlen; uchar *data_ptr; + int offset = nfs_offset - net_boot_file_offset; debug("%s\n", __func__); @@ -732,10 +733,10 @@ static int nfs_read_reply(uchar *pkt, unsigned len) return -ntohl(rpc_pkt.u.reply.data[0]); } - if ((nfs_offset != 0) && !((nfs_offset) % + if ((offset != 0) && !((offset) % (NFS_READ_SIZE / 2 * 256 * HASHES_PER_LINE))) puts("\n\t "); - if (!(nfs_offset % ((NFS_READ_SIZE / 2) * 256))) + if (!(offset % ((NFS_READ_SIZE / 2) * 256))) putc('#'); if (choosen_nfs_version != NFS_V3) { @@ -758,7 +759,7 @@ static int nfs_read_reply(uchar *pkt, unsigned len) if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + rlen) > len) return -9999; - if (store_block(data_ptr, nfs_offset - net_boot_file_offset, rlen)) + if (store_block(data_ptr, offset, rlen)) return -9999; return rlen; @@ -959,7 +960,8 @@ void nfs_start(void) printf("; sending through gateway %pI4", &net_gateway); } - printf("\nFilename '%s/%s'.", nfs_path, nfs_filename); + printf("\nFilename '%s/%s', offset %u.", nfs_path, nfs_filename, + net_boot_file_offset); if (net_boot_file_expected_size_in_blocks) { printf(" Size is 0x%x Bytes = ", -- 2.7.4