* The size constant "256" which shows up everywhere as a buffer size has now

[citadel.git] / citadel / netsetup.c

diff --git a/citadel/netsetup.c b/citadel/netsetup.c
index e64c9d0cdc335d686fea557de686342c4ebf9aff..c11df8c4fed52be2e08089a61e1b2d6036106dcd 100644 (file)
--- a/citadel/netsetup.c
+++ b/citadel/netsetup.c
@@ -1,6 +1,7 @@
 /*
- * netsetup.c
+ * $Id$
  *
+ * Command-line utility to manipulate network configuration files
  * Copyright (c) 1998  Art Cancro
  *
  */
@@ -20,42 +21,20 @@ struct roomshare {
 
 struct netnode {
        char nn_nodename[32];
-       char nn_spoolcmd[256];
+       char nn_spoolcmd[SIZ];
        struct roomshare *nn_first;
        };
 
 
-void get_config();
+void get_config(void);
 struct config config;
 
-/*
- * struncmp()  -  case-insensitive version of strncmp()
- *                citadel.h will #define a strucmp() based on this
- */
-int struncmp(lstr,rstr,len)
-char lstr[],rstr[];
-int len; {
-       int pos = 0;
-       char lc,rc;
-       while (pos<len) {
-               lc=tolower(lstr[pos]);
-               rc=tolower(rstr[pos]);
-               if ((lc==0)&&(rc==0)) return(0);
-               if (lc<rc) return(-1);
-               if (lc>rc) return(1);
-               pos=pos+1;
-               }
-       return(0);
-       }
-
-
-
 
-struct netnode *load_node(nodename)
-char *nodename; {
+struct netnode *load_node(char *nodename)
+{
        FILE *fp;
-       char buf[256];
-       char filename[256];
+       char buf[SIZ];
+       char filename[SIZ];
        struct netnode *newnn;
        struct roomshare *newrs;
 
@@ -90,11 +69,11 @@ char *nodename; {
 
 
 
-void save_node(nnptr)
-struct netnode *nnptr; {
+void save_node(struct netnode *nnptr)
+{
 
        FILE *fp;
-       char filename[256];
+       char filename[SIZ];
        struct roomshare *rsptr = NULL;
        
        sprintf(filename, "./network/systems/%s", nnptr->nn_nodename);
@@ -117,7 +96,7 @@ struct netnode *nnptr; {
 
 
 
-void display_usage() {
+void display_usage(void) {
        fprintf(stderr, "netsetup for %s\n", CITADEL);
        fprintf(stderr, "usage: netsetup <command> [arguments]\n\n");
        fprintf(stderr, "Commands: \n");
@@ -137,9 +116,9 @@ void display_usage() {
  * Display all neighboring nodes
  * (This is inherently nonportable)
  */
-void display_nodelist() {
+void display_nodelist(void) {
        FILE *ls;
-       char buf[256];
+       char buf[SIZ];
 
        ls = (FILE *) popen("cd ./network/systems; ls", "r");
        if (ls == NULL) {
@@ -159,10 +138,10 @@ void display_nodelist() {
 
 /*
  */
-void add_node(NewNodeName)
-char *NewNodeName; {
+void add_node(char *NewNodeName)
+{
        FILE *fp;
-       char sysfilename[256];
+       char sysfilename[SIZ];
 
        sprintf(sysfilename, "./network/systems/%s", NewNodeName);
 
@@ -187,11 +166,11 @@ char *NewNodeName; {
 
 /*
  */
-void delete_node(NodeName)
-char *NodeName; {
+void delete_node(char *NodeName)
+{
        FILE *fp;
-       char sysfilename[256];
-       char spooloutfilename[256];
+       char sysfilename[SIZ];
+       char spooloutfilename[SIZ];
 
        sprintf(sysfilename, "./network/systems/%s", NodeName);
        sprintf(spooloutfilename, "./network/spoolout/%s", NodeName);
@@ -215,11 +194,11 @@ char *NodeName; {
 
 /*
  */
-void do_roomlist(NodeName)
-char *NodeName; {
+void do_roomlist(char *NodeName)
+{
        FILE *fp;
-       char sysfilename[256];
-       char buf[256];
+       char sysfilename[SIZ];
+       char buf[SIZ];
 
        sprintf(sysfilename, "./network/systems/%s", NodeName);
 
@@ -243,11 +222,11 @@ char *NodeName; {
 
 /*
  */
-void show_spool_cmd(NodeName)
-char *NodeName; {
+void show_spool_cmd(char *NodeName)
+{
        FILE *fp;
-       char sysfilename[256];
-       char buf[256];
+       char sysfilename[SIZ];
+       char buf[SIZ];
 
        sprintf(sysfilename, "./network/systems/%s", NodeName);
 
@@ -266,9 +245,8 @@ char *NodeName; {
 
 /*
  */
-void set_spool_cmd(nodename, spoolcmd)
-char *nodename;
-char *spoolcmd; {
+void set_spool_cmd(char *nodename, char *spoolcmd)
+{
        struct netnode *nnptr;
 
        nnptr = load_node(nodename);
@@ -284,9 +262,8 @@ char *spoolcmd; {
 
 /*
  */
-void add_share(nodename, roomname)
-char *nodename;
-char *roomname; {
+void add_share(char *nodename, char *roomname)
+{
        struct netnode *nnptr;
        struct roomshare *rsptr;
        long highest = 0L;
@@ -299,7 +276,7 @@ char *roomname; {
                }
 
        for (rsptr = nnptr->nn_first; rsptr != NULL; rsptr = rsptr->next) {
-               if (!strucmp(rsptr->rs_name, roomname)) {
+               if (!strcasecmp(rsptr->rs_name, roomname)) {
                        foundit = 1;
                        }
                if (rsptr->rs_lastsent > highest) {
@@ -321,9 +298,8 @@ char *roomname; {
 
 /*
  */
-void remove_share(nodename, roomname)
-char *nodename;
-char *roomname; {
+void remove_share(char *nodename, char *roomname)
+{
        struct netnode *nnptr;
        struct roomshare *rsptr, *rshold;
        int foundit = 0;
@@ -335,7 +311,7 @@ char *roomname; {
                }
 
        if (nnptr->nn_first != NULL)
-          if (!strucmp(nnptr->nn_first->rs_name, roomname)) {
+          if (!strcasecmp(nnptr->nn_first->rs_name, roomname)) {
                rshold = nnptr->nn_first;
                nnptr->nn_first = nnptr->nn_first->next;
                free(rshold);
@@ -344,7 +320,7 @@ char *roomname; {
 
        if (nnptr->nn_first != NULL)
           for (rsptr = nnptr->nn_first; rsptr->next != NULL; rsptr = rsptr->next) {
-               if (!strucmp(rsptr->next->rs_name, roomname)) {
+               if (!strcasecmp(rsptr->next->rs_name, roomname)) {
                        rshold = rsptr->next;
                        rsptr->next = rsptr->next->next;
                        free(rshold);
@@ -363,9 +339,8 @@ char *roomname; {
        }
 
 
-int main(argc, argv)
-int argc;
-char *argv[]; {
+int main(int argc, char **argv)
+{
 
        if (argc < 2) {
                display_usage();