Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

tftpd: slight correction to progress bar code

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-11-08 18:07:36 +01:00
parent 8bd0af9962
commit adc08ef194
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
networking/tftp.c
View File

@ -129,9 +129,8 @@ static void progress_meter(int flag)
errno = save_errno; errno = save_errno;
} }
static void tftp_progress_init(const char *file) static void tftp_progress_init(void)
{ {
G.file = file;
progress_meter(-1); progress_meter(-1);
} }
static void tftp_progress_done(void) static void tftp_progress_done(void)
@ -139,8 +138,8 @@ static void tftp_progress_done(void)
progress_meter(0); progress_meter(0);
} }
#else #else
# define tftp_progress_init(file) ((void)0) # define tftp_progress_init() ((void)0)
# define tftp_progress_done() ((void)0) # define tftp_progress_done() ((void)0)
#endif #endif
#if ENABLE_FEATURE_TFTP_BLOCKSIZE #if ENABLE_FEATURE_TFTP_BLOCKSIZE
@ -411,7 +410,7 @@ static int tftp_protocol(
* we look at server's reply later */ * we look at server's reply later */
G.size = st.st_size; G.size = st.st_size;
if (remote_file && st.st_size) if (remote_file && st.st_size)
tftp_progress_init(remote_file); tftp_progress_init();
# endif # endif
} }
#endif #endif
@ -567,7 +566,7 @@ static int tftp_protocol(
if (res) { if (res) {
G.size = bb_strtoull(res, NULL, 10); G.size = bb_strtoull(res, NULL, 10);
if (remote_file && G.size) if (remote_file && G.size)
tftp_progress_init(remote_file); tftp_progress_init();
} }
} }
# endif # endif
@ -715,6 +714,9 @@ int tftp_main(int argc UNUSED_PARAM, char **argv)
remote_file, local_file); remote_file, local_file);
# endif # endif
# if ENABLE_FEATURE_TFTP_PROGRESS_BAR
G.file = remote_file;
# endif
result = tftp_protocol( result = tftp_protocol(
NULL /*our_lsa*/, peer_lsa, NULL /*our_lsa*/, peer_lsa,
local_file, remote_file local_file, remote_file