Warning fixes.

diff --git a/etc/atalkd/aep.c b/etc/atalkd/aep.c
index d3fff8f5d1f89eaf06713fa42a4254f20bbac7fa..420a598afea1d25ce8364aff709f9a41b35e4b5a 100644 (file)
--- a/etc/atalkd/aep.c
+++ b/etc/atalkd/aep.c
@@ -1,5 +1,5 @@
 /*
- * $Id: aep.c,v 1.4 2001-06-25 20:13:45 rufustfirefly Exp $
+ * $Id: aep.c,v 1.4.2.1 2001-12-31 20:05:20 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -9,6 +9,9 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include <string.h>
+#include <errno.h>
+
 #include <sys/syslog.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -36,7 +39,7 @@ int aep_packet( ap, from, data, len )
     *( data + 1 ) = AEPOP_REPLY;
     if ( sendto( ap->ap_fd, data, len, 0, (struct sockaddr *)from,
            sizeof( struct sockaddr_at )) < 0 ) {
-       syslog( LOG_ERR, "aep sendto: %m" );
+       syslog( LOG_ERR, "aep sendto: %s", strerror(errno) );
        return 1;
     }
 

diff --git a/etc/atalkd/main.c b/etc/atalkd/main.c
index 4683c1ae26cf78730df60a4df9e25b98c54e937b..6e13128898ad15759e71c3c81e59feacdb4f1954 100644 (file)
--- a/etc/atalkd/main.c
+++ b/etc/atalkd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.10 2001-09-12 19:13:17 uhees Exp $
+ * $Id: main.c,v 1.10.2.1 2001-12-31 20:05:20 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -147,9 +147,9 @@ static void atalkd_exit(const int i)
        continue;
 #endif /* SIOCDIFADDR != SIOCATALKDIFADDR */
 #endif /* SIOCATALKIFADDR */
-      syslog( LOG_ERR, "difaddr(%u.%u): %m", 
+      syslog( LOG_ERR, "difaddr(%u.%u): %s", 
              ntohs(iface->i_addr.sat_addr.s_net), 
-             iface->i_addr.sat_addr.s_node);
+             iface->i_addr.sat_addr.s_node, strerror(errno));
     }
   }
 #endif /* SOPCDOFADDR */
@@ -196,13 +196,13 @@ as_timer()
            if ( iface->i_time < 3 ) {
                if ( iface->i_flags & IFACE_PHASE1 ) {
                  if (rtmp_request( iface ) < 0) {
-                     syslog(LOG_ERR, "rtmp_request: %m");
+                     syslog(LOG_ERR, "rtmp_request: %s", strerror(errno));
                      atalkd_exit(1);
                  }
                    newrtmpdata = 1;
                } else {
                  if (zip_getnetinfo( iface ) < 0) {
-                   syslog(LOG_ERR, "zip_getnetinfo: %m");
+                   syslog(LOG_ERR, "zip_getnetinfo: %s", strerror(errno));
                    atalkd_exit(1);
                  }
                  sentzipq = 1;
@@ -232,7 +232,7 @@ as_timer()
                        for ( zt = iface->i_czt; zt; zt = zt->zt_next ) {
                            if (addzone( iface->i_rt, zt->zt_len, 
                                         zt->zt_name) < 0) {
-                             syslog(LOG_ERR, "addzone: %m");
+                             syslog(LOG_ERR, "addzone: %s", strerror(errno));
                              atalkd_exit(1);
                            }
                        }
@@ -257,9 +257,10 @@ as_timer()
 
                        if ( looproute( iface, RTMP_ADD )) { /* -1 or 1 */
                            syslog( LOG_ERR,
-                                   "as_timer: can't route %u.%u to loop: %m",
+                                   "as_timer: can't route %u.%u to loop: %s",
                                    ntohs( iface->i_addr.sat_addr.s_net ),
-                                   iface->i_addr.sat_addr.s_node );
+                                   iface->i_addr.sat_addr.s_node,
+                                   strerror(errno) );
                            atalkd_exit( 1 );
                        }
                        if ( iface == ciface ) {
@@ -284,9 +285,10 @@ as_timer()
                    }
                    if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */
                        syslog( LOG_ERR,
-                               "as_timer: can't route %u.%u to loopback: %m",
+                               "as_timer: can't route %u.%u to loopback: %s",
                                ntohs( iface->i_addr.sat_addr.s_net ),
-                               iface->i_addr.sat_addr.s_node );
+                               iface->i_addr.sat_addr.s_node,
+                               strerror(errno) );
                        atalkd_exit( 1 );
                    }
 
