diff options
| author | Ito Hiroyuki <ZXB01226@nifty.com> | 2010-08-03 10:02:16 +0000 |
|---|---|---|
| committer | Ito Hiroyuki <ZXB01226@nifty.com> | 2010-08-03 10:02:16 +0000 |
| commit | 49883bb9cb1d66d377982f092174846e29697313 (patch) | |
| tree | 13a641230f3e2d001edfc87eb002a5ce48ffdab1 /main.c | |
| parent | Revert the change of using ATTR_TITLE if ATTR_ALT is empty. (diff) | |
| download | w3m-49883bb9cb1d66d377982f092174846e29697313.tar.gz w3m-49883bb9cb1d66d377982f092174846e29697313.zip | |
* register user name and password for proxy authentication.
* remove option -pauth
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 21 |
1 files changed, 5 insertions, 16 deletions
@@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.264 2010/07/25 09:55:05 htrb Exp $ */ +/* $Id: main.c,v 1.265 2010/08/03 10:02:16 htrb Exp $ */ #define MAINPROGRAM #include "fm.h" #include <signal.h> @@ -242,7 +242,6 @@ fusage(FILE * f, int err) fprintf(f, " -cookie use cookie (-no-cookie: don't use cookie)\n"); #endif /* USE_COOKIE */ - fprintf(f, " -pauth user:pass proxy authentication\n"); fprintf(f, " -graph use graphic character\n"); fprintf(f, " -no-graph don't use graphic character\n"); #ifdef DEBIAN /* replaced by ukai: pager requires -s */ @@ -326,12 +325,13 @@ sig_chld(int signo) pid_t pid; #ifdef HAVE_WAITPID - while ((pid = waitpid(-1, &p_stat, WNOHANG)) > 0) { + while ((pid = waitpid(-1, &p_stat, WNOHANG)) > 0) #elif HAVE_WAIT3 - while ((pid = wait3(&p_stat, WNOHANG, NULL)) > 0) { + while ((pid = wait3(&p_stat, WNOHANG, NULL)) > 0) #else - if ((pid = wait(&p_stat)) > 0) { + if ((pid = wait(&p_stat)) > 0) #endif + { DownloadList *d; if (WIFEXITED(p_stat)) { @@ -702,17 +702,6 @@ main(int argc, char **argv, char **envp) accept_cookie = TRUE; } #endif /* USE_COOKIE */ - else if (!strcmp("-pauth", argv[i])) { - if (++i >= argc) - usage(); - proxy_auth_cookie = Strnew_m_charp("Basic ", - encodeB(argv[i])->ptr, - NULL); - while (argv[i][0]) { - argv[i][0] = '\0'; - argv[i]++; - } - } #ifdef DEBIAN else if (!strcmp("-s", argv[i])) #else |