diff options
| -rw-r--r-- | file.c | 18 | ||||
| -rw-r--r-- | main.c | 15 |
2 files changed, 17 insertions, 16 deletions
@@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.116 2002/11/15 15:19:43 ukai Exp $ */ +/* $Id: file.c,v 1.117 2002/11/15 15:21:07 ukai Exp $ */ #include "fm.h" #include <sys/types.h> #include "myctype.h" @@ -1945,8 +1945,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer, if (pu.scheme == SCM_LOCAL) { UFclose(&f); _doFileCopy(pu.real_file, - conv_from_system(guess_save_name - (NULL, pu.real_file)), TRUE); + conv_from_system(guess_save_name + (NULL, pu.real_file)), TRUE); } else { if (DecodeCTE && IStype(f.stream) != IST_ENCODED) @@ -7314,12 +7314,12 @@ doFileSave(URLFile uf, char *defstr) disp_err_message(msg->ptr, FALSE); return; } -/* - if (save2tmp(uf, p) < 0) { - msg = Sprintf("Can't save to %s", p); - disp_err_message(msg->ptr, FALSE); - } -*/ + /* + * if (save2tmp(uf, p) < 0) { + * msg = Sprintf("Can't save to %s", p); + * disp_err_message(msg->ptr, FALSE); + * } + */ lock = tmpfname(TMPF_DFL, ".lock")->ptr; #if defined(HAVE_SYMLINK) && defined(HAVE_LSTAT) symlink(p, lock); @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.132 2002/11/15 15:19:46 ukai Exp $ */ +/* $Id: main.c,v 1.133 2002/11/15 15:21:07 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include <signal.h> @@ -5822,7 +5822,7 @@ DownloadListBuffer(void) duration / (60 * 60), (duration / 60) % 60, duration % 60, convert_size(rate, 1))); if (!d->ok && size < d->size && rate) { - eta = (d->size - size) / rate; + eta = (d->size - size) / rate; Strcat(src, Sprintf(" eta %02d:%02d:%02d", eta / (60 * 60), (eta / 60) % 60, eta % 60)); } @@ -5832,10 +5832,11 @@ DownloadListBuffer(void) Strcat(src, Sprintf("<input type=submit name=ok%d value=OK>", d->pid)); if (size < d->size) - Strcat_charp(src, " Download incompleted"); + Strcat_charp(src, " Download incompleted"); else - Strcat_charp(src, " Download completed"); - } else + Strcat_charp(src, " Download completed"); + } + else Strcat(src, Sprintf("<input type=submit name=stop%d value=STOP>", d->pid)); Strcat_charp(src, "\n</pre><hr>\n"); @@ -5854,11 +5855,11 @@ download_action(struct parsed_tagarg *arg) if (!strcmp(arg->arg, "update")) break; else if (!strncmp(arg->arg, "stop", 4)) { - pid = (pid_t)atoi(&arg->arg[4]); + pid = (pid_t) atoi(&arg->arg[4]); kill(pid, SIGKILL); } else if (!strncmp(arg->arg, "ok", 2)) - pid = (pid_t)atoi(&arg->arg[2]); + pid = (pid_t) atoi(&arg->arg[2]); else continue; for (d = FirstDL; d; d = d->next) { |