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

[w3m-dev 04360] Re: "important" bugs from bugs.debian.org

Browse Source
This commit is contained in:
Ito Hiroyuki
2010-08-08 09:53:42 +00:00
parent de4557c096
commit 21b5491b78
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+9 -1
View File
@@ -1,3 +1,11 @@
2010-08-08 d+w3m@vdr.jp
* [w3m-dev 04360] Re: "important" bugs from bugs.debian.org
* main.c (main): use DEFAULT_COLS
(main): the maximum value of the -cols option is MAXIMUM_COLS
* backend.c (backend): use DEFAULT_COLS
* fm.h (MAXIMUM_COLS, DEFAULT_COLS): added
2010-08-04 Ito Hiroyuki <ZXB01226@nifty.com> 2010-08-04 Ito Hiroyuki <ZXB01226@nifty.com>
* [w3m-dev 04369] Re: w3m's bugs from bugs.debian.org * [w3m-dev 04369] Re: w3m's bugs from bugs.debian.org
@@ -9108,4 +9116,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.1027 2010/08/04 14:06:35 htrb Exp $ $Id: ChangeLog,v 1.1028 2010/08/08 09:53:42 htrb Exp $
backend.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: backend.c,v 1.14 2010/07/18 14:10:09 htrb Exp $ */ /* $Id: backend.c,v 1.15 2010/08/08 09:53:42 htrb Exp $ */
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
@@ -294,7 +294,7 @@ backend(void)
w3m_dump = 0; w3m_dump = 0;
if (COLS == 0) if (COLS == 0)
COLS = 80; COLS = DEFAULT_COLS;
#ifdef USE_MOUSE #ifdef USE_MOUSE
use_mouse = FALSE; use_mouse = FALSE;
#endif /* USE_MOUSE */ #endif /* USE_MOUSE */
fm.h
+4 -1
View File
@@ -1,4 +1,4 @@
/* $Id: fm.h,v 1.147 2010/08/04 14:06:36 htrb Exp $ */ /* $Id: fm.h,v 1.148 2010/08/08 09:53:42 htrb Exp $ */
/* /*
* w3m: WWW wo Miru utility * w3m: WWW wo Miru utility
* *
@@ -101,6 +101,9 @@ void bzero(void *, int);
#define LINELEN 256 /* Initial line length */ #define LINELEN 256 /* Initial line length */
#define PAGER_MAX_LINE 10000 /* Maximum line kept as pager */ #define PAGER_MAX_LINE 10000 /* Maximum line kept as pager */
#define MAXIMUM_COLS 1024
#define DEFAULT_COLS 80
#ifdef USE_IMAGE #ifdef USE_IMAGE
#define MAX_IMAGE 1000 #define MAX_IMAGE 1000
#define MAX_IMAGE_SIZE 2048 #define MAX_IMAGE_SIZE 2048
main.c
+5 -2
View File
@@ -1,4 +1,4 @@
/* $Id: main.c,v 1.267 2010/08/04 14:06:36 htrb Exp $ */ /* $Id: main.c,v 1.268 2010/08/08 09:53:42 htrb Exp $ */
#define MAINPROGRAM #define MAINPROGRAM
#include "fm.h" #include "fm.h"
#include <signal.h> #include <signal.h>
@@ -626,6 +626,9 @@ main(int argc, char **argv, char **envp)
if (++i >= argc) if (++i >= argc)
usage(); usage();
COLS = atoi(argv[i]); COLS = atoi(argv[i]);
if (COLS > MAXIMUM_COLS) {
COLS = MAXIMUM_COLS;
}
} }
else if (!strcmp("-ppc", argv[i])) { else if (!strcmp("-ppc", argv[i])) {
double ppc; double ppc;
@@ -776,7 +779,7 @@ main(int argc, char **argv, char **envp)
} }
if (w3m_dump) { if (w3m_dump) {
if (COLS == 0) if (COLS == 0)
COLS = 80; COLS = DEFAULT_COLS;
} }
#ifdef USE_BINMODE_STREAM #ifdef USE_BINMODE_STREAM