From 49626e632ea0980a861442cbb7deba18fe64800d Mon Sep 17 00:00:00 2001 From: Tomas Janousek Date: May 23 2007 13:19:54 +0000 Subject: typo & patch fix --- diff --git a/gpm-1.20.1-default-handler.patch b/gpm-1.20.1-default-handler.patch index d4679a0..13cb5fe 100644 --- a/gpm-1.20.1-default-handler.patch +++ b/gpm-1.20.1-default-handler.patch @@ -1,21 +1,21 @@ ---- gpm-1.20.1/src/lib/liblow.c.orig 2002-12-24 23:57:16.000000000 +0100 -+++ gpm-1.20.1/src/lib/liblow.c 2007-05-17 01:48:02.000000000 +0200 -@@ -249,7 +249,7 @@ +--- gpm-1.20.1/src/lib/liblow.c.default-handler 2007-05-23 15:15:01.000000000 +0200 ++++ gpm-1.20.1/src/lib/liblow.c 2007-05-23 15:16:26.000000000 +0200 +@@ -250,7 +250,7 @@ gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM); - memcpy(tty,option.consolename,strlen(option.consolename)-1); - sprintf(&tty[strlen(option.consolename)-1],"%i",flag); + memcpy(tty,consolename,strlen(consolename)-1); + sprintf(&tty[strlen(consolename)-1],"%i",flag); - } else { /* use your current vc */ + } else if (flag==0) { /* use your current vc */ if (isatty(0)) tty = ttyname(0); /* stdin */ if (!tty && isatty(1)) tty = ttyname(1); /* stdout */ if (!tty && isatty(2)) tty = ttyname(2); /* stderr */ -@@ -265,7 +265,8 @@ +@@ -271,7 +271,8 @@ } - - conn->vc=atoi(&tty[strlen(option.consolename)-1]); + #endif + conn->vc=atoi(&tty[strlen(consolename)-1]); - } + } else /* a default handler -- use console */ -+ tty = strdup(option.consolename); ++ tty = strdup(consolename); if (gpm_consolefd == -1) if ((gpm_consolefd=open(tty,O_WRONLY)) < 0) { diff --git a/gpm.spec b/gpm.spec index 6127c6b..47dff7c 100644 --- a/gpm.spec +++ b/gpm.spec @@ -69,7 +69,7 @@ mouse button. %patch22 -p1 -b .close-fds %patch23 -p1 -b .aligned-sleep %patch24 -p1 -b .deadsocket -%patch25 -p1 -b /default-handler +%patch25 -p1 -b .default-handler %build rm -f configure