From 21b5491b78e15ab3036cf0fc9fc595d8a6b9dd45 Mon Sep 17 00:00:00 2001
From: Ito Hiroyuki <ZXB01226@nifty.com>
Date: Sun, 8 Aug 2010 09:53:42 +0000
Subject: [w3m-dev 04360] Re: "important" bugs from bugs.debian.org

---
 main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index e510f79..76d2e6d 100644
--- a/main.c
+++ b/main.c
@@ -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
 #include "fm.h"
 #include <signal.h>
@@ -626,6 +626,9 @@ main(int argc, char **argv, char **envp)
 		if (++i >= argc)
 		    usage();
 		COLS = atoi(argv[i]);
+		if (COLS > MAXIMUM_COLS) {
+		    COLS = MAXIMUM_COLS;
+		}
 	    }
 	    else if (!strcmp("-ppc", argv[i])) {
 		double ppc;
@@ -776,7 +779,7 @@ main(int argc, char **argv, char **envp)
     }
     if (w3m_dump) {
 	if (COLS == 0)
-	    COLS = 80;
+	    COLS = DEFAULT_COLS;
     }
 
 #ifdef USE_BINMODE_STREAM
-- 
cgit v1.2.3