1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
|
Grab fix from upstream CVS to address
http://bugs.gentoo.org/94479
----------------------------------------------------------------------
Mon Mar 7 17:28:00 2005 Michael Jennings (mej)
Finally found and fixed that stupid "Config file is designed for a
newer version of FOO" bullshit warning.
----------------------------------------------------------------------
Index: src/conf.c
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/conf.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- src/conf.c 21 Oct 2004 20:03:16 -0000 1.25
+++ src/conf.c 7 Mar 2005 22:29:07 -0000 1.26
@@ -827,10 +827,12 @@
/* Check version number against current application version. */
begin_ptr = SPIF_STR_STR(ver_str) + spif_str_index(ver_str, SPIF_CAST(char) '-') + 1;
end_ptr = SPIF_STR_STR(ver_str) + spif_str_index(ver_str, SPIF_CAST(char) '>');
+ D_CONF(("Begin pointer is %10p (%s), end pointer is %10p (%s), length is %d, buffer size is %d\n",
+ begin_ptr, begin_ptr, end_ptr, end_ptr, SPIF_CAST_C(int) (end_ptr - begin_ptr), sizeof(buff)));
if (SPIF_PTR_ISNULL(end_ptr)) {
spiftool_safe_strncpy(buff, begin_ptr, sizeof(buff));
} else {
- testlen = MAX(SPIF_CAST_C(int) sizeof(buff), SPIF_CAST_C(int) (end_ptr - begin_ptr));
+ testlen = MIN(SPIF_CAST_C(int) sizeof(buff), SPIF_CAST_C(int) (end_ptr - begin_ptr + 1));
spiftool_safe_strncpy(buff, begin_ptr, testlen);
}
ver = spiftool_version_compare(buff, libast_program_version);
Index: src/strings.c
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/strings.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- src/strings.c 23 Jul 2004 21:38:39 -0000 1.24
+++ src/strings.c 7 Mar 2005 22:29:07 -0000 1.25
@@ -710,21 +710,24 @@
{
spif_char_t buff1[128], buff2[128];
+ D_CONF(("Comparing version strings \"%s\" and \"%s\"\n", NONULL(v1), NONULL(v2)));
SPIF_COMP_CHECK_NULL(v1, v2);
for (; *v1 && *v2; ) {
+ D_CONF((" -> Looking at \"%s\" and \"%s\"\n", v1, v2));
if (isalpha(*v1) && isalpha(*v2)) {
spif_charptr_t p1 = buff1, p2 = buff2;
spif_int8_t ival1 = 6, ival2 = 6;
/* Compare words. First, copy each word into buffers. */
- for (; isalpha(*v1); v1++, p1++) *p1 = *v1;
- for (; isalpha(*v2); v2++, p2++) *p2 = *v2;
+ for (; *v1 && isalpha(*v1); v1++, p1++) *p1 = *v1;
+ for (; *v2 && isalpha(*v2); v2++, p2++) *p2 = *v2;
*p1 = *p2 = 0;
/* Change the buffered strings to lowercase for easier comparison. */
spiftool_downcase_str(buff1);
spiftool_downcase_str(buff2);
+ D_CONF((" -> Comparing as words \"%s\" vs. \"%s\"\n", buff1, buff2));
/* Some strings require special handling. */
if (!strcmp(SPIF_CHARPTR_C(buff1), "snap")) {
@@ -751,12 +754,14 @@
}
if (ival1 != ival2) {
/* If the values are different, compare them. */
+ D_CONF((" -> %d\n", (int) SPIF_CMP_FROM_INT(ival1 - ival2)));
return SPIF_CMP_FROM_INT(ival1 - ival2);
} else if (ival1 == 6) {
int c;
/* Two arbitrary strings. Compare them too. */
if ((c = strcmp(SPIF_CHARPTR_C(buff1), SPIF_CHARPTR_C(buff2))) != 0) {
+ D_CONF((" -> %d\n", (int) SPIF_CMP_FROM_INT(c)));
return SPIF_CMP_FROM_INT(c);
}
}
@@ -766,17 +771,19 @@
spif_cmp_t c;
/* Compare numbers. First, copy each number into buffers. */
- for (; isdigit(*v1); v1++, p1++) *p1 = *v1;
- for (; isdigit(*v2); v2++, p2++) *p2 = *v2;
+ for (; *v1 && isdigit(*v1); v1++, p1++) *p1 = *v1;
+ for (; *v2 && isdigit(*v2); v2++, p2++) *p2 = *v2;
*p1 = *p2 = 0;
/* Convert the strings into actual integers. */
ival1 = SPIF_CAST(int32) strtol(SPIF_CHARPTR_C(buff1), (char **) NULL, 10);
ival2 = SPIF_CAST(int32) strtol(SPIF_CHARPTR_C(buff2), (char **) NULL, 10);
+ D_CONF((" -> Comparing as integers %d vs. %d\n", SPIF_CAST_C(int) ival1, SPIF_CAST_C(int) ival2));
/* Compare the integers and return if not equal. */
c = SPIF_CMP_FROM_INT(ival1 - ival2);
if (!SPIF_CMP_IS_EQUAL(c)) {
+ D_CONF((" -> %d\n", (int) c));
return c;
}
} else if (!isalnum(*v1) && !isalnum(*v2)) {
@@ -784,15 +791,19 @@
spif_cmp_t c;
/* Compare non-alphanumeric strings. */
- for (; !isalnum(*v1); v1++, p1++) *p1 = *v1;
- for (; !isalnum(*v2); v2++, p2++) *p2 = *v2;
+ for (; *v1 && !isalnum(*v1); v1++, p1++) *p1 = *v1;
+ for (; *v2 && !isalnum(*v2); v2++, p2++) *p2 = *v2;
*p1 = *p2 = 0;
+ D_CONF((" -> Comparing as non-alphanumeric strings \"%s\" vs. \"%s\"\n", buff1, buff2));
c = SPIF_CMP_FROM_INT(strcasecmp(SPIF_CHARPTR_C(buff1), SPIF_CHARPTR_C(buff2)));
if (!SPIF_CMP_IS_EQUAL(c)) {
+ D_CONF((" -> %d\n", (int) c));
return c;
}
} else {
+ D_CONF((" -> Comparing as alphanumeric strings \"%s\" vs. \"%s\"\n", buff1, buff2));
+ D_CONF((" -> %d\n", (int) SPIF_CMP_FROM_INT(strcasecmp(SPIF_CHARPTR_C(buff1), SPIF_CHARPTR_C(buff2)))));
return SPIF_CMP_FROM_INT(strcasecmp(SPIF_CHARPTR_C(buff1), SPIF_CHARPTR_C(buff2)));
}
}
@@ -801,18 +812,23 @@
if (*v1) {
if (!BEG_STRCASECMP(SPIF_CHARPTR_C(v1), "snap") || !BEG_STRCASECMP(SPIF_CHARPTR_C(v1), "pre")
|| !BEG_STRCASECMP(SPIF_CHARPTR_C(v1), "alpha") || !BEG_STRCASECMP(SPIF_CHARPTR_C(v1), "beta")) {
+ D_CONF((" -> <\n"));
return SPIF_CMP_LESS;
} else {
+ D_CONF((" -> >\n"));
return SPIF_CMP_GREATER;
}
} else if (*v2) {
if (!BEG_STRCASECMP(SPIF_CHARPTR_C(v2), "snap") || !BEG_STRCASECMP(SPIF_CHARPTR_C(v2), "pre")
|| !BEG_STRCASECMP(SPIF_CHARPTR_C(v2), "alpha") || !BEG_STRCASECMP(SPIF_CHARPTR_C(v2), "beta")) {
+ D_CONF((" -> >\n"));
return SPIF_CMP_GREATER;
} else {
+ D_CONF((" -> <\n"));
return SPIF_CMP_LESS;
}
}
+ D_CONF((" -> ==\n"));
return SPIF_CMP_EQUAL;
}
|
GitWeb