@@ -329,7 +331,7 @@ as_timer()
                    } else {
                        rtmp->rt_hops = RTMPHOPS_POISON;
                        if ((cc = rtmp_replace( rtmp )) < 0) {
-                         syslog(LOG_ERR, "rtmp_replace: %m");
+                         syslog(LOG_ERR, "rtmp_replace: %s", strerror(errno));
                          atalkd_exit(1);
                        }
                        if (cc) {
@@ -425,7 +427,7 @@ as_timer()
                        } else {
                            rtmp->rt_hops = RTMPHOPS_POISON;
                            if ((cc = rtmp_replace( rtmp )) < 0) {
-                               syslog(LOG_ERR, "rtmp_replace: %m");
+                               syslog(LOG_ERR, "rtmp_replace: %s", strerror(errno));
                                atalkd_exit(1);
                            }
                            if (cc)
@@ -453,7 +455,7 @@ as_timer()
                        if ( sendto( zap->ap_fd, packet, cc, 0,
                                (struct sockaddr *)&sat,
                                sizeof( struct sockaddr_at )) < 0 ) {
-                           syslog( LOG_ERR, "as_timer sendto: %m" );
+                           syslog( LOG_ERR, "as_timer sendto: %s", strerror(errno) );
                        }
                        sentzipq = 1;
 
@@ -502,7 +504,7 @@ as_timer()
 
                if ( sendto( zap->ap_fd, packet, cc, 0, (struct sockaddr *)&sat,
                        sizeof( struct sockaddr_at )) < 0 ) {
-                   syslog( LOG_ERR, "as_timer sendto: %m" );
+                   syslog( LOG_ERR, "as_timer sendto: %s", strerror(errno) );
                }
            }
        }
@@ -581,10 +583,11 @@ as_timer()
                        if ( sendto( rap->ap_fd, packet, data - packet, 0,
                                (struct sockaddr *)&sat,
                                sizeof( struct sockaddr_at )) < 0 ) {
-                           syslog( LOG_ERR, "as_timer sendto %u.%u (%u): %m",
+                           syslog( LOG_ERR, "as_timer sendto %u.%u (%u): %s",
                                    ntohs( sat.sat_addr.s_net ),
                                    sat.sat_addr.s_node,
-                                   ntohs( iface->i_rt->rt_firstnet ));
+                                   ntohs( iface->i_rt->rt_firstnet ),
+                                   strerror(errno) );
                        }
 
                        if ( iface->i_flags & IFACE_PHASE2 ) {
@@ -620,10 +623,11 @@ as_timer()
                if ( sendto( rap->ap_fd, packet, data - packet, 0,
                        (struct sockaddr *)&sat,
                        sizeof( struct sockaddr_at )) < 0 ) {
-                   syslog( LOG_ERR, "as_timer sendto %u.%u (%u): %m",
+                   syslog( LOG_ERR, "as_timer sendto %u.%u (%u): %s",
                            ntohs( sat.sat_addr.s_net ),
                            sat.sat_addr.s_node,
-                           ntohs( iface->i_rt->rt_firstnet ));
+                           ntohs( iface->i_rt->rt_firstnet ),
+                           strerror(errno) );
                }
            }
        }
@@ -718,7 +722,7 @@ as_debug()
     FILE               *rtmpdebug;
 
     if (( rtmpdebug = fopen( _PATH_ATALKDEBUG, "w" )) == NULL ) {
-       syslog( LOG_ERR, "rtmp: %m" );
+       syslog( LOG_ERR, "rtmp: %s", strerror(errno) );
     }
 
     for ( iface = interfaces; iface; iface = iface->i_next ) {
@@ -823,18 +827,20 @@ as_down()
            for ( rt = gate->g_rt; rt; rt = rt->rt_next ) {
                if ( rt->rt_iprev ) {
                    if ( gateroute( RTMP_DEL, rt ) < 0 ) {
-                       syslog( LOG_ERR, "as_down remove %u-%u failed: %m",
+                       syslog( LOG_ERR, "as_down remove %u-%u failed: %s",
                                ntohs( rt->rt_firstnet ),
-                               ntohs( rt->rt_lastnet ));
+                               ntohs( rt->rt_lastnet ),
+                               strerror(errno) );
                    }
                }
            }
        }
        if ( iface->i_flags & IFACE_LOOP ) {
          if (looproute( iface, RTMP_DEL )) {
-           syslog( LOG_ERR, "as_down remove %s %u.%u failed: %m",
+           syslog( LOG_ERR, "as_down remove %s %u.%u failed: %s",
                    iface->i_name, ntohs( iface->i_addr.sat_addr.s_net ),
-                   iface->i_addr.sat_addr.s_node );
+                   iface->i_addr.sat_addr.s_node,
+                   strerror(errno) );
          }
        }
     }
@@ -1086,16 +1092,16 @@ int main( ac, av )
      */
 #ifdef BSD4_4
     if (( rtfd = socket( PF_ROUTE, SOCK_RAW, AF_APPLETALK )) < 0 ) {
-       syslog( LOG_ERR, "route socket: %m" );
+       syslog( LOG_ERR, "route socket: %s", strerror(errno) );
        atalkd_exit( 1 );
     }
     if ( shutdown( rtfd, 0 ) < 0 ) {
-       syslog( LOG_ERR, "route shutdown: %m" );
+       syslog( LOG_ERR, "route shutdown: %s", strerror(errno) );
        atalkd_exit( 1 );
     }
 #else /* BSD4_4 */
     if (( rtfd = socket( AF_APPLETALK, SOCK_DGRAM, 0 )) < 0 ) {
-       syslog( LOG_ERR, "route socket: %m" );
+       syslog( LOG_ERR, "route socket: %s", strerror(errno) );
        atalkd_exit( 1 );
     }
 #endif /* BSD4_4 */
