* Variable names, comments, documentation, etc... removed the acronym 'BBS'

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 1fec901a42f609a30c849794fe0c70aab15f3b46..67b2403805d8e7ee78ca27c96a8ff174e01ac01e 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -218,7 +218,7 @@ void cmd_info(void) {
        cprintf("%s\n", config.c_fqdn);
        cprintf("%s\n", CITADEL);
        cprintf("%d\n", REV_LEVEL);
-       cprintf("%s\n", config.c_bbs_city);
+       cprintf("%s\n", config.c_site_location);
        cprintf("%s\n", config.c_sysadm);
        cprintf("%d\n", SERVER_TYPE);
        cprintf("%s\n", config.c_moreprompt);
@@ -299,7 +299,7 @@ int is_public_client(void)
                begin_critical_section(S_PUBLIC_CLIENTS);
                lprintf(CTDL_INFO, "Loading %s\n", PUBLIC_CLIENTS);
 
-               strcpy(public_clients, "127.0.0.1");
+               safestrncpy(public_clients, "127.0.0.1", sizeof public_clients);
                if (hostname_to_dotted_quad(addrbuf, config.c_fqdn) == 0) {
                        strcat(public_clients, "|");
                        strcat(public_clients, addrbuf);
@@ -417,10 +417,8 @@ void cmd_mesg(char *mname)
 
        extract_token(buf, mname, 0, '|', sizeof buf);
 
-       dirs[0]=malloc(64);
-       dirs[1]=malloc(64);
-       strcpy(dirs[0],"messages");
-       strcpy(dirs[1],"help");
+       dirs[0] = strdup("messages");
+       dirs[1] = strdup("help");
        snprintf(buf2, sizeof buf2, "%s.%d.%d", buf, CC->cs_clientdev, CC->cs_clienttyp);
        mesg_locate(targ, sizeof targ, buf2, 2, (const char **)dirs);
        if (strlen(targ) == 0) {