changed option handling for -p to strtoul

fixed off by one in scroll


git-svn-id: http://dzen.googlecode.com/svn/trunk@65 f2baff5b-bf2c-0410-a398-912abdc3d8b2

2 files changed, 2 insertions, 2 deletions

diff --git a/action.c b/action.c
index 9ef85a1..60bb244 100644
--- a/action.c
+++ b/action.c
@@ -233,7 +233,7 @@ int
 
 static int
 	scroll(int n) {
-		if(dzen.slave_win.last_line_vis < dzen.slave_win.max_lines)
+		if(dzen.slave_win.last_line_vis <= dzen.slave_win.max_lines)
 			return;
 		if(dzen.slave_win.first_line_vis + n < 0) {
 			dzen.slave_win.first_line_vis = 0;
diff --git a/main.c b/main.c
index 191a2e2..b5f7dc4 100644
--- a/main.c
+++ b/main.c
@@ -536,7 +536,7 @@ main(int argc, char *argv[]) {
 		else if(!strncmp(argv[i], "-p", 3)) {
 			dzen.ispersistent = True;
 			if (i + 1 < argc) {
-				dzen.timeout = strtol(argv[i + 1], &endptr, 10);
+				dzen.timeout = strtoul(argv[i + 1], &endptr, 10);
 				*endptr ? dzen.timeout = 0 : i++;
 			}
 		}