@@ -1108,7 +1114,7 @@ int main( ac, av )
     sigaddset( &sv.sa_mask, SIGTERM );
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGTERM, &sv, NULL) < 0 ) {
-       syslog( LOG_ERR, "sigterm: %m" );
+       syslog( LOG_ERR, "sigterm: %s", strerror(errno) );
        atalkd_exit( 1 );
     }
 
@@ -1119,7 +1125,7 @@ int main( ac, av )
     sigaddset( &sv.sa_mask, SIGTERM );
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGUSR1, &sv, NULL) < 0 ) {
-       syslog( LOG_ERR, "sigusr1: %m" );
+       syslog( LOG_ERR, "sigusr1: %s", strerror(errno) );
        atalkd_exit( 1 );
     }
 
@@ -1130,7 +1136,7 @@ int main( ac, av )
     sigaddset( &sv.sa_mask, SIGTERM );
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGALRM, &sv, NULL) < 0 ) {
-       syslog( LOG_ERR, "sigalrm: %m" );
+       syslog( LOG_ERR, "sigalrm: %s", strerror(errno) );
        atalkd_exit( 1 );
     }
 
@@ -1139,7 +1145,7 @@ int main( ac, av )
     it.it_value.tv_sec = 10L;
     it.it_value.tv_usec = 0L;
     if ( setitimer( ITIMER_REAL, &it, NULL) < 0 ) {
-       syslog( LOG_ERR, "setitimer: %m" );
+       syslog( LOG_ERR, "setitimer: %s", strerror(errno) );
        atalkd_exit( 1 );
     }
 
@@ -1152,7 +1158,7 @@ int main( ac, av )
                errno = 0;
                continue;
            } else {
-               syslog( LOG_ERR, "select: %m" );
+               syslog( LOG_ERR, "select: %s", strerror(errno) );
                atalkd_exit( 1 );
            }
        }
@@ -1164,7 +1170,7 @@ int main( ac, av )
                        fromlen = sizeof( struct sockaddr_at );
                        if (( c = recvfrom( ap->ap_fd, Packet, sizeof( Packet ),
                                0, (struct sockaddr *)&sat, &fromlen )) < 0 ) {
-                           syslog( LOG_ERR, "recvfrom: %m" );
+                           syslog( LOG_ERR, "recvfrom: %s", strerror(errno) );
                            continue;
                        }
 #ifdef DEBUG
@@ -1178,7 +1184,7 @@ int main( ac, av )
 #endif /* DEBUG */
 #ifdef __svr4__
                        if ( sighold( SIGALRM ) || sighold( SIGUSR1 )) {
-                           syslog( LOG_ERR, "sighold: %m" );
+                           syslog( LOG_ERR, "sighold: %s", strerror(errno) );
                            atalkd_exit( 1 );
                        }
 #else /* __svr4__ */
@@ -1186,7 +1192,7 @@ int main( ac, av )
                                sigmask( SIGUSR1 ));
 #endif /* __svr4__ */
                        if (( *ap->ap_packet )( ap, &sat, Packet, c ) < 0) {
-                         syslog(LOG_ERR, "ap->ap_packet: %m");
+                         syslog(LOG_ERR, "ap->ap_packet: %s", strerror(errno));
                          atalkd_exit(1);
                        }
 
@@ -1195,7 +1201,7 @@ int main( ac, av )
 #endif /* DEBUG */
 #ifdef __svr4__
                        if ( sigrelse( SIGUSR1 ) || sigrelse( SIGALRM )) {
-                           syslog( LOG_ERR, "sigrelse: %m" );
+                           syslog( LOG_ERR, "sigrelse: %s", strerror(errno) );
                            atalkd_exit( 1 );
                        }
 #else /* __svr4__ */
@@ -1238,7 +1244,7 @@ void bootaddr( iface )
            }
 
        } else if (rtmp_request( iface ) < 0) {
-         syslog(LOG_ERR, "bootaddr (rtmp_request): %m");
+         syslog(LOG_ERR, "bootaddr (rtmp_request): %s", strerror(errno));
          atalkd_exit(1);
        }
 
@@ -1255,7 +1261,7 @@ void bootaddr( iface )
            }
            
        } else if (zip_getnetinfo( iface ) < 0) {
-         syslog(LOG_ERR, "bootaddr (zip_getnetinfo): %m");
+         syslog(LOG_ERR, "bootaddr (zip_getnetinfo): %s", strerror(errno));
          atalkd_exit(1);
        }
     }
@@ -1269,12 +1275,9 @@ void bootaddr( iface )
  * Change setaddr()
  * to manage the i_ports field and the fds for select().
  */
