storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 03365] ~/.netrc support

Browse Source 
* etc.c (add_auth_pass_entry): add netrc arg
		add new entry to tail
	(find_auth_pass_entry): ent->host == NULL is "default"
	(loadPasswd): rewrite with next_token, parsePasswd,
			openPasswdFile
			load ~/.netrc
	(next_token): added
	(parsePasswd): added
	(openPasswdFile): added
* ftp.c (openFTP): use find_auth_user_passwd
* NEWS: ~/.netrc
From: Fumitoshi UKAI  <ukai@debian.or.jp>
This commit is contained in:
Fumitoshi UKAI
2002-10-30 17:21:35 +00:00
parent d915ea74a5
commit c5a144b682
4 changed files with 179 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ftp.c
View File

@@ -1,4 +1,4 @@
/* $Id: ftp.c,v 1.12 2002/08/20 17:49:39 ukai Exp $ */
/* $Id: ftp.c,v 1.13 2002/10/30 17:21:42 ukai Exp $ */
#include <stdio.h>
#include <pwd.h>
#include <Str.h>
@@ -391,8 +391,8 @@ openFTP(ParsedURL *pu)
Str tmp2 = Strnew();
Str tmp3 = Strnew();
STATUS s;
char *user;
char *pass;
char *user = NULL;
char *pass = NULL;
Str pwd = NULL;
int add_auth_cookie_flag;
char *realpathname = NULL;
@@ -402,13 +402,26 @@ openFTP(ParsedURL *pu)
#endif
add_auth_cookie_flag = 0;
if (pu->user)
if (pu->user == NULL && pu->pass == NULL) {
Str uname, pwd;
if (find_auth_user_passwd(pu, NULL, &uname, &pwd, 0)) {
if (uname)
user = uname->ptr;
if (pwd)
pass = pwd->ptr;
}
}
if (user)
/* do nothing */ ;
else if (pu->user)
user = pu->user;
else {
Strcat_charp(tmp3, "anonymous");
user = tmp3->ptr;
}
if (pu->pass)
if (pass)
/* do nothing */ ;
else if (pu->pass)
pass = pu->pass;
else if (pu->user) {
pwd = find_auth_cookie(pu->host, pu->port, pu->file, pu->user);