Author: ek.kato
Date: Tue Jul 10 02:36:38 2007
New Revision: 4678
Modified:
trunk/gtk/compose.c
trunk/qt/immodule-quiminputcontext_compose.cpp
trunk/uim/agent.c
trunk/uim/anthy.c
trunk/uim/uim-func.c
trunk/uim/uim-scm.c
trunk/xim/compose.cpp
Log:
* qt/immodule-quiminput_context_compose.cpp
* gtk/compose.c
* xim/compose.cpp
* uim/agent.c
* uim/uim-scm.c
* uim/anthy.c
* uim/uim-func.c
- Apply patch from Christian Biere for isspace(3), isalpha(3),
and isdigit(3) (bug #11407).
Modified: trunk/gtk/compose.c
==============================================================================
--- trunk/gtk/compose.c (original)
+++ trunk/gtk/compose.c Tue Jul 10 02:36:38 2007
@@ -862,7 +862,7 @@
char *p = buf;
int n;
char *args[2], *from, *to;
- while (isspace(*p)) {
+ while (isspace((unsigned char)*p)) {
++p;
}
if (iscomment(*p)) {
@@ -905,7 +905,7 @@
char *p = line;
while (argc < argsize) {
- while (isspace(*p)) {
+ while (isspace((unsigned char)*p)) {
++p;
}
if (*p == '\0') {
Modified: trunk/qt/immodule-quiminputcontext_compose.cpp
==============================================================================
--- trunk/qt/immodule-quiminputcontext_compose.cpp (original)
+++ trunk/qt/immodule-quiminputcontext_compose.cpp Tue Jul 10 02:36:38 2007
@@ -986,7 +986,7 @@
char *p = buf;
int n;
char *args[2], *from, *to;
- while (isspace(*p)) {
+ while ((unsigned char)isspace(*p)) {
++p;
}
if (iscomment(*p)) {
@@ -1029,7 +1029,7 @@
char *p = line;
while (argc < argsize) {
- while (isspace(*p)) {
+ while ((unsigned char)isspace(*p)) {
++p;
}
if (*p == '\0') {
Modified: trunk/uim/agent.c
==============================================================================
--- trunk/uim/agent.c (original)
+++ trunk/uim/agent.c Tue Jul 10 02:36:38 2007
@@ -102,7 +102,7 @@
while (1) {
char buf[32];
fgets(buf, 32, stdin);
- if (isalpha((int)buf[0])) {
+ if (isalpha((unsigned char)buf[0])) {
uim_press_key(ac->uc, buf[0], 0);
} else {
uim_press_key(ac->uc, UKey_Return, 0);
Modified: trunk/uim/anthy.c
==============================================================================
--- trunk/uim/anthy.c (original)
+++ trunk/uim/anthy.c Tue Jul 10 02:36:38 2007
@@ -84,7 +84,7 @@
len = strlen(str);
for (i = 0; str[i] != '\0'; i++) {
- if (isalpha(str[i]))
+ if (isalpha((unsigned char)str[i]))
break;
}
Modified: trunk/uim/uim-func.c
==============================================================================
--- trunk/uim/uim-func.c (original)
+++ trunk/uim/uim-func.c Tue Jul 10 02:36:38 2007
@@ -168,7 +168,7 @@
buf[0] = key;
buf[1] = 0;
if (key_state == UMod_Shift) {
- buf[0] = toupper(buf[0]);
+ buf[0] = toupper((unsigned char)buf[0]);
}
return uim_scm_make_str(buf);
}
Modified: trunk/uim/uim-scm.c
==============================================================================
--- trunk/uim/uim-scm.c (original)
+++ trunk/uim/uim-scm.c Tue Jul 10 02:36:38 2007
@@ -1025,7 +1025,7 @@
if (!uim_output)
uim_output = stderr;
- if (verbose_level && isdigit(verbose_level[0])) {
+ if (verbose_level && isdigit((unsigned char)verbose_level[0])) {
vlevel = atoi(verbose_level) % 10;
}
Modified: trunk/xim/compose.cpp
==============================================================================
--- trunk/xim/compose.cpp (original)
+++ trunk/xim/compose.cpp Tue Jul 10 02:36:38 2007
@@ -802,7 +802,7 @@
char *p = buf;
int n;
char *args[2], *from, *to;
- while (isspace(*p)) {
+ while (isspace((unsigned char)*p)) {
++p;
}
if (iscomment(*p)) {
@@ -845,7 +845,7 @@
char *p = line;
while (argc < argsize) {
- while (isspace(*p)) {
+ while (isspace((unsigned char)*p)) {
++p;
}
if (*p == '\0') {