-void setaddr( iface, phase, net, node, first, last )
-    struct interface   *iface;
-    u_int8_t           phase;
-    u_int16_t          net;
-    u_int8_t           node;
-    u_int16_t          first, last;
+void setaddr(struct interface *iface,
+             u_int8_t  phase, u_int16_t net, u_int8_t node,
+            u_int16_t first, u_int16_t last)
 {
     int                        i;
     struct atserv      *as;
@@ -1292,7 +1295,7 @@ void setaddr( iface, phase, net, node, first, last )
            }
            if (( ap = (struct atport *)malloc( sizeof( struct atport ))) ==
                    NULL ) {
-               syslog( LOG_ERR, "malloc: %m" );
+               syslog( LOG_ERR, "malloc: %s", strerror(errno) );
                atalkd_exit( 1 );
            }
            ap->ap_fd = 0;
@@ -1322,12 +1325,12 @@ void setaddr( iface, phase, net, node, first, last )
     memcpy( iface->i_addr.sat_zero, &nr, sizeof( struct netrange ));
 
     if ( ifconfig( iface->i_name, SIOCSIFADDR, &iface->i_addr )) {
-      syslog( LOG_ERR, "setifaddr: %s (%u-%u): %m. try specifying a \
-smaller net range.", iface->i_name, ntohs(first), ntohs(last));
+      syslog( LOG_ERR, "setifaddr: %s (%u-%u): %s. try specifying a \
+smaller net range.", iface->i_name, ntohs(first), ntohs(last), strerror(errno));
        atalkd_exit( 1 );
     }
     if ( ifconfig( iface->i_name, SIOCGIFADDR, &iface->i_addr )) {
-       syslog( LOG_ERR, "getifaddr: %s: %m", iface->i_name );
+       syslog( LOG_ERR, "getifaddr: %s: %s", iface->i_name, strerror(errno) );
        atalkd_exit( 1 );
     }
 
