Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/src
Modified Files:
Makefile.am conf.c strings.c
Log Message:
Mon Mar 7 17:28:00 2005 Michael Jennings (mej)
Cleaner "make maintainer-clean"
Finally found and fixed that stupid "Config file is designed for a
newer version of FOO" bullshit warning.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- Makefile.am 15 Dec 2004 00:00:22 -0000 1.15
+++ Makefile.am 7 Mar 2005 22:29:07 -0000 1.16
@@ -10,3 +10,4 @@
regexp.c socket.c str.c strings.c snprintf.c tok.c url.c
libast_la_LDFLAGS = -version-info 2:1:0
+MAINTAINERCLEANFILES = Makefile.in
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/conf.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- conf.c 21 Oct 2004 20:03:16 -0000 1.25
+++ conf.c 7 Mar 2005 22:29:07 -0000 1.26
@@ -31,7 +31,7 @@
* @author Michael Jennings <[EMAIL PROTECTED]>
*/
-static const char __attribute__((unused)) cvs_ident[] = "$Id: conf.c,v 1.25
2004/10/21 20:03:16 rbdpngn Exp $";
+static const char __attribute__((unused)) cvs_ident[] = "$Id: conf.c,v 1.26
2005/03/07 22:29:07 mej Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -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);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/strings.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- strings.c 23 Jul 2004 21:38:39 -0000 1.24
+++ strings.c 7 Mar 2005 22:29:07 -0000 1.25
@@ -30,7 +30,7 @@
* @author Michael Jennings <[EMAIL PROTECTED]>
*/
-static const char __attribute__((unused)) cvs_ident[] = "$Id: strings.c,v 1.24
2004/07/23 21:38:39 mej Exp $";
+static const char __attribute__((unused)) cvs_ident[] = "$Id: strings.c,v 1.25
2005/03/07 22:29:07 mej Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -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;
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
