1 |
mr_bones_ 08/01/24 05:50:26 |
2 |
|
3 |
Added: kmuddy-0.8-idle-crash.patch |
4 |
Log: |
5 |
add patch from Tanktalus@×××××.com to avoid crash on extreme idle time (bug #206357) |
6 |
(Portage version: 2.1.3.19) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 games-mud/kmuddy/files/kmuddy-0.8-idle-crash.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-mud/kmuddy/files/kmuddy-0.8-idle-crash.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-mud/kmuddy/files/kmuddy-0.8-idle-crash.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: kmuddy-0.8-idle-crash.patch |
15 |
=================================================================== |
16 |
diff -ru kmuddy-0.8/lib/cstatus.cpp kmuddy-0.8.patch/lib/cstatus.cpp |
17 |
--- kmuddy-0.8/lib/cstatus.cpp 2005-10-19 02:01:52.000000000 -0600 |
18 |
+++ kmuddy-0.8.patch/lib/cstatus.cpp 2008-01-16 20:06:09.000000000 -0700 |
19 |
@@ -16,6 +16,9 @@ |
20 |
* * |
21 |
***************************************************************************/ |
22 |
|
23 |
+//Sets the size of the status buffer which controls time displayer |
24 |
+#define status_size 30 |
25 |
+ |
26 |
#include "cstatus.h" |
27 |
|
28 |
#include <qdatetime.h> |
29 |
@@ -37,8 +40,8 @@ |
30 |
|
31 |
sb->insertItem (" " + i18n ("Off-line") + " ", ID_CONNECTED, 0, true); |
32 |
sb->insertItem (" ??x?? ", ID_DIMENSION, 0, true); |
33 |
- sb->insertItem (" 0:00:00 ", ID_TIMER, 0, true); |
34 |
- sb->insertItem (" " + i18n ("idle") + " 0:00 ", ID_IDLE, 0, true); |
35 |
+ sb->insertItem (" 00D:00H:00M:00S ", ID_TIMER, 0, true); |
36 |
+ sb->insertItem (" " + i18n ("idle") + " 00D:00H:00M:00S ", ID_IDLE, 0, true); |
37 |
sb->insertItem ("", ID_VARIABLES); |
38 |
sb->insertItem ("", ID_PARTIAL); |
39 |
timerShown = true; |
40 |
@@ -116,7 +119,7 @@ |
41 |
if (!timerShown) |
42 |
{ |
43 |
timerReset (); |
44 |
- sb->changeItem (" 0:00:00 ", ID_TIMER); |
45 |
+ sb->changeItem (" 00D:00H:00M:00S ", ID_TIMER); |
46 |
} |
47 |
timerShown = true; |
48 |
} |
49 |
@@ -138,7 +141,7 @@ |
50 |
|
51 |
void cStatus::dimensionsChanged (int x, int y) |
52 |
{ |
53 |
- char s1[10]; |
54 |
+ char s1[status_size]; |
55 |
QString s2; |
56 |
sprintf (s1, " %dx%d ", x, y); |
57 |
s2 = s1; |
58 |
@@ -166,8 +169,8 @@ |
59 |
conntime = 0; |
60 |
idletime1 = 0; |
61 |
if (timerShown) |
62 |
- sb->changeItem (" 0:00:00 ", ID_TIMER); |
63 |
- sb->changeItem (" " + i18n ("idle") + " 0:00", ID_IDLE); |
64 |
+ sb->changeItem (" 00D:00H:00M:00S ", ID_TIMER); |
65 |
+ sb->changeItem (" " + i18n ("idle") + " 00D:00H:00M:00S", ID_IDLE); |
66 |
timer1->start (1000); |
67 |
} |
68 |
|
69 |
@@ -175,7 +178,7 @@ |
70 |
{ |
71 |
sb->changeItem (" " + i18n ("Connected") + " ", ID_CONNECTED); |
72 |
sb->changeItem ("", ID_PARTIAL); |
73 |
- sb->changeItem (" " + i18n ("idle") + " 0:00 ", ID_IDLE); |
74 |
+ sb->changeItem (" " + i18n ("idle") + " 00D:00H:00M:00S ", ID_IDLE); |
75 |
showMessage (i18n ("Connected.")); |
76 |
} |
77 |
|
78 |
@@ -209,18 +212,19 @@ |
79 |
idletime1 = 0; |
80 |
timer1->stop (); |
81 |
timer1->start (1000); |
82 |
- sb->changeItem (" " + i18n ("idle") + " 0:00 ", ID_IDLE); |
83 |
+ sb->changeItem (" " + i18n ("idle") + " 00D:00H:00M:00S ", ID_IDLE); |
84 |
} |
85 |
} |
86 |
|
87 |
const QString cStatus::connTimeString () |
88 |
{ |
89 |
- char s1[10]; |
90 |
- int h = conntime / 3600; |
91 |
+ char s1[status_size]; |
92 |
+ int d = conntime / (3600*24); |
93 |
+ int h = (conntime / 3600) % 24; |
94 |
int s = conntime % 3600; |
95 |
int m = s / 60; |
96 |
s = s % 60; |
97 |
- sprintf (s1, " %d:%02d:%02d ", h, m, s); |
98 |
+ sprintf (s1, " %02dD:%02dH:%02dM:%02dS ", d, h, m, s); |
99 |
QString s2 = s1; |
100 |
return s2; |
101 |
} |
102 |
@@ -246,16 +250,14 @@ |
103 |
{ |
104 |
++idletime1; |
105 |
|
106 |
- int h, m, s; |
107 |
+ int d, h, m, s; |
108 |
s = idletime1 % 60; |
109 |
m = ((idletime1 - s) / 60) % 60; |
110 |
- h = (idletime1 - s) / 3600; |
111 |
+ h = (idletime1 - s) / 3600 % 24; |
112 |
+ d = (idletime1 - s) / (3600 * 24); |
113 |
|
114 |
- char ss[15]; |
115 |
- if (h > 0) |
116 |
- sprintf (ss, " %d:%02d:%02d ", h, m, s); |
117 |
- else |
118 |
- sprintf (ss, " %d:%02d ", m, s); |
119 |
+ char ss[status_size]; |
120 |
+ sprintf (ss, " %02dD:%02dH:%02dM:%02dS ", d, h, m, s); |
121 |
|
122 |
sb->changeItem (" " + i18n ("idle") + ss, ID_IDLE); |
123 |
} |
124 |
Only in kmuddy-0.8.patch/lib: cstatus.cpp.orig |
125 |
Only in kmuddy-0.8.patch/lib: cstatus.cpp.rej |
126 |
|
127 |
|
128 |
|
129 |
-- |
130 |
gentoo-commits@l.g.o mailing list |