@@ -1338,7 +1341,7 @@ smaller net range.", iface->i_name, ntohs(first), ntohs(last));
 #endif /* __svr4__ */
     for ( ap = iface->i_ports; ap; ap = ap->ap_next ) {
        if (( ap->ap_fd = socket( AF_APPLETALK, SOCK_DGRAM, 0 )) < 0 ) {
-           syslog( LOG_ERR, "socket: %m" );
+           syslog( LOG_ERR, "socket: %s", strerror(errno) );
            atalkd_exit( 1 );
        }
 #ifndef __svr4__
@@ -1356,9 +1359,9 @@ smaller net range.", iface->i_name, ntohs(first), ntohs(last));
 
        if ( bind( ap->ap_fd, (struct sockaddr *)&sat,
                sizeof( struct sockaddr_at )) < 0 ) {
-           syslog( LOG_ERR, "bind %u.%u:%u: %m",
+           syslog( LOG_ERR, "bind %u.%u:%u: %s",
                    ntohs( sat.sat_addr.s_net ),
-                   sat.sat_addr.s_node, sat.sat_port );
+                   sat.sat_addr.s_node, sat.sat_port, strerror(errno) );
 #ifdef SIOCDIFADDR
            /* remove all interfaces if we have a problem with bind */
            for (iface = interfaces; iface; iface = iface->i_next) {

diff --git a/etc/atalkd/multicast.c b/etc/atalkd/multicast.c
index 002a90a4ebedf64479091918ed643791c9cd35bd..976778ac05b440af77ae078db18a9e856f62760c 100644 (file)
--- a/etc/atalkd/multicast.c
+++ b/etc/atalkd/multicast.c
@@ -1,5 +1,5 @@
 /*
- * $Id: multicast.c,v 1.7 2001-08-15 01:39:39 srittau Exp $
+ * $Id: multicast.c,v 1.7.2.1 2001-12-31 20:05:20 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -11,6 +11,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -393,7 +394,7 @@ zone_bcast( zt )
 
     if (!zt->zt_bcast &&
        (zt->zt_bcast = (u_char *) malloc(sizeof( ethermulti ))) == NULL) {
-       syslog( LOG_ERR, "zone_bcast malloc: %m" );
+       syslog( LOG_ERR, "zone_bcast malloc: %s", strerror(errno) );
        return -1;
      }
 

diff --git a/etc/atalkd/nbp.c b/etc/atalkd/nbp.c
index 28ab7faef127c5d746fdf8cb4e471daf7f971797..ea662599a8bde63a8cea827f932e4d7c6b44545c 100644 (file)
--- a/etc/atalkd/nbp.c
+++ b/etc/atalkd/nbp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nbp.c,v 1.5 2001-08-15 01:39:39 srittau Exp $
+ * $Id: nbp.c,v 1.5.2.1 2001-12-31 20:05:20 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -11,6 +11,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <sys/syslog.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -63,7 +64,7 @@ void nbp_ack( fd, nh_op, nh_id, to )
     data += SZ_NBPHDR;
     if ( sendto( fd, packet, data - packet, 0, (struct sockaddr *)to,
            sizeof( struct sockaddr_at )) < 0 ) {
-       syslog( LOG_ERR, "sendto: %m" );
+       syslog( LOG_ERR, "sendto: %s", strerror(errno) );
     }
 }
 
@@ -217,7 +218,8 @@ int nbp_packet( ap, from, data, len )
                    if ( zt == (struct ziptab *)l->l_data ) {
                        /* add multicast */
                        if (addmulti(iface->i_name, zt->zt_bcast) < 0) {
-                           syslog( LOG_ERR, "nbp_packet: addmulti: %m" );
+                           syslog( LOG_ERR, "nbp_packet: addmulti: %s",
+                                   strerror(errno) );
                            return -1;
                        }
                    }
@@ -227,7 +229,7 @@ int nbp_packet( ap, from, data, len )
 
        if (( ntab = (struct nbptab *)malloc( sizeof( struct nbptab )))
                == 0 ) {
-           syslog( LOG_ERR, "nbp_packet: malloc: %m" );
+           syslog( LOG_ERR, "nbp_packet: malloc: %s", strerror(errno) );
            return -1;
        }
        memcpy( &ntab->nt_nve, &nn, sizeof( struct nbpnve ));
@@ -402,7 +404,7 @@ int nbp_packet( ap, from, data, len )
 
            if ( sendto( ap->ap_fd, data - len, len, 0, (struct sockaddr *)&sat,
                    sizeof( struct sockaddr_at )) < 0 ) {
-               syslog( LOG_ERR, "nbp brrq sendto: %m" );
+               syslog( LOG_ERR, "nbp brrq sendto: %s", strerror(errno) );
            }
 
            locallkup = 1;
@@ -468,8 +470,9 @@ Can't find route's interface!" );
                if ( sendto( ap->ap_fd, data - len, len, 0,
                        (struct sockaddr *)&sat,
                        sizeof( struct sockaddr_at )) < 0 ) {
-                   syslog( LOG_ERR, "nbp brrq sendto %u.%u: %m",
-                           ntohs( sat.sat_addr.s_net ), sat.sat_addr.s_node );
+                   syslog( LOG_ERR, "nbp brrq sendto %u.%u: %s",
+                           ntohs( sat.sat_addr.s_net ), sat.sat_addr.s_node,
+                           strerror(errno) );
                    continue;
                }
            }
@@ -489,8 +492,9 @@ Can't find route's interface!" );
            from->sat_addr.s_node = ATADDR_BCAST;
            if ( sendto( ap->ap_fd, data - len, len, 0, (struct sockaddr *)from,
                    sizeof( struct sockaddr_at )) < 0 ) {
-               syslog( LOG_ERR, "nbp fwd sendto %u.%u: %m",
-                       ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
+               syslog( LOG_ERR, "nbp fwd sendto %u.%u: %s",
+                       ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
+                       strerror(errno) );
                return 0;
            }
        }
@@ -564,9 +568,10 @@ Can't find route's interface!" );
                if ( sendto( ap->ap_fd, packet, cc, 0,
                        (struct sockaddr *)&nn.nn_sat,
                        sizeof( struct sockaddr_at )) < 0 ) {
-                   syslog( LOG_ERR, "nbp lkup sendto %u.%u: %m",
+                   syslog( LOG_ERR, "nbp lkup sendto %u.%u: %s",
                            ntohs( nn.nn_sat.sat_addr.s_net ),
-                           nn.nn_sat.sat_addr.s_node );
+                           nn.nn_sat.sat_addr.s_node,
+                           strerror(errno) );
                    return 0;
                }
 
@@ -626,9 +631,10 @@ Can't find route's interface!" );
            if ( sendto( ap->ap_fd, packet, cc, 0,
                    (struct sockaddr *)&nn.nn_sat,
                    sizeof( struct sockaddr_at )) < 0 ) {
-               syslog( LOG_ERR, "nbp lkup sendto %u.%u: %m",
+               syslog( LOG_ERR, "nbp lkup sendto %u.%u: %s",
                        ntohs( nn.nn_sat.sat_addr.s_net ),
-                       nn.nn_sat.sat_addr.s_node );
+                       nn.nn_sat.sat_addr.s_node,
+                       strerror(errno) );
                return 0;
            }
        }

diff --git a/etc/atalkd/rtmp.c b/etc/atalkd/rtmp.c
index 723a7021bb5f9b71d4ab1de48437a8275eb41611..c1a664a29be17b4f0a9399c281b07b938fa01e2a 100644 (file)
--- a/etc/atalkd/rtmp.c
+++ b/etc/atalkd/rtmp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rtmp.c,v 1.8 2001-08-15 01:39:39 srittau Exp $
+ * $Id: rtmp.c,v 1.8.2.1 2001-12-31 20:05:20 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -11,6 +11,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <sys/syslog.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -141,9 +142,10 @@ static int rtmp_config( rh, iface )
       return -1;
 
     if (cc) {
-       syslog( LOG_ERR, "rtmp_config: can't route %u.%u to loopback: %m",
+       syslog( LOG_ERR, "rtmp_config: can't route %u.%u to loopback: %s",
                ntohs( iface->i_addr.sat_addr.s_net ),
-               iface->i_addr.sat_addr.s_node );
+               iface->i_addr.sat_addr.s_node,
+               strerror(errno) );
     }
 
     syslog( LOG_INFO, "rtmp_config configured %s", iface->i_name );
@@ -463,7 +465,8 @@ int rtmp_packet( ap, from, data, len )
                } 
 
                if (cc)
