fix indent

This commit is contained in:
Fumitoshi UKAI
2002-11-15 15:21:07 +00:00
parent 62fc785e24
commit 719d13ef10
2 changed files with 17 additions and 16 deletions
+9 -9
View File
@@ -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 "fm.h"
#include <sys/types.h> #include <sys/types.h>
#include "myctype.h" #include "myctype.h"
@@ -1945,8 +1945,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
if (pu.scheme == SCM_LOCAL) { if (pu.scheme == SCM_LOCAL) {
UFclose(&f); UFclose(&f);
_doFileCopy(pu.real_file, _doFileCopy(pu.real_file,
conv_from_system(guess_save_name conv_from_system(guess_save_name
(NULL, pu.real_file)), TRUE); (NULL, pu.real_file)), TRUE);
} }
else { else {
if (DecodeCTE && IStype(f.stream) != IST_ENCODED) if (DecodeCTE && IStype(f.stream) != IST_ENCODED)
@@ -7314,12 +7314,12 @@ doFileSave(URLFile uf, char *defstr)
disp_err_message(msg->ptr, FALSE); disp_err_message(msg->ptr, FALSE);
return; return;
} }
/* /*
if (save2tmp(uf, p) < 0) { * if (save2tmp(uf, p) < 0) {
msg = Sprintf("Can't save to %s", p); * msg = Sprintf("Can't save to %s", p);
disp_err_message(msg->ptr, FALSE); * disp_err_message(msg->ptr, FALSE);
} * }
*/ */
lock = tmpfname(TMPF_DFL, ".lock")->ptr; lock = tmpfname(TMPF_DFL, ".lock")->ptr;
#if defined(HAVE_SYMLINK) && defined(HAVE_LSTAT) #if defined(HAVE_SYMLINK) && defined(HAVE_LSTAT)
symlink(p, lock); symlink(p, lock);
+8 -7
View File
@@ -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 #define MAINPROGRAM
#include "fm.h" #include "fm.h"
#include <signal.h> #include <signal.h>
@@ -5822,7 +5822,7 @@ DownloadListBuffer(void)
duration / (60 * 60), (duration / 60) % 60, duration / (60 * 60), (duration / 60) % 60,
duration % 60, convert_size(rate, 1))); duration % 60, convert_size(rate, 1)));
if (!d->ok && size < d->size && rate) { 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), Strcat(src, Sprintf(" eta %02d:%02d:%02d", eta / (60 * 60),
(eta / 60) % 60, eta % 60)); (eta / 60) % 60, eta % 60));
} }
@@ -5832,10 +5832,11 @@ DownloadListBuffer(void)
Strcat(src, Sprintf("<input type=submit name=ok%d value=OK>", Strcat(src, Sprintf("<input type=submit name=ok%d value=OK>",
d->pid)); d->pid));
if (size < d->size) if (size < d->size)
Strcat_charp(src, " Download incompleted"); Strcat_charp(src, " Download incompleted");
else else
Strcat_charp(src, " Download completed"); Strcat_charp(src, " Download completed");
} else }
else
Strcat(src, Sprintf("<input type=submit name=stop%d value=STOP>", Strcat(src, Sprintf("<input type=submit name=stop%d value=STOP>",
d->pid)); d->pid));
Strcat_charp(src, "\n</pre><hr>\n"); Strcat_charp(src, "\n</pre><hr>\n");
@@ -5854,11 +5855,11 @@ download_action(struct parsed_tagarg *arg)
if (!strcmp(arg->arg, "update")) if (!strcmp(arg->arg, "update"))
break; break;
else if (!strncmp(arg->arg, "stop", 4)) { else if (!strncmp(arg->arg, "stop", 4)) {
pid = (pid_t)atoi(&arg->arg[4]); pid = (pid_t) atoi(&arg->arg[4]);
kill(pid, SIGKILL); kill(pid, SIGKILL);
} }
else if (!strncmp(arg->arg, "ok", 2)) else if (!strncmp(arg->arg, "ok", 2))
pid = (pid_t)atoi(&arg->arg[2]); pid = (pid_t) atoi(&arg->arg[2]);
else else
continue; continue;
for (d = FirstDL; d; d = d->next) { for (d = FirstDL; d; d = d->next) {