diff options
| author | Dai Sato <satodai@w3m.jp> | 2006-04-05 14:18:53 +0000 |
|---|---|---|
| committer | Dai Sato <satodai@w3m.jp> | 2006-04-05 14:18:53 +0000 |
| commit | bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb (patch) | |
| tree | e7632ff276fbfed9e41e487bad1375f46c1f4fa7 /ftp.c | |
| parent | replace pclose passed to localcgi_post/get() with fclose in openURL() (diff) | |
| download | w3m-bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb.tar.gz w3m-bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb.zip | |
apply multiple patches on w3m-dev(-en) ML since Jun 2005 to Jan 2006.
Diffstat (limited to '')
| -rw-r--r-- | ftp.c | 19 |
1 files changed, 18 insertions, 1 deletions
@@ -1,6 +1,8 @@ -/* $Id: ftp.c,v 1.35 2004/04/16 18:47:19 ukai Exp $ */ +/* $Id: ftp.c,v 1.36 2006/04/05 14:18:54 inu Exp $ */ #include <stdio.h> +#ifndef __MINGW32_VERSION #include <pwd.h> +#endif /* __MINGW32_VERSION */ #include <Str.h> #include <signal.h> #include <setjmp.h> @@ -14,10 +16,14 @@ #include <malloc.h> #endif /* DEBUG */ +#ifndef __MINGW32_VERSION #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> #include <arpa/inet.h> +#else +#include <winsock.h> +#endif /* __MINGW32_VERSION */ typedef struct _FTP { char *host; @@ -371,7 +377,14 @@ openFTPStream(ParsedURL *pu, URLFile *uf) term_cbreak(); } else { +#ifndef __MINGW32_VERSION pwd = Strnew_charp((char *)getpass("Password: ")); +#else + term_raw(); + pwd = Strnew_charp(inputLine("Password: ", NULL, IN_PASSWORD)); + pwd = Str_conv_to_system(pwd); + term_cbreak(); +#endif /* __MINGW32_VERSION */ } add_auth_cookie_flag = TRUE; } @@ -380,8 +393,12 @@ openFTPStream(ParsedURL *pu, URLFile *uf) else if (ftppasswd != NULL && *ftppasswd != '\0') pass = ftppasswd; else { +#ifndef __MINGW32_VERSION struct passwd *mypw = getpwuid(getuid()); tmp = Strnew_charp(mypw ? mypw->pw_name : "anonymous"); +#else + tmp = Strnew_charp("anonymous"); +#endif __MINGW32_VERSION Strcat_char(tmp, '@'); pass = tmp->ptr; } |