diff -ruN -X freeciv/diff_ignore freeciv-Aug-9/client/civclient.c freeciv/client/civclient.c
--- freeciv-Aug-9/client/civclient.c	Wed Aug  9 21:42:03 2000
+++ freeciv/client/civclient.c	Wed Aug  9 21:42:20 2000
@@ -60,7 +60,7 @@
 
 #include "civclient.h"
 
-char metaserver[256]="";
+char metaserver[256];
 char server_host[512];
 char name[512];
 int server_port;
@@ -94,8 +94,8 @@
   /* set default argument values */
   loglevel=LOG_NORMAL;
   server_port=DEFAULT_SOCK_PORT;
-  mystrlcpy(server_host, "localhost", 512);
-  mystrlcpy(metaserver, METALIST_ADDR, 256);
+  sz_strlcpy(server_host, "localhost");
+  sz_strlcpy(metaserver, METALIST_ADDR);
   name[0] = '\0';
 
   i = 1;
@@ -126,13 +126,13 @@
    } else if ((option = get_option("--log",argv,&i,argc)) != NULL)
       logfile = mystrdup(option); /* never free()d */
    else if ((option = get_option("--name",argv,&i,argc)) != NULL)
-      mystrlcpy(name, option, 512);
+      sz_strlcpy(name, option);
    else if ((option = get_option("--metaserver",argv,&i,argc)) != NULL)
-      mystrlcpy(metaserver, option, 256);
+      sz_strlcpy(metaserver, option);
    else if ((option = get_option("--port",argv,&i,argc)) != NULL)
      server_port=atoi(option);
    else if ((option = get_option("--server",argv,&i,argc)) != NULL)
-      mystrlcpy(server_host, option, 512);
+      sz_strlcpy(server_host, option);
    else if ((option = get_option("--debug",argv,&i,argc)) != NULL) {
       loglevel=log_parse_level_str(option);
       if (loglevel==-1) {
@@ -150,9 +150,8 @@
   log_init(logfile, loglevel, NULL);
 
   /* after log_init: */
-  if (name[0] == '\0') {
-    mystrlcpy(name, user_username(), 512);
-  }
+  if (name[0] == '\0')
+    sz_strlcpy(name, user_username());
 
   init_messages_where();
   init_our_capability();