diff -urN -Xfreeciv/diff_ignore freeciv/client/climisc.c freeciv-ctype/client/climisc.c
--- freeciv/client/climisc.c Sun May 26 08:30:01 2002
+++ freeciv-ctype/client/climisc.c Mon Jun 10 11:29:37 2002
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/clinet.c freeciv-ctype/client/clinet.c
--- freeciv/client/clinet.c Sun May 26 08:30:01 2002
+++ freeciv-ctype/client/clinet.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <errno.h>
#include <assert.h>
@@ -496,7 +495,7 @@
}
s[0] = '\0';
++s;
- while (isdigit(s[0])) {++s;}
+ while (my_isdigit(s[0])) {++s;}
} else {
port = 80;
if (!(s = strchr(server,'/'))) {
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/citydlg.c freeciv-ctype/client/gui-gtk/citydlg.c
--- freeciv/client/gui-gtk/citydlg.c Mon Jun 3 08:31:33 2002
+++ freeciv-ctype/client/gui-gtk/citydlg.c Mon Jun 10 11:29:37 2002
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/cityrep.c freeciv-ctype/client/gui-gtk/cityrep.c
--- freeciv/client/gui-gtk/cityrep.c Wed Apr 10 08:21:20 2002
+++ freeciv-ctype/client/gui-gtk/cityrep.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <stdarg.h>
#include <assert.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/dialogs.c freeciv-ctype/client/gui-gtk/dialogs.c
--- freeciv/client/gui-gtk/dialogs.c Sun May 26 08:30:07 2002
+++ freeciv-ctype/client/gui-gtk/dialogs.c Mon Jun 10 11:29:37 2002
@@ -15,7 +15,6 @@
#endif
#include <assert.h>
-#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -2248,8 +2247,6 @@
append_output_window(_("You must type a legal name."));
return;
}
-
- packet.name[0]=toupper(packet.name[0]);
send_packet_alloc_nation(&aconnection, &packet);
}
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/diplodlg.c freeciv-ctype/client/gui-gtk/diplodlg.c
--- freeciv/client/gui-gtk/diplodlg.c Wed Apr 10 08:21:20 2002
+++ freeciv-ctype/client/gui-gtk/diplodlg.c Mon Jun 10 11:29:37 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/finddlg.c freeciv-ctype/client/gui-gtk/finddlg.c
--- freeciv/client/gui-gtk/finddlg.c Wed Apr 10 08:21:21 2002
+++ freeciv-ctype/client/gui-gtk/finddlg.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/gamedlgs.c freeciv-ctype/client/gui-gtk/gamedlgs.c
--- freeciv/client/gui-gtk/gamedlgs.c Thu Mar 14 08:58:11 2002
+++ freeciv-ctype/client/gui-gtk/gamedlgs.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/gotodlg.c freeciv-ctype/client/gui-gtk/gotodlg.c
--- freeciv/client/gui-gtk/gotodlg.c Sat Mar 9 09:01:06 2002
+++ freeciv-ctype/client/gui-gtk/gotodlg.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/graphics.c freeciv-ctype/client/gui-gtk/graphics.c
--- freeciv/client/gui-gtk/graphics.c Wed Feb 20 08:10:54 2002
+++ freeciv-ctype/client/gui-gtk/graphics.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/inteldlg.c freeciv-ctype/client/gui-gtk/inteldlg.c
--- freeciv/client/gui-gtk/inteldlg.c Tue Feb 12 08:17:07 2002
+++ freeciv-ctype/client/gui-gtk/inteldlg.c Mon Jun 10 11:29:37 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <stdarg.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/messagewin.c freeciv-ctype/client/gui-gtk/messagewin.c
--- freeciv/client/gui-gtk/messagewin.c Mon Jun 10 08:30:49 2002
+++ freeciv-ctype/client/gui-gtk/messagewin.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/plrdlg.c freeciv-ctype/client/gui-gtk/plrdlg.c
--- freeciv/client/gui-gtk/plrdlg.c Wed Feb 27 08:50:38 2002
+++ freeciv-ctype/client/gui-gtk/plrdlg.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <assert.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/repodlgs.c freeciv-ctype/client/gui-gtk/repodlgs.c
--- freeciv/client/gui-gtk/repodlgs.c Wed Apr 10 08:21:22 2002
+++ freeciv-ctype/client/gui-gtk/repodlgs.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <ctype.h>
#include <assert.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk/spaceshipdlg.c freeciv-ctype/client/gui-gtk/spaceshipdlg.c
--- freeciv/client/gui-gtk/spaceshipdlg.c Tue Feb 12 08:17:09 2002
+++ freeciv-ctype/client/gui-gtk/spaceshipdlg.c Mon Jun 10 11:29:37 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/citydlg.c freeciv-ctype/client/gui-gtk-2.0/citydlg.c
--- freeciv/client/gui-gtk-2.0/citydlg.c Mon Jun 10 08:30:50 2002
+++ freeciv-ctype/client/gui-gtk-2.0/citydlg.c Mon Jun 10 11:29:37 2002
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/cityrep.c freeciv-ctype/client/gui-gtk-2.0/cityrep.c
--- freeciv/client/gui-gtk-2.0/cityrep.c Mon Jun 10 08:30:51 2002
+++ freeciv-ctype/client/gui-gtk-2.0/cityrep.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <stdarg.h>
#include <assert.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/dialogs.c freeciv-ctype/client/gui-gtk-2.0/dialogs.c
--- freeciv/client/gui-gtk-2.0/dialogs.c Mon Jun 10 08:30:51 2002
+++ freeciv-ctype/client/gui-gtk-2.0/dialogs.c Mon Jun 10 11:29:37 2002
@@ -15,7 +15,6 @@
#endif
#include <assert.h>
-#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -2231,8 +2230,6 @@
append_output_window(_("You must type a legal name."));
return;
}
-
- packet.name[0]=toupper(packet.name[0]);
send_packet_alloc_nation(&aconnection, &packet);
}
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/diplodlg.c freeciv-ctype/client/gui-gtk-2.0/diplodlg.c
--- freeciv/client/gui-gtk-2.0/diplodlg.c Mon Jun 10 08:30:52 2002
+++ freeciv-ctype/client/gui-gtk-2.0/diplodlg.c Mon Jun 10 11:29:37 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/finddlg.c freeciv-ctype/client/gui-gtk-2.0/finddlg.c
--- freeciv/client/gui-gtk-2.0/finddlg.c Mon Jun 10 08:30:52 2002
+++ freeciv-ctype/client/gui-gtk-2.0/finddlg.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/gamedlgs.c freeciv-ctype/client/gui-gtk-2.0/gamedlgs.c
--- freeciv/client/gui-gtk-2.0/gamedlgs.c Mon Jun 10 08:30:52 2002
+++ freeciv-ctype/client/gui-gtk-2.0/gamedlgs.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/gotodlg.c freeciv-ctype/client/gui-gtk-2.0/gotodlg.c
--- freeciv/client/gui-gtk-2.0/gotodlg.c Tue Mar 12 00:19:26 2002
+++ freeciv-ctype/client/gui-gtk-2.0/gotodlg.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/graphics.c freeciv-ctype/client/gui-gtk-2.0/graphics.c
--- freeciv/client/gui-gtk-2.0/graphics.c Tue Mar 12 00:19:26 2002
+++ freeciv-ctype/client/gui-gtk-2.0/graphics.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/inteldlg.c freeciv-ctype/client/gui-gtk-2.0/inteldlg.c
--- freeciv/client/gui-gtk-2.0/inteldlg.c Tue Mar 12 00:09:47 2002
+++ freeciv-ctype/client/gui-gtk-2.0/inteldlg.c Mon Jun 10 11:29:37 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <stdarg.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/messagewin.c freeciv-ctype/client/gui-gtk-2.0/messagewin.c
--- freeciv/client/gui-gtk-2.0/messagewin.c Mon Jun 10 08:30:54 2002
+++ freeciv-ctype/client/gui-gtk-2.0/messagewin.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/plrdlg.c freeciv-ctype/client/gui-gtk-2.0/plrdlg.c
--- freeciv/client/gui-gtk-2.0/plrdlg.c Tue Mar 12 00:19:27 2002
+++ freeciv-ctype/client/gui-gtk-2.0/plrdlg.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <assert.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/repodlgs.c freeciv-ctype/client/gui-gtk-2.0/repodlgs.c
--- freeciv/client/gui-gtk-2.0/repodlgs.c Mon Jun 10 08:30:54 2002
+++ freeciv-ctype/client/gui-gtk-2.0/repodlgs.c Mon Jun 10 11:29:37 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <ctype.h>
#include <assert.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-gtk-2.0/spaceshipdlg.c freeciv-ctype/client/gui-gtk-2.0/spaceshipdlg.c
--- freeciv/client/gui-gtk-2.0/spaceshipdlg.c Tue Mar 12 00:09:49 2002
+++ freeciv-ctype/client/gui-gtk-2.0/spaceshipdlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <gtk/gtk.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/citydlg.c freeciv-ctype/client/gui-mui/citydlg.c
--- freeciv/client/gui-mui/citydlg.c Thu May 9 08:18:36 2002
+++ freeciv-ctype/client/gui-mui/citydlg.c Mon Jun 10 11:29:38 2002
@@ -18,7 +18,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <libraries/mui.h>
#include <mui/NListview_MCC.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/cityrep.c freeciv-ctype/client/gui-mui/cityrep.c
--- freeciv/client/gui-mui/cityrep.c Mon Mar 18 08:57:15 2002
+++ freeciv-ctype/client/gui-mui/cityrep.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <stdarg.h>
#include <mui/NListview_MCC.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/dialogs.c freeciv-ctype/client/gui-mui/dialogs.c
--- freeciv/client/gui-mui/dialogs.c Sun May 26 08:30:09 2002
+++ freeciv-ctype/client/gui-mui/dialogs.c Mon Jun 10 11:29:38 2002
@@ -14,7 +14,6 @@
#include <config.h>
#endif
-#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -1638,8 +1637,6 @@
append_output_window(_("You must type a legal name."));
return;
}
-
- packet.name[0]=toupper(packet.name[0]);
send_packet_alloc_nation(&aconnection, &packet);
}
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/diplodlg.c freeciv-ctype/client/gui-mui/diplodlg.c
--- freeciv/client/gui-mui/diplodlg.c Sat Sep 22 07:55:07 2001
+++ freeciv-ctype/client/gui-mui/diplodlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <libraries/mui.h>
#include <mui/NListview_MCC.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/finddlg.c freeciv-ctype/client/gui-mui/finddlg.c
--- freeciv/client/gui-mui/finddlg.c Wed Dec 12 08:04:56 2001
+++ freeciv-ctype/client/gui-mui/finddlg.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <libraries/mui.h>
#include <mui/NListview_MCC.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/gamedlgs.c freeciv-ctype/client/gui-mui/gamedlgs.c
--- freeciv/client/gui-mui/gamedlgs.c Thu Mar 14 08:58:19 2002
+++ freeciv-ctype/client/gui-mui/gamedlgs.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <libraries/mui.h>
#include <clib/alib_protos.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/gotodlg.c freeciv-ctype/client/gui-mui/gotodlg.c
--- freeciv/client/gui-mui/gotodlg.c Sat Mar 9 09:01:08 2002
+++ freeciv-ctype/client/gui-mui/gotodlg.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <libraries/mui.h>
#include <mui/NListview_MCC.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/graphics.c freeciv-ctype/client/gui-mui/graphics.c
--- freeciv/client/gui-mui/graphics.c Mon Mar 18 08:57:16 2002
+++ freeciv-ctype/client/gui-mui/graphics.c Mon Jun 10 11:29:38 2002
@@ -18,7 +18,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <graphics/gfxmacros.h>
#include <cybergraphx/cybergraphics.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/inteldlg.c freeciv-ctype/client/gui-mui/inteldlg.c
--- freeciv/client/gui-mui/inteldlg.c Tue Jan 22 08:05:39 2002
+++ freeciv-ctype/client/gui-mui/inteldlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <stdarg.h>
#include <libraries/mui.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/messagewin.c freeciv-ctype/client/gui-mui/messagewin.c
--- freeciv/client/gui-mui/messagewin.c Wed Feb 13 08:15:53 2002
+++ freeciv-ctype/client/gui-mui/messagewin.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <mui/NListview_MCC.h>
#include <libraries/mui.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/plrdlg.c freeciv-ctype/client/gui-mui/plrdlg.c
--- freeciv/client/gui-mui/plrdlg.c Wed Feb 27 08:50:39 2002
+++ freeciv-ctype/client/gui-mui/plrdlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <string.h>
#include <libraries/mui.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/repodlgs.c freeciv-ctype/client/gui-mui/repodlgs.c
--- freeciv/client/gui-mui/repodlgs.c Mon May 6 09:00:41 2002
+++ freeciv-ctype/client/gui-mui/repodlgs.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <ctype.h>
#include <assert.h>
#include <libraries/mui.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-mui/spaceshipdlg.c freeciv-ctype/client/gui-mui/spaceshipdlg.c
--- freeciv/client/gui-mui/spaceshipdlg.c Wed Dec 12 08:04:57 2001
+++ freeciv-ctype/client/gui-mui/spaceshipdlg.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <libraries/mui.h>
#include <mui/NListview_MCC.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/cityrep.c freeciv-ctype/client/gui-win32/cityrep.c
--- freeciv/client/gui-win32/cityrep.c Thu May 9 08:18:42 2002
+++ freeciv-ctype/client/gui-win32/cityrep.c Mon Jun 10 11:29:38 2002
@@ -18,7 +18,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <stdarg.h>
#include <windows.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/dialogs.c freeciv-ctype/client/gui-win32/dialogs.c
--- freeciv/client/gui-win32/dialogs.c Thu May 30 08:30:05 2002
+++ freeciv-ctype/client/gui-win32/dialogs.c Mon Jun 10 11:29:38 2002
@@ -14,7 +14,6 @@
#include <config.h>
#endif
-#include <ctype.h>
#include <string.h>
#include <stdarg.h>
#include <assert.h>
@@ -322,9 +321,7 @@
append_output_window(_("You must type a legal name."));
return;
}
- packet.name[0]=toupper(packet.name[0]);
- send_packet_alloc_nation(&aconnection,&packet);
-
+ send_packet_alloc_nation(&aconnection,&packet);
}
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/diplodlg.c freeciv-ctype/client/gui-win32/diplodlg.c
--- freeciv/client/gui-win32/diplodlg.c Sun Mar 3 08:07:44 2002
+++ freeciv-ctype/client/gui-win32/diplodlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <windows.h>
#include <windowsx.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/finddlg.c freeciv-ctype/client/gui-win32/finddlg.c
--- freeciv/client/gui-win32/finddlg.c Tue Sep 4 21:09:34 2001
+++ freeciv-ctype/client/gui-win32/finddlg.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <windows.h>
#include <windowsx.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/gotodlg.c freeciv-ctype/client/gui-win32/gotodlg.c
--- freeciv/client/gui-win32/gotodlg.c Sat Mar 9 09:01:13 2002
+++ freeciv-ctype/client/gui-win32/gotodlg.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <windows.h>
#include <windowsx.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/inteldlg.c freeciv-ctype/client/gui-win32/inteldlg.c
--- freeciv/client/gui-win32/inteldlg.c Tue Feb 12 08:17:13 2002
+++ freeciv-ctype/client/gui-win32/inteldlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <stdarg.h>
#include <windows.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/menu.c freeciv-ctype/client/gui-win32/menu.c
--- freeciv/client/gui-win32/menu.c Tue Feb 12 08:17:13 2002
+++ freeciv-ctype/client/gui-win32/menu.c Mon Jun 10 11:29:38 2002
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string.h>
#include <windows.h>
-#include <ctype.h>
+
#include "astring.h"
#include "capability.h"
#include "fcintl.h"
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/messagedlg.c freeciv-ctype/client/gui-win32/messagedlg.c
--- freeciv/client/gui-win32/messagedlg.c Thu Mar 7 09:00:54 2002
+++ freeciv-ctype/client/gui-win32/messagedlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <stdarg.h>
#include <windows.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/messagewin.c freeciv-ctype/client/gui-win32/messagewin.c
--- freeciv/client/gui-win32/messagewin.c Wed Feb 13 08:15:56 2002
+++ freeciv-ctype/client/gui-win32/messagewin.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <windows.h>
#include <windowsx.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/plrdlg.c freeciv-ctype/client/gui-win32/plrdlg.c
--- freeciv/client/gui-win32/plrdlg.c Wed Feb 27 08:50:41 2002
+++ freeciv-ctype/client/gui-win32/plrdlg.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <assert.h>
#include <windows.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/ratesdlg.c freeciv-ctype/client/gui-win32/ratesdlg.c
--- freeciv/client/gui-win32/ratesdlg.c Thu Mar 14 08:58:28 2002
+++ freeciv-ctype/client/gui-win32/ratesdlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <stdarg.h>
#include <windows.h>
#include <windowsx.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/repodlgs.c freeciv-ctype/client/gui-win32/repodlgs.c
--- freeciv/client/gui-win32/repodlgs.c Sun Mar 24 08:06:48 2002
+++ freeciv-ctype/client/gui-win32/repodlgs.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <ctype.h>
#include <assert.h>
#include <windows.h>
#include <windowsx.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-win32/spaceshipdlg.c freeciv-ctype/client/gui-win32/spaceshipdlg.c
--- freeciv/client/gui-win32/spaceshipdlg.c Tue Mar 5 08:46:40 2002
+++ freeciv-ctype/client/gui-win32/spaceshipdlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <windows.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/citydlg.c freeciv-ctype/client/gui-xaw/citydlg.c
--- freeciv/client/gui-xaw/citydlg.c Sun May 26 08:30:15 2002
+++ freeciv-ctype/client/gui-xaw/citydlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/cityrep.c freeciv-ctype/client/gui-xaw/cityrep.c
--- freeciv/client/gui-xaw/cityrep.c Sun May 26 08:30:15 2002
+++ freeciv-ctype/client/gui-xaw/cityrep.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <stdarg.h>
#include <assert.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/dialogs.c freeciv-ctype/client/gui-xaw/dialogs.c
--- freeciv/client/gui-xaw/dialogs.c Sun May 26 08:30:15 2002
+++ freeciv-ctype/client/gui-xaw/dialogs.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <stdarg.h>
#include <X11/Intrinsic.h>
@@ -2367,8 +2366,6 @@
append_output_window(_("You must type a legal name."));
return;
}
-
- packet.name[0]=toupper(packet.name[0]);
send_packet_alloc_nation(&aconnection, &packet);
}
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/diplodlg.c freeciv-ctype/client/gui-xaw/diplodlg.c
--- freeciv/client/gui-xaw/diplodlg.c Sun May 26 08:30:16 2002
+++ freeciv-ctype/client/gui-xaw/diplodlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <assert.h>
#include <X11/Intrinsic.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/finddlg.c freeciv-ctype/client/gui-xaw/finddlg.c
--- freeciv/client/gui-xaw/finddlg.c Wed Jan 31 13:35:45 2001
+++ freeciv-ctype/client/gui-xaw/finddlg.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/gotodlg.c freeciv-ctype/client/gui-xaw/gotodlg.c
--- freeciv/client/gui-xaw/gotodlg.c Sat Mar 9 09:01:15 2002
+++ freeciv-ctype/client/gui-xaw/gotodlg.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/graphics.c freeciv-ctype/client/gui-xaw/graphics.c
--- freeciv/client/gui-xaw/graphics.c Wed Feb 20 08:11:00 2002
+++ freeciv-ctype/client/gui-xaw/graphics.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <X11/Xlib.h>
#include <X11/Intrinsic.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/inteldlg.c freeciv-ctype/client/gui-xaw/inteldlg.c
--- freeciv/client/gui-xaw/inteldlg.c Tue Feb 12 08:17:15 2002
+++ freeciv-ctype/client/gui-xaw/inteldlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <stdarg.h>
#include <X11/Intrinsic.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/messagedlg.c freeciv-ctype/client/gui-xaw/messagedlg.c
--- freeciv/client/gui-xaw/messagedlg.c Wed May 8 08:31:27 2002
+++ freeciv-ctype/client/gui-xaw/messagedlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <stdarg.h>
#include <X11/Intrinsic.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/messagewin.c freeciv-ctype/client/gui-xaw/messagewin.c
--- freeciv/client/gui-xaw/messagewin.c Wed Feb 13 08:15:59 2002
+++ freeciv-ctype/client/gui-xaw/messagewin.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/optiondlg.c freeciv-ctype/client/gui-xaw/optiondlg.c
--- freeciv/client/gui-xaw/optiondlg.c Tue May 7 08:45:12 2002
+++ freeciv-ctype/client/gui-xaw/optiondlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <stdarg.h>
#include <X11/Intrinsic.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/plrdlg.c freeciv-ctype/client/gui-xaw/plrdlg.c
--- freeciv/client/gui-xaw/plrdlg.c Wed Feb 27 08:50:43 2002
+++ freeciv-ctype/client/gui-xaw/plrdlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/ratesdlg.c freeciv-ctype/client/gui-xaw/ratesdlg.c
--- freeciv/client/gui-xaw/ratesdlg.c Sun May 26 08:30:17 2002
+++ freeciv-ctype/client/gui-xaw/ratesdlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <stdarg.h>
#include <X11/Intrinsic.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/repodlgs.c freeciv-ctype/client/gui-xaw/repodlgs.c
--- freeciv/client/gui-xaw/repodlgs.c Sun May 26 08:30:17 2002
+++ freeciv-ctype/client/gui-xaw/repodlgs.c Mon Jun 10 11:29:38 2002
@@ -17,7 +17,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <stdarg.h>
#include <assert.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/gui-xaw/spaceshipdlg.c freeciv-ctype/client/gui-xaw/spaceshipdlg.c
--- freeciv/client/gui-xaw/spaceshipdlg.c Sun Feb 17 08:06:41 2002
+++ freeciv-ctype/client/gui-xaw/spaceshipdlg.c Mon Jun 10 11:29:38 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
diff -urN -Xfreeciv/diff_ignore freeciv/client/options.c freeciv-ctype/client/options.c
--- freeciv/client/options.c Mon Jun 3 08:31:30 2002
+++ freeciv-ctype/client/options.c Mon Jun 10 11:29:37 2002
@@ -14,11 +14,11 @@
#include <config.h>
#endif
+#include <assert.h>
+#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
-#include <assert.h>
#include "events.h"
#include "fcintl.h"
diff -urN -Xfreeciv/diff_ignore freeciv/client/tilespec.c freeciv-ctype/client/tilespec.c
--- freeciv/client/tilespec.c Thu May 2 08:21:05 2002
+++ freeciv-ctype/client/tilespec.c Mon Jun 10 11:29:37 2002
@@ -21,10 +21,10 @@
#include <config.h>
#endif
-#include <stdio.h>
-#include <string.h>
#include <assert.h>
#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
#include "astring.h"
#include "capability.h"
diff -urN -Xfreeciv/diff_ignore freeciv/common/capability.c freeciv-ctype/common/capability.c
--- freeciv/common/capability.c Sun Mar 3 08:07:52 2002
+++ freeciv-ctype/common/capability.c Mon Jun 10 11:29:38 2002
@@ -13,20 +13,20 @@
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include "shared.h" /* TRUE, FALSE */
+#include "support.h" /* my_is* */
#include "capability.h"
#define GET_TOKEN(start, end) \
{ \
/* skip leading whitespace */ \
- while (isspace(*start)) { \
+ while (my_isspace(*start)) { \
start++; \
} \
/* skip to end of token */ \
- for (end = start; *end != '\0' && !isspace(*end) && *end != ','; end++) { \
+ for (end = start; *end != '\0' && !my_isspace(*end) && *end != ','; end++) { \
/* nothing */ \
} \
}
diff -urN -Xfreeciv/diff_ignore freeciv/common/inputfile.c freeciv-ctype/common/inputfile.c
--- freeciv/common/inputfile.c Thu Mar 14 08:58:38 2002
+++ freeciv-ctype/common/inputfile.c Mon Jun 10 11:29:39 2002
@@ -66,7 +66,6 @@
#include <stdio.h>
#include <string.h>
#include <assert.h>
-#include <ctype.h>
#include "astring.h"
#include "ioz.h"
@@ -141,7 +140,7 @@
/**********************************************************************
Return true if c is a 'comment' character: '#' or ';'
***********************************************************************/
-static bool my_is_comment(int c)
+static bool is_comment(int c)
{
return (c == '#' || c == ';');
}
@@ -338,7 +337,7 @@
/* skip any whitespace: */
inf->cur_line_pos = len;
c = inf->cur_line.str + len;
- while (*c != '\0' && isspace(*c)) c++;
+ while (*c != '\0' && my_isspace(*c)) c++;
if (*c != '\"') {
inf_die(inf, "Did not find opening doublequote for '*include' line");
@@ -355,8 +354,8 @@
inf->cur_line_pos = c - inf->cur_line.str;
/* check rest of line is well-formed: */
- while (*c != '\0' && isspace(*c) && !my_is_comment(*c)) c++;
- if (!(*c=='\0' || my_is_comment(*c))) {
+ while (*c != '\0' && my_isspace(*c) && !is_comment(*c)) c++;
+ if (!(*c=='\0' || is_comment(*c))) {
inf_die(inf, "Junk after filename for '*include' line");
}
inf->cur_line_pos = inf->cur_line.n-1;
@@ -643,19 +642,19 @@
assert(have_line(inf));
c = inf->cur_line.str + inf->cur_line_pos;
- while(*c != '\0' && isspace(*c)) {
+ while(*c != '\0' && my_isspace(*c)) {
c++;
}
if (*c == '\0')
return NULL;
start = c;
- while (*c != '\0' && !isspace(*c) && *c != '=' && !my_is_comment(*c)) {
+ while (*c != '\0' && !my_isspace(*c) && *c != '=' && !is_comment(*c)) {
c++;
}
- if (!(*c != '\0' && (isspace(*c) || *c == '=')))
+ if (!(*c != '\0' && (my_isspace(*c) || *c == '=')))
return NULL;
end = c;
- while (*c != '\0' && *c != '=' && !my_is_comment(*c)) {
+ while (*c != '\0' && *c != '=' && !is_comment(*c)) {
c++;
}
if (*c != '=') {
@@ -679,10 +678,10 @@
if (!at_eol(inf)) {
c = inf->cur_line.str + inf->cur_line_pos;
- while(*c != '\0' && isspace(*c)) {
+ while(*c != '\0' && my_isspace(*c)) {
c++;
}
- if (*c != '\0' && !my_is_comment(*c))
+ if (*c != '\0' && !is_comment(*c))
return NULL;
}
@@ -706,7 +705,7 @@
assert(have_line(inf));
c = inf->cur_line.str + inf->cur_line_pos;
- while(*c != '\0' && isspace(*c)) {
+ while(*c != '\0' && my_isspace(*c)) {
c++;
}
if (*c != target)
@@ -753,20 +752,20 @@
assert(have_line(inf));
c = inf->cur_line.str + inf->cur_line_pos;
- while(*c != '\0' && isspace(*c)) {
+ while(*c != '\0' && my_isspace(*c)) {
c++;
}
if (*c == '\0')
return NULL;
- if (*c == '-' || isdigit(*c)) {
+ if (*c == '-' || my_isdigit(*c)) {
/* a number: */
start = c++;
- while(*c != '\0' && isdigit(*c)) {
+ while(*c != '\0' && my_isdigit(*c)) {
c++;
}
/* check that the trailing stuff is ok: */
- if (!(*c == '\0' || *c == ',' || isspace(*c) || my_is_comment(*c))) {
+ if (!(*c == '\0' || *c == ',' || my_isspace(*c) || is_comment(*c))) {
return NULL;
}
/* If its a comma, we don't want to obliterate it permanently,
@@ -786,7 +785,7 @@
if (*c == '_' && *(c+1) == '(') {
has_i18n_marking = TRUE;
c += 2;
- while(*c != '\0' && isspace(*c)) {
+ while(*c != '\0' && my_isspace(*c)) {
c++;
}
if (*c == '\0')
diff -urN -Xfreeciv/diff_ignore freeciv/common/map.c freeciv-ctype/common/map.c
--- freeciv/common/map.c Fri Jun 7 09:03:00 2002
+++ freeciv-ctype/common/map.c Mon Jun 10 11:29:39 2002
@@ -18,7 +18,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include "city.h"
#include "fcintl.h"
diff -urN -Xfreeciv/diff_ignore freeciv/common/registry.c freeciv-ctype/common/registry.c
--- freeciv/common/registry.c Sun May 26 08:30:19 2002
+++ freeciv-ctype/common/registry.c Mon Jun 10 11:29:39 2002
@@ -147,7 +147,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <stdarg.h>
#include <assert.h>
@@ -610,13 +609,13 @@
if(!SAVE_TABLES) break;
c = first = pentry->name;
- if(*c == '\0' || !isalpha(*c)) break;
- for (; *c != '\0' && isalpha(*c); c++) {
+ if(*c == '\0' || !my_isalpha(*c)) break;
+ for (; *c != '\0' && my_isalpha(*c); c++) {
/* nothing */
}
if(strncmp(c,"0.",2) != 0) break;
c+=2;
- if(*c == '\0' || !isalnum(*c)) break;
+ if(*c == '\0' || !my_isalnum(*c)) break;
offset = c - first;
first[offset-2] = '\0';
diff -urN -Xfreeciv/diff_ignore freeciv/common/shared.c freeciv-ctype/common/shared.c
--- freeciv/common/shared.c Tue May 14 23:31:26 2002
+++ freeciv-ctype/common/shared.c Mon Jun 10 11:29:39 2002
@@ -15,7 +15,6 @@
#endif
#include <assert.h>
-#include <ctype.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
@@ -436,7 +435,7 @@
char *skip_leading_spaces(char *s)
{
assert(s!=NULL);
- while(*s != '\0' && isspace(*s)) {
+ while(*s != '\0' && my_isspace(*s)) {
s++;
}
return s;
@@ -473,7 +472,7 @@
len = strlen(s);
if (len > 0) {
t = s + len -1;
- while(isspace(*t)) {
+ while(my_isspace(*t)) {
*t = '\0';
if (t == s) {
break;
@@ -537,7 +536,7 @@
/* find space and break: */
for(c=s+len; c>s; c--) {
- if (isspace(*c)) {
+ if (my_isspace(*c)) {
*c = '\n';
slen -= c+1 - s;
s = c+1;
@@ -547,7 +546,7 @@
/* couldn't find a good break; settle for a bad one... */
for (c = s + len + 1; *c != '\0'; c++) {
- if (isspace(*c)) {
+ if (my_isspace(*c)) {
*c = '\n';
slen -= c+1 - s;
s = c+1;
diff -urN -Xfreeciv/diff_ignore freeciv/common/support.c freeciv-ctype/common/support.c
--- freeciv/common/support.c Sun May 26 08:30:20 2002
+++ freeciv-ctype/common/support.c Tue Jun 11 00:48:31 2002
@@ -42,11 +42,11 @@
#endif
#include <assert.h>
+#include <ctype.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <errno.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -489,4 +489,25 @@
} else {
return write_access && errno == ENOENT;
}
+}
+
+bool my_isalnum(char c)
+{
+ return isalnum((int) c) != 0;
+}
+bool my_isalpha(char c)
+{
+ return isalpha((int) c) != 0;
+}
+bool my_isdigit(char c)
+{
+ return isdigit((int) c) != 0;
+}
+bool my_isprint(char c)
+{
+ return isprint((int) c) != 0;
+}
+bool my_isspace(char c)
+{
+ return isspace((int) c) != 0;
}
diff -urN -Xfreeciv/diff_ignore freeciv/common/support.h freeciv-ctype/common/support.h
--- freeciv/common/support.h Sun May 26 08:30:20 2002
+++ freeciv-ctype/common/support.h Mon Jun 10 11:29:39 2002
@@ -58,4 +58,10 @@
bool is_reg_file_for_access(const char *name, bool write_access);
+bool my_isalnum(char c);
+bool my_isalpha(char c);
+bool my_isdigit(char c);
+bool my_isprint(char c);
+bool my_isspace(char c);
+
#endif /* FC__SUPPORT_H */
diff -urN -Xfreeciv/diff_ignore freeciv/server/cityhand.c freeciv-ctype/server/cityhand.c
--- freeciv/server/cityhand.c Mon May 27 08:32:07 2002
+++ freeciv-ctype/server/cityhand.c Mon Jun 10 11:29:39 2002
@@ -15,7 +15,6 @@
#endif
#include <assert.h>
-#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff -urN -Xfreeciv/diff_ignore freeciv/server/civserver.c freeciv-ctype/server/civserver.c
--- freeciv/server/civserver.c Fri May 17 08:25:20 2002
+++ freeciv-ctype/server/civserver.c Mon Jun 10 11:29:39 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <string.h>
#ifdef GENERATING_MAC /* mac header(s) */
diff -urN -Xfreeciv/diff_ignore freeciv/server/handchat.c freeciv-ctype/server/handchat.c
--- freeciv/server/handchat.c Wed Mar 6 08:45:10 2002
+++ freeciv-ctype/server/handchat.c Mon Jun 10 11:29:39 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <string.h>
-#include <ctype.h>
#include "fcintl.h"
#include "game.h"
@@ -164,7 +163,7 @@
genmsg.y = -1;
genmsg.event =-1;
for (cp = packet->message; *cp != '\0'; ++cp)
- if(!isprint(*cp & 0x7f)) {
+ if(!my_isprint(*cp & 0x7f)) {
*cp='\0';
break;
}
diff -urN -Xfreeciv/diff_ignore freeciv/server/ruleset.c freeciv-ctype/server/ruleset.c
--- freeciv/server/ruleset.c Fri Jun 7 09:03:16 2002
+++ freeciv-ctype/server/ruleset.c Mon Jun 10 11:29:39 2002
@@ -14,7 +14,6 @@
#include <config.h>
#endif
-#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff -urN -Xfreeciv/diff_ignore freeciv/server/rulesout.c freeciv-ctype/server/rulesout.c
--- freeciv/server/rulesout.c Thu Mar 7 09:01:08 2002
+++ freeciv-ctype/server/rulesout.c Mon Jun 10 11:29:39 2002
@@ -26,7 +26,6 @@
#endif
#include <stdio.h>
-#include <ctype.h>
#include <string.h>
#include "city.h"
diff -urN -Xfreeciv/diff_ignore freeciv/server/savegame.c freeciv-ctype/server/savegame.c
--- freeciv/server/savegame.c Sun Jun 9 08:30:17 2002
+++ freeciv-ctype/server/savegame.c Mon Jun 10 11:29:39 2002
@@ -15,7 +15,6 @@
#endif
#include <assert.h>
-#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -71,11 +70,11 @@
for (x = 0; x < map.xsize; x++) { \
if (regular_map_pos_is_normal(x, y)) { \
line[x] = get_xy_char; \
- if(!isprint(line[x] & 0x7f)) { \
+ if(!my_isprint(line[x] & 0x7f)) { \
freelog(LOG_FATAL, _("Trying to write invalid"\
" map data: '%c' %d"), \
line[x], line[x]); \
- exit(EXIT_FAILURE); \
+ exit(EXIT_FAILURE); \
} \
} else { \
/* skipped over in loading */ \
diff -urN -Xfreeciv/diff_ignore freeciv/server/srv_main.c freeciv-ctype/server/srv_main.c
--- freeciv/server/srv_main.c Fri Jun 7 09:03:17 2002
+++ freeciv-ctype/server/srv_main.c Mon Jun 10 11:29:39 2002
@@ -14,11 +14,11 @@
#include <config.h>
#endif
+#include <assert.h>
+#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <string.h>
-#include <assert.h>
#include <time.h>
#ifdef HAVE_UNISTD_H
@@ -920,6 +920,8 @@
send_select_nation(pplayer);
return;
}
+
+ packet->name[0] = toupper(packet->name[0]);
players_iterate(other_player) {
if(other_player->nation==packet->nation_no) {
diff -urN -Xfreeciv/diff_ignore freeciv/server/stdinhand.c freeciv-ctype/server/stdinhand.c
--- freeciv/server/stdinhand.c Fri Jun 7 09:03:17 2002
+++ freeciv-ctype/server/stdinhand.c Tue Jun 11 00:44:44 2002
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <string.h>
-#include <ctype.h>
#include <stdlib.h>
#include <assert.h>
#include <stdarg.h>
@@ -1917,7 +1916,7 @@
if (*s == '\0') goto usage;
rules = s;
- while (*s != '\0' && !isspace(*s)) s++;
+ while (*s != '\0' && !my_isspace(*s)) s++;
if (*s == '\0') goto usage;
*s = '\0'; /* terminate rules */
@@ -2050,12 +2049,12 @@
struct connection *ptarget;
/* find the start of the level: */
- for (cptr_s = str; *cptr_s != '\0' && !isalnum(*cptr_s); cptr_s++) {
+ for (cptr_s = str; *cptr_s != '\0' && !my_isalnum(*cptr_s); cptr_s++) {
/* nothing */
}
/* copy the level into arg_level[] */
- for(cptr_d=arg_level; *cptr_s != '\0' && isalnum(*cptr_s); cptr_s++, cptr_d++) {
+ for(cptr_d=arg_level; *cptr_s != '\0' && my_isalnum(*cptr_s); cptr_s++, cptr_d++) {
*cptr_d=*cptr_s;
}
*cptr_d='\0';
@@ -2095,13 +2094,13 @@
}
/* find the start of the name: */
- for (; *cptr_s != '\0' && !isalnum(*cptr_s); cptr_s++) {
+ for (; *cptr_s != '\0' && !my_isalnum(*cptr_s); cptr_s++) {
/* nothing */
}
/* copy the name into arg_name[] */
for(cptr_d=arg_name;
- *cptr_s != '\0' && (*cptr_s == '-' || *cptr_s == ' ' || isalnum(*cptr_s));
+ *cptr_s != '\0' && (*cptr_s == '-' || *cptr_s == ' ' || my_isalnum(*cptr_s));
cptr_s++ , cptr_d++) {
*cptr_d=*cptr_s;
}
@@ -2375,10 +2374,10 @@
char command[MAX_LEN_CONSOLE_LINE], *cptr_s, *cptr_d;
int cmd;
- for (cptr_s = str; *cptr_s != '\0' && !isalnum(*cptr_s); cptr_s++) {
+ for (cptr_s = str; *cptr_s != '\0' && !my_isalnum(*cptr_s); cptr_s++) {
/* nothing */
}
- for (cptr_d = command; *cptr_s != '\0' && isalnum(*cptr_s); cptr_s++, cptr_d++)
+ for (cptr_d = command; *cptr_s != '\0' && my_isalnum(*cptr_s); cptr_s++, cptr_d++)
*cptr_d=*cptr_s;
*cptr_d='\0';
@@ -2538,10 +2537,10 @@
int cmd,i,len1;
size_t clen = 0;
- for (cptr_s = str; *cptr_s != '\0' && !isalnum(*cptr_s); cptr_s++) {
+ for (cptr_s = str; *cptr_s != '\0' && !my_isalnum(*cptr_s); cptr_s++) {
/* nothing */
}
- for (cptr_d = command; *cptr_s != '\0' && isalnum(*cptr_s); cptr_s++, cptr_d++)
+ for (cptr_d = command; *cptr_s != '\0' && my_isalnum(*cptr_s); cptr_s++, cptr_d++)
*cptr_d=*cptr_s;
*cptr_d='\0';
@@ -2644,7 +2643,7 @@
******************************************************************/
static bool is_ok_opt_name_char(char c)
{
- return isalnum(c);
+ return my_isalnum(c);
}
/******************************************************************
@@ -2652,7 +2651,7 @@
******************************************************************/
static bool is_ok_opt_value_char(char c)
{
- return (c == '-') || (c == '*') || (c == '+') || (c == '=') || isalnum(c);
+ return (c == '-') || (c == '*') || (c == '+') || (c == '=') || my_isalnum(c);
}
/******************************************************************
@@ -2660,7 +2659,7 @@
******************************************************************/
static bool is_ok_opt_name_value_sep_char(char c)
{
- return (c == '=') || isspace(c);
+ return (c == '=') || my_isspace(c);
}
/******************************************************************
@@ -2884,7 +2883,7 @@
/* Is it a comment or a blank line? */
/* line is comment if the first non-whitespace character is '#': */
- for (cptr_s = str; *cptr_s != '\0' && isspace(*cptr_s); cptr_s++) {
+ for (cptr_s = str; *cptr_s != '\0' && my_isspace(*cptr_s); cptr_s++) {
/* nothing */
}
if(*cptr_s == 0 || *cptr_s == '#') {
@@ -2895,7 +2894,7 @@
given on the server command line - rp */
if (*cptr_s == SERVER_COMMAND_PREFIX) cptr_s++;
- for (; *cptr_s != '\0' && !isalnum(*cptr_s); cptr_s++) {
+ for (; *cptr_s != '\0' && !my_isalnum(*cptr_s); cptr_s++) {
/* nothing */
}
@@ -2904,7 +2903,7 @@
* skipped leading whitespace, the SERVER_COMMAND_PREFIX and any
* other non-alphanumeric characters.
*/
- for (cptr_d = command; *cptr_s != '\0' && isalnum(*cptr_s) &&
+ for (cptr_d = command; *cptr_s != '\0' && my_isalnum(*cptr_s) &&
cptr_d < command+sizeof(command)-1; cptr_s++, cptr_d++)
*cptr_d=*cptr_s;
*cptr_d='\0';
@@ -2928,7 +2927,7 @@
return;
}
- for (; *cptr_s != '\0' && isspace(*cptr_s); cptr_s++) {
+ for (; *cptr_s != '\0' && my_isspace(*cptr_s); cptr_s++) {
/* nothing */
}
sz_strlcpy(arg, cptr_s);
@@ -2940,7 +2939,7 @@
cut_comment(allargs);
i=strlen(arg)-1;
- while(i>0 && isspace(arg[i]))
+ while(i>0 && my_isspace(arg[i]))
arg[i--]='\0';
switch(cmd) {
@@ -3676,19 +3675,19 @@
char *str_itr = rl_line_buffer;
int cmd_len = strlen(cmd);
- while (str_itr < rl_line_buffer + start && !isalnum(*str_itr))
+ while (str_itr < rl_line_buffer + start && !my_isalnum(*str_itr))
str_itr++;
if (mystrncasecmp(str_itr, cmd, cmd_len) != 0)
return FALSE;
str_itr += cmd_len;
- if (isalnum(*str_itr)) /* not a distinct word */
+ if (my_isalnum(*str_itr)) /* not a distinct word */
return FALSE;
if (!allow_fluff) {
for (; str_itr < rl_line_buffer + start; str_itr++)
- if (isalnum(*str_itr))
+ if (my_isalnum(*str_itr))
return FALSE;
}
@@ -3708,7 +3707,7 @@
/* if there is only it is also OK */
str_itr = rl_line_buffer;
while (str_itr - rl_line_buffer < start) {
- if (isalnum(*str_itr))
+ if (my_isalnum(*str_itr))
return FALSE;
str_itr++;
}
@@ -3737,7 +3736,7 @@
char *chptr = rl_line_buffer;
while (chptr - rl_line_buffer < start) {
- if (isalnum(*chptr)) {
+ if (my_isalnum(*chptr)) {
if (!alnum) {
alnum = 1;
res++;