diff options
| -rw-r--r-- | display.c | 10 | ||||
| -rw-r--r-- | file.c | 11 | ||||
| -rw-r--r-- | ftp.c | 5 |
3 files changed, 13 insertions, 13 deletions
@@ -1,4 +1,4 @@ -/* $Id: display.c,v 1.46 2002/12/13 02:19:01 ukai Exp $ */ +/* $Id: display.c,v 1.47 2002/12/14 15:26:44 ukai Exp $ */ #include <signal.h> #include "fm.h" @@ -248,7 +248,7 @@ make_lastline_link(Buffer *buf, char *title, char *url) if (url) Strcat_charp(s, " "); l -= s->length; - if (l <= 0) + if (l <= 0) return s; } if (!url) @@ -283,7 +283,7 @@ make_lastline_message(Buffer *buf) #ifdef USE_IMAGE MapArea *a = retrieveCurrentMapArea(buf); if (a) - s = make_lastline_link(buf, a->alt, a->url); + s = make_lastline_link(buf, a->alt, a->url); else #endif { @@ -297,7 +297,7 @@ make_lastline_message(Buffer *buf) p = a_img->title; } if (p || a) - s = make_lastline_link(buf, p, a ? a->url : NULL); + s = make_lastline_link(buf, p, a ? a->url : NULL); } if (s && s->length >= COLS - 3) return s; @@ -331,7 +331,7 @@ make_lastline_message(Buffer *buf) char *p; int i; for (p = msg->ptr; *p; p += i) { - i = get_mclen(get_mctype(p)); + i = get_mclen(get_mctype(p)); l -= i; if (l < 0) break; @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.161 2002/12/14 15:24:03 ukai Exp $ */ +/* $Id: file.c,v 1.162 2002/12/14 15:26:44 ukai Exp $ */ #include "fm.h" #include <sys/types.h> #include "myctype.h" @@ -1898,7 +1898,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer, if (PreserveTimestamp && !stat(pu.real_file, &st)) f.modtime = st.st_mtime; file = conv_from_system(guess_save_name(NULL, pu.real_file)); - } else + } + else file = guess_save_name(t_buf, pu.file); doFileSave(f, file); if (f.scheme == SCM_FTP) @@ -7866,9 +7867,9 @@ guess_save_name(Buffer *buf, char *path) matchattr(q, "filename", 8, &name)) path = name->ptr; else if ((p = checkHeader(buf, "Content-Type:")) != NULL && - (q = strcasestr(p, "name")) != NULL && - (q == p || IS_SPACE(*(q - 1)) || *(q - 1) == ';') && - matchattr(q, "name", 4, &name)) + (q = strcasestr(p, "name")) != NULL && + (q == p || IS_SPACE(*(q - 1)) || *(q - 1) == ';') && + matchattr(q, "name", 4, &name)) path = name->ptr; } return guess_filename(path); @@ -1,4 +1,4 @@ -/* $Id: ftp.c,v 1.16 2002/12/14 15:18:38 ukai Exp $ */ +/* $Id: ftp.c,v 1.17 2002/12/14 15:26:44 ukai Exp $ */ #include <stdio.h> #include <pwd.h> #include <Str.h> @@ -366,8 +366,7 @@ getFtpModtime(FTP ftp, char *path) tmp = read_response(ftp); if (atoi(tmp->ptr) != 213) return -1; - for (p = tmp->ptr + 4; *p && *p == ' '; p++) - ; + for (p = tmp->ptr + 4; *p && *p == ' '; p++) ; if (sscanf(p, "%04d%02d%02d%02d%02d%02d", &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) < 6) |