-                 syslog( LOG_ERR, "rtmp_packet: can't remove loopback: %m" );
+                 syslog( LOG_ERR, "rtmp_packet: can't remove loopback: %s",
+                         strerror(errno) );
 
                iface->i_flags &= ~IFACE_NOROUTER;
                iface->i_time = 0;
@@ -562,7 +565,7 @@ int rtmp_packet( ap, from, data, len )
        }
        if ( !gate ) {  /* new gateway */
            if (( gate = (struct gate *)malloc( sizeof( struct gate ))) == 0 ) {
-               syslog( LOG_ERR, "rtmp_packet: malloc: %m" );
+               syslog( LOG_ERR, "rtmp_packet: malloc: %s", strerror(errno) );
                return -1;
            }
            gate->g_next = iface->i_gate;
@@ -701,7 +704,7 @@ int rtmp_packet( ap, from, data, len )
                        ntohs( rt.rt_net ));
            } else {            /* new for router */
                if (( rtmp = newrt(iface)) == NULL ) {
-                   syslog( LOG_ERR, "rtmp_packet: newrt: %m" );
+                   syslog( LOG_ERR, "rtmp_packet: newrt: %s", strerror(errno) );
                    return -1;
                }
                rtmp->rt_firstnet = rt.rt_net;
@@ -788,7 +791,7 @@ int rtmp_packet( ap, from, data, len )
            if ( sendto( ap->ap_fd, packet, data - packet, 0,
                    (struct sockaddr *)from,
                    sizeof( struct sockaddr_at )) < 0 ) {
-               syslog( LOG_ERR, "as_timer sendto: %m" );
+               syslog( LOG_ERR, "as_timer sendto: %s", strerror(errno) );
            }
        } else if ( *data == 2 || *data == 3 ) {
 #ifdef DEBUG
@@ -847,7 +850,7 @@ int rtmp_request( iface )
     sat.sat_port = ap->ap_port;
     if ( sendto( ap->ap_fd, packet, data - packet, 0, (struct sockaddr *)&sat,
            sizeof( struct sockaddr_at )) < 0 ) {
-       syslog( LOG_ERR, "rtmp_request sendto: %m" );
+       syslog( LOG_ERR, "rtmp_request sendto: %s", strerror(errno) );
        return -1;
     }
     return 0;
@@ -955,8 +958,9 @@ int gateroute( command, rtmp )
                    (struct sockaddr *) &dst,
                    (struct sockaddr *) &gate,
                    RTF_UP | RTF_GATEWAY )) {
-           syslog( LOG_ERR, "route: %u -> %u.%u: %m", net,
-                   ntohs( gate.sat_addr.s_net ), gate.sat_addr.s_node );
+           syslog( LOG_ERR, "route: %u -> %u.%u: %s", net,
+                   ntohs( gate.sat_addr.s_net ), gate.sat_addr.s_node,
+                   strerror(errno) );
            continue;
        }
 #else /* ! BSD4_4 */

diff --git a/etc/atalkd/zip.c b/etc/atalkd/zip.c
index 4d71b01101600970cd7f2aa0f83642ffac2c3a63..109e056c6967bf98b51a0f86c1cecefaac33b8b2 100644 (file)
--- a/etc/atalkd/zip.c
+++ b/etc/atalkd/zip.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zip.c,v 1.7 2001-08-15 01:39:39 srittau Exp $
+ * $Id: zip.c,v 1.7.2.1 2001-12-31 20:05:20 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -11,6 +11,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/syslog.h>
@@ -181,7 +182,8 @@ int zip_packet( ap, from, data, len )
                        if ( sendto( ap->ap_fd, packet, reply - packet, 0,
                                (struct sockaddr *)from,
                                sizeof( struct sockaddr_at )) < 0 ) {
-                           syslog( LOG_ERR, "zip reply sendto: %m" );
+                           syslog( LOG_ERR, "zip reply sendto: %s",
+                                   strerror(errno) );
                        }
 
                        reply = packet + 3;
@@ -200,7 +202,8 @@ int zip_packet( ap, from, data, len )
                                if ( sendto( ap->ap_fd, packet, reply - packet,
                                        0, (struct sockaddr *)from,
                                        sizeof( struct sockaddr_at )) < 0 ) {
-                                   syslog( LOG_ERR, "zip reply sendto: %m" );
+                                   syslog( LOG_ERR, "zip reply sendto: %s",
+                                           strerror(errno) );
                                }
 
                                reply = packet + 3;
@@ -221,7 +224,8 @@ int zip_packet( ap, from, data, len )
                            if ( sendto( ap->ap_fd, packet, reply - packet, 0,
                                    (struct sockaddr *)from,
                                    sizeof( struct sockaddr_at )) < 0 ) {
-                               syslog( LOG_ERR, "zip reply sendto: %m" );
+                               syslog( LOG_ERR, "zip reply sendto: %s",
+                                       strerror(errno) );
                            }
 
                            reply = packet + 3;
