BSD 4_3_Tahoe release

[unix-history] / usr / src / etc / route.c

diff --git a/usr/src/etc/route.c b/usr/src/etc/route.c
index ec7deaa..5d25e13 100644 (file)
--- a/usr/src/etc/route.c
+++ b/usr/src/etc/route.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)route.c    5.6 (Berkeley) 6/5/86";
+static char sccsid[] = "@(#)route.c    5.9 (Berkeley) 12/26/87";

 #endif not lint
 
 #include <sys/param.h>
 #endif not lint
 
 #include <sys/param.h>


@@ -200,7 +200,7 @@ routename(sa)
                else {
 #define C(x)   ((x) & 0xff)
                        in.s_addr = ntohl(in.s_addr);
                else {
 #define C(x)   ((x) & 0xff)
                        in.s_addr = ntohl(in.s_addr);

-                       sprintf(line, "%u.%u.%u.%u", C(in.s_addr >> 24),
+                       (void)sprintf(line, "%u.%u.%u.%u", C(in.s_addr >> 24),

                           C(in.s_addr >> 16), C(in.s_addr >> 8), C(in.s_addr));
                }
                break;
                           C(in.s_addr >> 16), C(in.s_addr >> 8), C(in.s_addr));
                }
                break;


@@ -212,8 +212,8 @@ routename(sa)
        default:
            {   u_short *s = (u_short *)sa->sa_data;
 
        default:
            {   u_short *s = (u_short *)sa->sa_data;
 

-               sprintf(line, "af %d: %x %x %x %x %x %x %x", sa->sa_family,
-                       s[0], s[1], s[2], s[3], s[4], s[5], s[6]);
+               (void)sprintf(line, "af %d: %x %x %x %x %x %x %x",
+                   sa->sa_family, s[0], s[1], s[2], s[3], s[4], s[5], s[6]);

                break;
            }
        }
                break;
            }
        }


@@ -232,8 +232,9 @@ netname(sa)
        static char line[50];
        struct netent *np = 0;
        u_long net, mask;
        static char line[50];
        struct netent *np = 0;
        u_long net, mask;

-       register i;
+       register u_long i;

        int subnetshift;
        int subnetshift;

