diff options
| author | Tatsuya Kinoshita <tats@vega.ocn.ne.jp> | 2011-05-04 07:23:02 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@vega.ocn.ne.jp> | 2011-05-04 07:23:02 +0000 |
| commit | 6db339b3d7a391f196e7c4b725a4ed0bd00f31cf (patch) | |
| tree | 7d6fed976b72694d61fc595a745d394e1cd6e1a5 /ftp.c | |
| parent | Adding upstream version 0.5.1 (diff) | |
| download | w3m-upstream/0.5.2.tar.gz w3m-upstream/0.5.2.zip | |
Adding upstream version 0.5.2upstream/0.5.2
Diffstat (limited to 'ftp.c')
| -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.39 2007/05/31 01:19:50 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; } |