@@ -248,7 +252,8 @@ int zip_packet( ap, from, data, len )
                if ( sendto( ap->ap_fd, packet, reply - packet, 0,
                        (struct sockaddr *)from,
                        sizeof( struct sockaddr_at )) < 0 ) {
-                   syslog( LOG_ERR, "zip reply sendto: %m" );
+                   syslog( LOG_ERR, "zip reply sendto: %s",
+                           strerror(errno) );
                }
            }
            break;
@@ -598,8 +603,9 @@ int zip_packet( ap, from, data, len )
            if ( sendto( ap->ap_fd, packet, data - packet, 0,
                    (struct sockaddr *)from,
                    sizeof( struct sockaddr_at )) < 0 ) {
-               syslog( LOG_ERR, "zip gni sendto %u.%u: %m",
-                       ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
+               syslog( LOG_ERR, "zip gni sendto %u.%u: %s",
+                       ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
+                       strerror(errno) );
                return 1;
            }
            break;
@@ -722,9 +728,10 @@ int zip_packet( ap, from, data, len )
            /* add addr to loopback route */
            if ( looproute( iface, RTMP_ADD )) { /* -1 or 1 */
                syslog( LOG_ERR,
-                       "zip_packet: can't route %u.%u to loopback: %m",
+                       "zip_packet: can't route %u.%u to loopback: %s",
                        ntohs( iface->i_addr.sat_addr.s_net ),
-                       iface->i_addr.sat_addr.s_node );
+                       iface->i_addr.sat_addr.s_node,
+                       strerror(errno) );
                return -1;
            }
 
@@ -874,8 +881,9 @@ int zip_packet( ap, from, data, len )
            if ( sendto( ap->ap_fd, packet, data - packet, 0,
                    (struct sockaddr *)from,
                    sizeof( struct sockaddr_at )) < 0 ) {
-               syslog( LOG_ERR, "zip atp sendto %u.%u: %m",
-                       ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
+               syslog( LOG_ERR, "zip atp sendto %u.%u: %s",
+                       ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
+                       strerror(errno) );
                return 1;
            }
        }
@@ -941,7 +949,7 @@ int zip_getnetinfo( iface )
 
     if ( sendto( ap->ap_fd, packet, data - packet, 0, (struct sockaddr *)&sat,
            sizeof( struct sockaddr_at )) < 0 ) {
-       syslog( LOG_ERR, "zip_getnetinfo sendto: %m" );
+       syslog( LOG_ERR, "zip_getnetinfo sendto: %s", strerror(errno) );
        return -1;
     }
     return 0;
@@ -985,7 +993,7 @@ static int add_list( head, data )
        }
     }
     if (( l = (struct list *)malloc( sizeof( struct list ))) == NULL ) {
-       syslog( LOG_ERR, "add_list malloc: %m" );
+       syslog( LOG_ERR, "add_list malloc: %s", strerror(errno) );
        return -1;
     }
 