+       char *ns_print();

 
        switch (sa->sa_family) {
 
 
        switch (sa->sa_family) {
 


@@ -241,7 +242,7 @@ netname(sa)
            {   struct in_addr in;
                in = ((struct sockaddr_in *)sa)->sin_addr;
 
            {   struct in_addr in;
                in = ((struct sockaddr_in *)sa)->sin_addr;
 

-               in.s_addr = ntohl(in.s_addr);
+               i = in.s_addr = ntohl(in.s_addr);

                if (in.s_addr == 0)
                        cp = "default";
                else if (!nflag) {
                if (in.s_addr == 0)
                        cp = "default";
                else if (!nflag) {


@@ -273,15 +274,15 @@ netname(sa)
                if (cp)
                        strcpy(line, cp);
                else if ((in.s_addr & 0xffffff) == 0)
                if (cp)
                        strcpy(line, cp);
                else if ((in.s_addr & 0xffffff) == 0)

-                       sprintf(line, "%u", C(in.s_addr >> 24));
+                       (void)sprintf(line, "%u", C(in.s_addr >> 24));

                else if ((in.s_addr & 0xffff) == 0)
                else if ((in.s_addr & 0xffff) == 0)

-                       sprintf(line, "%u.%u", C(in.s_addr >> 24),
+                       (void)sprintf(line, "%u.%u", C(in.s_addr >> 24),

                            C(in.s_addr >> 16));
                else if ((in.s_addr & 0xff) == 0)
                            C(in.s_addr >> 16));
                else if ((in.s_addr & 0xff) == 0)

-                       sprintf(line, "%u.%u.%u", C(in.s_addr >> 24),
+                       (void)sprintf(line, "%u.%u.%u", C(in.s_addr >> 24),

                            C(in.s_addr >> 16), C(in.s_addr >> 8));
                else
                            C(in.s_addr >> 16), C(in.s_addr >> 8));
                else

-                       sprintf(line, "%u.%u.%u.%u", C(in.s_addr >> 24),
+                       (void)sprintf(line, "%u.%u.%u.%u", C(in.s_addr >> 24),

                            C(in.s_addr >> 16), C(in.s_addr >> 8),
                            C(in.s_addr));
                break;
                            C(in.s_addr >> 16), C(in.s_addr >> 8),
                            C(in.s_addr));
                break;


@@ -294,8 +295,8 @@ netname(sa)
        default:
            {   u_short *s = (u_short *)sa->sa_data;
 
        default:
            {   u_short *s = (u_short *)sa->sa_data;
 

-               sprintf(line, "af %d: %x %x %x %x %x %x %x", sa->sa_family,
-                       s[0], s[1], s[2], s[3], s[4], s[5], s[6]);
+               (void)sprintf(line, "af %d: %x %x %x %x %x %x %x",
+                   sa->sa_family, s[0], s[1], s[2], s[3], s[4], s[5], s[6]);

                break;
            }
        }
                break;
            }
        }


@@ -386,15 +387,21 @@ changeroute(argc, argv)
 error(cmd)
        char *cmd;
 {
 error(cmd)
        char *cmd;
 {

+       extern int errno;

 
 

-       if (errno == ESRCH)
+       switch(errno) {
+       case ESRCH:

                fprintf(stderr, "not in table\n");
                fprintf(stderr, "not in table\n");

-       else if (errno == EBUSY)
+               break;
+       case EBUSY:

                fprintf(stderr, "entry in use\n");
                fprintf(stderr, "entry in use\n");

-       else if (errno == ENOBUFS)
+               break;
+       case ENOBUFS:

                fprintf(stderr, "routing table overflow\n");
                fprintf(stderr, "routing table overflow\n");

-       else
+               break;
+       default:

                perror(cmd);
                perror(cmd);

+       }

 }
 
 char *
 }
 
 char *


@@ -488,10 +495,10 @@ struct sockaddr_ns *sns;
        net.net_e  = work.x_net;
        if (ns_nullhost(work) && net.long_e == 0) {
                if (port ) {
        net.net_e  = work.x_net;
        if (ns_nullhost(work) && net.long_e == 0) {
                if (port ) {

-                       sprintf(mybuf, "*.%xH", port);
+                       (void)sprintf(mybuf, "*.%xH", port);

                        upHex(mybuf);
                } else
                        upHex(mybuf);
                } else

-                       sprintf(mybuf, "*.*");
+                       (void)sprintf(mybuf, "*.*");

                return (mybuf);
        }
 
                return (mybuf);
        }
 


@@ -501,17 +508,17 @@ struct sockaddr_ns *sns;
                host = "*";
        } else {
                q = work.x_host.c_host;
                host = "*";
        } else {
                q = work.x_host.c_host;

-               sprintf(chost, "%02x%02x%02x%02x%02x%02xH",
+               (void)sprintf(chost, "%02x%02x%02x%02x%02x%02xH",

                        q[0], q[1], q[2], q[3], q[4], q[5]);
                for (p = chost; *p == '0' && p < chost + 12; p++);
                host = p;
        }
        if (port)
                        q[0], q[1], q[2], q[3], q[4], q[5]);
                for (p = chost; *p == '0' && p < chost + 12; p++);
                host = p;
        }
        if (port)

-               sprintf(cport, ".%xH", htons(port));
+               (void)sprintf(cport, ".%xH", htons(port));

        else
                *cport = 0;
 
        else
                *cport = 0;
 

-       sprintf(mybuf,"%xH.%s%s", ntohl(net.long_e), host, cport);
+       (void)sprintf(mybuf,"%xH.%s%s", ntohl(net.long_e), host, cport);

        upHex(mybuf);
        return(mybuf);
 }
        upHex(mybuf);
        return(mybuf);
 }