@@ -1020,7 +1028,7 @@ int addzone( rt, len, zone )
     }
     if ( zt == NULL ) {
        if (( zt = newzt( len, zone )) == NULL ) {
-           syslog( LOG_ERR, "addzone newzt: %m" );
+           syslog( LOG_ERR, "addzone newzt: %s", strerror(errno) );
            return -1;
        }
        if ( ziptab == NULL ) {

diff --git a/etc/psf/psf.c b/etc/psf/psf.c
index c29467b9e027bf7dc8985408a1df9165acaaba2c..c374f07fd6ef8e4dd1e617783a0922af3ac3b919 100644 (file)
--- a/etc/psf/psf.c
+++ b/etc/psf/psf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: psf.c,v 1.5 2001-09-06 19:04:40 rufustfirefly Exp $
+ * $Id: psf.c,v 1.5.2.1 2001-12-31 20:05:20 srittau Exp $
  *
  * Copyright (c) 1990,1995 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -48,6 +48,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <signal.h>
+#include <errno.h>
 
 /* Forward Declarations */
 int pexecv(char *path, char *argv[]);
@@ -183,7 +184,7 @@ int main( ac, av )
 
 restart:
     if (( inlen = read( 0, inbuf, sizeof( inbuf ))) < 0 ) {
-       syslog( LOG_ERR, "read: %m" );
+       syslog( LOG_ERR, "read: %s", strerror(errno) );
        exit( 1 );
     }
     if ( inlen == 0 ) {        /* nothing to be done */
@@ -201,7 +202,7 @@ restart:
        psaargv[ 2 ] = name;
        psaargv[ 3 ] = host;
        if (( c = pexecv( psapath, psaargv )) < 0 ) {
-           syslog( LOG_ERR, "%s: %m", psapath );
+           syslog( LOG_ERR, "%s: %s", psapath, strerror(errno) );
            exit( 2 );
        }
        children++;
@@ -258,7 +259,7 @@ restart:
        }
 
        if (( c = pexecv( pappath, papargv )) < 0 ) {
-           syslog( LOG_ERR, "%s: %m", pappath );
+           syslog( LOG_ERR, "%s: %s", pappath, strerror(errno) );
            exit( 2 );
        }
        children++;
@@ -271,7 +272,7 @@ restart:
      */
     if ( strstr( prog, "rev" ) != NULL ) {
        if (( c = pexecv( revpath, revargv )) < 0 ) {
-           syslog( LOG_ERR, "%s: %m", revpath );
+           syslog( LOG_ERR, "%s: %s", revpath, strerror(errno) );
            exit( 2 );
        }
        syslog( LOG_INFO, "sending to rev[%d]", c );
@@ -285,7 +286,7 @@ restart:
     if ( *prog != 'i' && *prog != 'o' && *( prog + 1 ) == 'f' ) {
        filtargv[ 0 ] = filtargv[ 1 ] = prog;
        if (( c = pexecv( _PATH_PSFILTER, filtargv )) < 0 ) {
-           syslog( LOG_ERR, "%s: %m", _PATH_PSFILTER );
+           syslog( LOG_ERR, "%s: %s", _PATH_PSFILTER, strerror(errno) );
            exit( 2 );
        }
        syslog( LOG_INFO, "external filter[%d]", c );
@@ -323,7 +324,7 @@ restart:
        }
 
        if (( c = pexecv( pappath, papargv )) < 0 ) {
-           syslog( LOG_ERR, "%s: %m", pappath );
+           syslog( LOG_ERR, "%s: %s", pappath, strerror(errno) );
            exit( 2 );
        }
        children++;
@@ -336,7 +337,7 @@ restart:
     }
     while ( children ) {
        if (( c = wait3( &status, 0, 0 )) < 0 ) {
-           syslog( LOG_ERR, "wait3: %m" );
+           syslog( LOG_ERR, "wait3: %s", strerror(errno) );
            exit( 1 );
        }
        if ( WIFEXITED( status )) {
@@ -395,7 +396,7 @@ notdone:
                    break;
                }
                if ( write( 1, "\031", 1 ) != 1 ) {
-                   syslog( LOG_ERR, "write: %m" );
+                   syslog( LOG_ERR, "write: %s", strerror(errno) );
                    return( 1 );
                }
                ctl = 0;
@@ -408,7 +409,7 @@ notdone:
        } else {
            if ( ctl == 1 ) {
                if ( write( 1, "\031", 1 ) != 1 ) {
-                   syslog( LOG_ERR, "write: %m" );
+                   syslog( LOG_ERR, "write: %s", strerror(errno) );
                    return( 1 );
                }
            }
@@ -423,7 +424,7 @@ notdone:
 
        inlen -= ctl;
        if (( inlen > 0 ) && ( write( 1, inbuf, inlen ) != inlen )) {
-           syslog( LOG_ERR, "write: %m" );
+           syslog( LOG_ERR, "write: %s", strerror(errno) );
            return( 1 );
        }
        if ( ctl == 2 ) {
@@ -444,13 +445,13 @@ notdone:
     }
 
     if ( inlen < 0 ) {
-       syslog( LOG_ERR, "read: %m" );
+       syslog( LOG_ERR, "read: %s", strerror(errno) );
        return( 1 );
     }
 
     if ( ctl == 1 ) {
        if ( write( 1, "\031", 1 ) != 1 ) {
-           syslog( LOG_ERR, "write: %m" );
+           syslog( LOG_ERR, "write: %s", strerror(errno) );
            return( 1 );
        }
     } else if ( ctl == 2 ) {
@@ -520,7 +521,7 @@ int textps()
                    /* output postscript prologue: */
                    if ( write( 1, pspro, sizeof( pspro ) - 1 ) !=
                            sizeof( pspro ) - 1 ) {
-                       syslog( LOG_ERR, "write prologue: %m" );
+                       syslog( LOG_ERR, "write prologue: %s", strerror(errno) );
                        return( 1 );
                    }
                    if ( name && host ) {
@@ -645,7 +646,7 @@ int textps()
        }
     } while (( inlen = read( 0, inbuf, sizeof( inbuf ))) > 0 );
     if ( inlen < 0 ) {
-       syslog( LOG_ERR, "read: %m" );
+       syslog( LOG_ERR, "read: %s", strerror(errno) );
        return( 1 );
     }
     rc = 0;

diff --git a/include/atalk/util.h b/include/atalk/util.h
index f6292d4df36f624b6e61d5bad98fbb3fa8f985db..4384ad896cce24af622a88d01e701995f9ab0f7a 100644 (file)
--- a/include/atalk/util.h
+++ b/include/atalk/util.h
@@ -1,5 +1,5 @@
 /*
- * $Id: util.h,v 1.5 2001-08-30 13:17:25 srittau Exp $
+ * $Id: util.h,v 1.5.2.1 2001-12-31 20:05:20 srittau Exp $
  */
 
 #ifndef _ATALK_UTIL_H
@@ -17,8 +17,8 @@ extern const int _diacasemap[], _dialowermap[];
 extern char **getifacelist(void);
 extern void freeifacelist(char **);
 
-#define diatolower(x)     _dialowermap[(x)]
-#define diatoupper(x)     _diacasemap[(x)]
+#define diatolower(x)     _dialowermap[(unsigned char) (x)]
+#define diatoupper(x)     _diacasemap[(unsigned char) (x)]
 extern int atalk_aton     __P((char *, struct at_addr *));
 extern void bprint        __P((char *, int));
 extern int strdiacasecmp  __P((const char *, const char *));