Warning fixes.

diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index 195ba5ebfb0722d53f73ffbe61ce526331a26011..17f1c0d90a546c3ac86fa002bb7aafdbc45190fd 100644 (file)
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -1,5 +1,5 @@
 /*
- * $Id: auth.c,v 1.17 2001-07-31 19:50:14 srittau Exp $
+ * $Id: auth.c,v 1.18 2001-08-15 01:37:34 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -11,6 +11,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
@@ -204,7 +205,7 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void))
 #ifdef RUN_AS_USER
       syslog(LOG_INFO, "running with uid %d", geteuid());
 #else /* RUN_AS_USER */
-      syslog(LOG_ERR, "login: %m");
+      syslog(LOG_ERR, "login: %s", strerror(errno));
       return AFPERR_BADUAM;
 #endif /* RUN_AS_USER */
 
@@ -213,7 +214,7 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void))
     /* Basically if the user is in the admin group, we stay root */
 
     if (( ngroups = getgroups( NGROUPS, groups )) < 0 ) {
-       syslog( LOG_ERR, "login: getgroups: %m" );
+       syslog( LOG_ERR, "login: getgroups: %s", strerror(errno) );
        return AFPERR_BADUAM;
     }
 #ifdef ADMIN_GRP
@@ -266,7 +267,7 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void))
     }
 #else /* TRU64 */
        if (setegid( pwd->pw_gid ) < 0 || seteuid( pwd->pw_uid ) < 0) {
-           syslog( LOG_ERR, "login: %m" );
+           syslog( LOG_ERR, "login: %s", strerror(errno) );
            return AFPERR_BADUAM;
        }
 #endif /* TRU64 */

diff --git a/etc/afpd/desktop.c b/etc/afpd/desktop.c
index acfe6197e00f1dd5ab74bb05bff3f7b5c68aac46..feeac1e1b992a89423fec8537e7fa7f3bfa32b43 100644 (file)
--- a/etc/afpd/desktop.c
+++ b/etc/afpd/desktop.c
@@ -1,5 +1,5 @@
 /*
- * $Id: desktop.c,v 1.5 2001-06-20 18:33:04 rufustfirefly Exp $
+ * $Id: desktop.c,v 1.6 2001-08-15 01:37:34 srittau Exp $
  *
  * See COPYRIGHT.
  */
@@ -106,7 +106,7 @@ static int iconopen( vol, creator, flags, mode )
            *adts = '/';
 
            if (( si.sdt_fd = open( dtf, flags, ad_mode( dtf, mode ))) < 0 ) {
-               syslog( LOG_ERR, "iconopen: open %s: %m", dtf );
+               syslog( LOG_ERR, "iconopen: open %s: %s", dtf, strerror(errno) );
                return -1;
            }
        } else {
@@ -171,7 +171,7 @@ int afp_addicon(obj, ibuf, ibuflen, rbuf, rbuflen)
     if (lseek( si.sdt_fd, (off_t) 0L, SEEK_SET ) < 0) {
         close(si.sdt_fd);
        si.sdt_fd = -1;
-       syslog( LOG_ERR, "afp_addicon: lseek: %m" );
+       syslog( LOG_ERR, "afp_addicon: lseek: %s", strerror(errno) );
        cc = AFPERR_PARAM;
        goto addicon_err;
     }
@@ -206,7 +206,7 @@ int afp_addicon(obj, ibuf, ibuflen, rbuf, rbuflen)
       }
 
       if ( lseek( si.sdt_fd, (off_t) rsize, SEEK_CUR ) < 0 ) {
-       syslog( LOG_ERR, "afp_addicon: lseek: %m" );
+       syslog( LOG_ERR, "afp_addicon: lseek: %s", strerror(errno) );
        cc = AFPERR_PARAM;
       }
     }
@@ -216,7 +216,7 @@ int afp_addicon(obj, ibuf, ibuflen, rbuf, rbuflen)
      */
 addicon_err:
     if ( cc < 0 ) {
-      syslog( LOG_ERR, "afp_addicon: %m" );
+      syslog( LOG_ERR, "afp_addicon: %s", strerror(errno) );
       if (obj->proto == AFPPROTO_DSI) {
        dsi_writeinit(obj->handle, rbuf, buflen);
        dsi_writeflush(obj->handle);
@@ -257,7 +257,7 @@ addicon_err:
       }
       
       if ( writev( si.sdt_fd, iov, iovcnt ) < 0 ) {
-       syslog( LOG_ERR, "afp_addicon: writev: %m" );
+       syslog( LOG_ERR, "afp_addicon: writev: %s", strerror(errno) );
        return( AFPERR_PARAM );
       }
       break;
@@ -270,13 +270,13 @@ addicon_err:
 
        /* add headers at end of file */
        if ((cc == 0) && (write(si.sdt_fd, imh, sizeof(imh)) < 0)) {
-         syslog(LOG_ERR, "afp_addicon: write: %m");
+         syslog(LOG_ERR, "afp_addicon: write: %s", strerror(errno));
          dsi_writeflush(dsi);
          return AFPERR_PARAM;
        }
        
        if ((cc = write(si.sdt_fd, rbuf, iovcnt)) < 0) {
-         syslog(LOG_ERR, "afp_addicon: write: %m");
+         syslog(LOG_ERR, "afp_addicon: write: %s", strerror(errno));
          dsi_writeflush(dsi);
          return AFPERR_PARAM;
        }
@@ -288,7 +288,7 @@ addicon_err:
          }
          
          if ((cc = write(si.sdt_fd, rbuf, iovcnt)) < 0) {
-           syslog(LOG_ERR, "afp_addicon: write: %m");
+           syslog(LOG_ERR, "afp_addicon: write: %s", strerror(errno));
            dsi_writeflush(dsi);
            return AFPERR_PARAM;
          }
@@ -402,7 +402,7 @@ int afp_geticoninfo(obj, ibuf, ibuflen, rbuf, rbuflen )
        memcpy( &bsize, ih + 10, sizeof( bsize ));
        bsize = ntohs(bsize);
        if ( lseek( si.sdt_fd, (off_t) bsize, SEEK_CUR ) < 0 ) {
-           syslog( LOG_ERR, "afp_iconinfo: lseek: %m" );
+           syslog( LOG_ERR, "afp_iconinfo: lseek: %s", strerror(errno) );
            return( AFPERR_PARAM );
        }
        if ( si.sdt_index == iindex ) {
@@ -461,7 +461,7 @@ int afp_geticon(obj, ibuf, ibuflen, rbuf, rbuflen )
     if ( lseek( si.sdt_fd, (off_t) 0L, SEEK_SET ) < 0 ) {
        close(si.sdt_fd);
        si.sdt_fd = -1;
-       syslog(LOG_ERR, "afp_geticon: lseek: %m");
+       syslog(LOG_ERR, "afp_geticon: lseek: %s", strerror(errno));
        return( AFPERR_PARAM );
     }
 
@@ -477,14 +477,14 @@ int afp_geticon(obj, ibuf, ibuflen, rbuf, rbuflen )
        memcpy( &rsize, ih + 10, sizeof( rsize ));
        rsize = ntohs( rsize );
        if ( lseek( si.sdt_fd, (off_t) rsize, SEEK_CUR ) < 0 ) {
-           syslog( LOG_ERR, "afp_geticon: lseek: %m" );
+           syslog( LOG_ERR, "afp_geticon: lseek: %s", strerror(errno) );
            return( AFPERR_PARAM );
        }
        offset += rsize;
     }
 
     if ( rc < 0 ) {
-        syslog(LOG_ERR, "afp_geticon: read: %m");
+        syslog(LOG_ERR, "afp_geticon: read: %s", strerror(errno));
        return( AFPERR_PARAM );
     }
 
@@ -551,7 +551,7 @@ geticon_done:
       return AFP_OK;
       
 geticon_exit:
-      syslog(LOG_INFO, "afp_geticon: %m");
+      syslog(LOG_INFO, "afp_geticon: %s", strerror(errno));
       dsi_readdone(dsi);
       obj->exit(1);
       return AFP_OK;
@@ -603,9 +603,9 @@ char *dtfile(const struct vol *vol, u_char creator[], char *ext )
 
 char *mtoupath(const struct vol *vol, char *mpath)
 {
-    static unsigned char upath[ MAXPATHLEN + 1];
-    unsigned char *m, *u;
-    int                i = 0;
+    static char         upath[ MAXPATHLEN + 1];
+    char       *m, *u;
+    int                 i = 0;
 
     if ( *mpath == '\0' ) {
        return( "." );
@@ -623,7 +623,7 @@ char *mtoupath(const struct vol *vol, char *mpath)
        /* we have a code page. we only use the ascii range
         * if we have map ascii specified. */
 #if 1
-       if (vol->v_mtoupage && ((*m > 0x7F) ||
+       if (vol->v_mtoupage && ((*m & 0x80) ||
                                vol->v_flags & AFPVOL_MAPASCII)) {
            *u = vol->v_mtoupage->map[*m].value;
        } else
@@ -660,8 +660,8 @@ char *mtoupath(const struct vol *vol, char *mpath)
 char *utompath(const struct vol *vol, char *upath)
 {
     static unsigned char mpath[ MAXPATHLEN + 1];
-    unsigned char      *m, *u;
-    int                h;
+    char               *m, *u;
+    int                         h;
 
     /* do the hex conversion */
     u = upath;

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index fe780eabf575f44dd3cdff59ee8a2d0291d9e6cf..b51f7296a226d248e751987c67a636d05ba06a16 100644 (file)
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.c,v 1.15 2001-08-15 01:21:01 samnoble Exp $
+ * $Id: directory.c,v 1.16 2001-08-15 01:37:34 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -805,14 +805,10 @@ int movecwd( vol, dir)
     return( 0 );
 }
 
-int getdirparams(vol, bitmap, upath, dir, st, buf, buflen )
-    const struct vol          *vol;
-    u_int16_t          bitmap;
-    char               *upath;
-    struct dir         *dir;
-    struct stat                *st;
-    char               *buf;
-    int                        *buflen;
+int getdirparams(const struct vol *vol,
+                u_int16_t bitmap,
+                char *upath, struct dir *dir, struct stat *st,
+                char *buf, int *buflen )
 {
     struct maccess     ma;
     struct adouble     ad;
@@ -1076,10 +1072,8 @@ int afp_setdirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
     return( rc );
 }
 
-int setdirparams(vol, path, bitmap, buf )
-    const struct vol          *vol;
-    char               *path, *buf;
-    u_int16_t          bitmap;
+int setdirparams(const struct vol *vol,
+                char *path, u_int16_t bitmap, char *buf )
 {
     struct maccess     ma;
     struct adouble     ad;
@@ -1213,7 +1207,8 @@ int setdirparams(vol, path, bitmap, buf )
                    goto setdirparam_done;
                    break;
                default :
-                   syslog( LOG_ERR, "setdirparam: setdeskowner: %m" );
+                   syslog( LOG_ERR, "setdirparam: setdeskowner: %s",
+                           strerror(errno) );
                    if (!isad) {
                    err = AFPERR_PARAM;
                    goto setdirparam_done;
@@ -1233,7 +1228,8 @@ int setdirparams(vol, path, bitmap, buf )
                    goto setdirparam_done;
                    break;
                default :
-                   syslog( LOG_ERR, "setdirparam: setdirowner: %m" );
+                   syslog( LOG_ERR, "setdirparam: setdirowner: %s",
+                           strerror(errno) );
                    break;
                }
            }
@@ -1277,7 +1273,8 @@ int setdirparams(vol, path, bitmap, buf )
                    goto setdirparam_done;
                    break;
                default :
-                   syslog( LOG_ERR, "setdirparam: setdirowner: %m" );
+                   syslog( LOG_ERR, "setdirparam: setdirowner: %s",
+                           strerror(errno) );
                    break;
                }
            }
@@ -1301,7 +1298,8 @@ int setdirparams(vol, path, bitmap, buf )
                    err = AFPERR_VLOCK;
                    goto setdirparam_done;
                default :
-                   syslog( LOG_ERR, "setdirparam: setdeskmode: %m" );
+                   syslog( LOG_ERR, "setdirparam: setdeskmode: %s",
+                           strerror(errno) );
                    break;
                    err = AFPERR_PARAM;
                    goto setdirparam_done;
@@ -1320,7 +1318,8 @@ int setdirparams(vol, path, bitmap, buf )
                    err = AFPERR_VLOCK;
                    goto setdirparam_done;
                default :
-                   syslog( LOG_ERR, "setdirparam: setdirmode: %m" );
+                   syslog( LOG_ERR, "setdirparam: setdirmode: %s",
+                           strerror(errno) );
                    err = AFPERR_PARAM;
                    goto setdirparam_done;
                }
@@ -1546,7 +1545,7 @@ int renamedir(src, dst, dir, newparent, newname, noadouble)
 
 renamedir_done:
     if ((buf = (char *) realloc( dir->d_name, len + 1 )) == NULL ) {
-       syslog( LOG_ERR, "renamedir: realloc: %m" );
+       syslog( LOG_ERR, "renamedir: realloc: %s", strerror(errno) );
        return AFPERR_MISC;
     }
     dir->d_name = buf;

diff --git a/etc/afpd/enumerate.c b/etc/afpd/enumerate.c
index 90137c38cdb768e410664da7980a4a9a413275af..de5873aede2b7717c8bc9e443a87e42bd3094e77 100644 (file)
--- a/etc/afpd/enumerate.c
+++ b/etc/afpd/enumerate.c
@@ -1,5 +1,5 @@
 /*
- * $Id: enumerate.c,v 1.6 2001-08-14 14:00:10 rufustfirefly Exp $
+ * $Id: enumerate.c,v 1.7 2001-08-15 01:37:34 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -56,7 +56,7 @@ adddir( vol, dir, name, namlen, upath, upathlen, st )
 #endif /* USE_LASTDID */
 
     if ((cdir = dirnew(namlen + 1)) == NULL) {
-       syslog( LOG_ERR, "adddir: malloc: %m" );
+       syslog( LOG_ERR, "adddir: malloc: %s", strerror(errno) );
        return NULL;
     }
     strcpy( cdir->d_name, name );
@@ -158,7 +158,7 @@ int afp_enumerate(obj, ibuf, ibuflen, rbuf, rbuflen )
 
     if ( sd.sd_buflen == 0 ) {
        if (( sd.sd_buf = (char *)malloc( SDBUFBRK )) == NULL ) {
-           syslog( LOG_ERR, "afp_enumerate: malloc: %m" );
+           syslog( LOG_ERR, "afp_enumerate: malloc: %s", strerror(errno) );
            *rbuflen = 0;
            return AFPERR_MISC;
        }
@@ -253,7 +253,8 @@ int afp_enumerate(obj, ibuf, ibuflen, rbuf, rbuflen )
                start = sd.sd_buf;
                if ((buf = (char *) realloc( sd.sd_buf, sd.sd_buflen + 
                                             SDBUFBRK )) == NULL ) {
-                   syslog( LOG_ERR, "afp_enumerate: realloc: %m" );
+                   syslog( LOG_ERR, "afp_enumerate: realloc: %s",
+                           strerror(errno) );
                    closedir(dp);
                    *rbuflen = 0;
                    return AFPERR_MISC;
@@ -311,7 +312,8 @@ int afp_enumerate(obj, ibuf, ibuflen, rbuf, rbuflen )
        sd.sd_last++;
 
        if ( stat( sd.sd_last, &st ) < 0 ) {
-           syslog( LOG_DEBUG, "afp_enumerate: stat %s: %m", sd.sd_last );
+           syslog( LOG_DEBUG, "afp_enumerate: stat %s: %s",
+                   sd.sd_last, strerror(errno) );
            sd.sd_last += len + 1;
            continue;
        }

diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index 8de41ace41e06353d337308c88cf63a66d155087..2a3c83a2e87b9a6fccb243dde46bb1a31175b544 100644 (file)
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.25 2001-08-14 14:00:10 rufustfirefly Exp $
+ * $Id: file.c,v 1.26 2001-08-15 01:37:34 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -80,14 +80,10 @@ const u_char ufinderi[] = {
     0, 0, 0, 0, 0, 0, 0, 0
 };
 
-int getfilparams(vol, bitmap, path, dir, st, buf, buflen )
-    struct vol  *vol;
-    u_int16_t  bitmap;
-    char       *path;
-    struct dir *dir;
-    struct stat        *st;
-    char       *buf;
-    int                *buflen;
+int getfilparams(struct vol *vol,
+                u_int16_t bitmap,
+                char *path, struct dir *dir, struct stat *st,
+                char *buf, int *buflen )
 {
 #ifndef USE_LASTDID
     struct stat                hst, lst, *lstp;
@@ -98,7 +94,8 @@ int getfilparams(vol, bitmap, path, dir, st, buf, buflen )
     struct ofork        *of;
     struct extmap      *em;
     char               *data, *nameoff = NULL, *upath;
-    int                        bit = 0, isad = 1, aint;
+    int                        bit = 0, isad = 1;
+    u_int32_t          aint;
     u_int16_t          ashort;
     u_char              achar, fdType[4];
 
@@ -117,7 +114,7 @@ int getfilparams(vol, bitmap, path, dir, st, buf, buflen )
     if ( ad_open( upath, ADFLAGS_HF, O_RDONLY, 0, adp) < 0 ) {
        isad = 0;
     } else if ( fstat( ad_hfileno( adp ), &hst ) < 0 ) {
-           syslog( LOG_ERR, "getfilparams fstat: %m" );
+           syslog( LOG_ERR, "getfilparams fstat: %s", strerror(errno) );
     }
 
     data = buf;
@@ -557,10 +554,8 @@ int afp_setfilparams(obj, ibuf, ibuflen, rbuf, rbuflen )
 }
 
 
-int setfilparams(vol, path, bitmap, buf )
-    struct vol  *vol;
-    char       *path, *buf;
-    u_int16_t  bitmap;
+int setfilparams(struct vol *vol,
+                char *path, u_int16_t bitmap, char *buf )
 {
     struct adouble     ad, *adp;
     struct ofork        *of;

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index 5d5e0b24d8e9ac0408ff0d1564eb7e21bdb0f40f..a1b9c1adf8f026e1c4ba236e46def289b8229285 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: filedir.c,v 1.11 2001-08-14 14:00:10 rufustfirefly Exp $
+ * $Id: filedir.c,v 1.12 2001-08-15 01:37:34 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -60,7 +60,7 @@ int matchfile2dirperms(upath, vol, did)
 #endif /* DEBUG */
 
     if (stat(upath, &st ) < 0)
-      syslog(LOG_ERR, "Could not stat %s: %m", upath);
+      syslog(LOG_ERR, "Could not stat %s: %s", upath, strerror(errno));
     strcpy (adpath, "./.AppleDouble/");
     strcat (adpath, upath);
     if (( dir = dirsearch( vol, did )) == NULL ) {
@@ -69,8 +69,8 @@ int matchfile2dirperms(upath, vol, did)
     }
     else if (stat(".", &sb) < 0) {
         syslog (LOG_ERR, 
-          "matchfile2dirperms: Error checking directory \"%s\": %m", 
-          dir->d_name);
+          "matchfile2dirperms: Error checking directory \"%s\": %s", 
+          dir->d_name, strerror(errno));
         return(AFPERR_NOOBJ );
       }
     else {
@@ -81,37 +81,42 @@ int matchfile2dirperms(upath, vol, did)
          if (lchown(upath, sb.st_uid, sb.st_gid) < 0)
           {
             syslog (LOG_ERR, 
-             "matchfile2dirperms: Error changing owner/gid of %s: %m", upath);
+             "matchfile2dirperms: Error changing owner/gid of %s: %s",
+                   upath, strerror(errno));
             return (AFPERR_ACCESS);
           }
           if (chmod(upath,(st.st_mode&0x0FFFF)| S_IRGRP| S_IROTH) < 0)
           {
             syslog (LOG_ERR, 
-             "matchfile2dirperms:  Error adding file read permissions: %m");
+             "matchfile2dirperms:  Error adding file read permissions: %s",
+                   strerror(errno));
             return (AFPERR_ACCESS);
           }
 #ifdef DEBUG
           else 
            syslog (LOG_INFO, 
-             "matchfile2dirperms:  Added S_IRGRP and S_IROTH: %m");
+             "matchfile2dirperms:  Added S_IRGRP and S_IROTH: %s",
+                   strerror(errno));
 #endif /* DEBUG */
           if (lchown(adpath, sb.st_uid, sb.st_gid) < 0)
           {
            syslog (LOG_ERR, 
-             "matchfile2dirperms: Error changing AppleDouble owner/gid %s: %m",
-             adpath);
+             "matchfile2dirperms: Error changing AppleDouble owner/gid %s: %s",
+             adpath, strerror(errno));
             return (AFPERR_ACCESS);
          }
           if (chmod(adpath, (st.st_mode&0x0FFFF)| S_IRGRP| S_IROTH) < 0)
           {
             syslog (LOG_ERR, 
-             "matchfile2dirperms:  Error adding AD file read permissions: %m");
+             "matchfile2dirperms:  Error adding AD file read permissions: %s",
+                   strerror(errno));
             return (AFPERR_ACCESS);
           }
 #ifdef DEBUG
           else 
            syslog (LOG_INFO, 
-             "matchfile2dirperms:  Added S_IRGRP and S_IROTH to AD: %m");
+             "matchfile2dirperms:  Added S_IRGRP and S_IROTH to AD: %s",
+                   strerror(errno));
 #endif /* DEBUG */
        }
 #ifdef DEBUG
@@ -180,12 +185,14 @@ int afp_getfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
 
     buflen = 0;
     if (S_ISDIR(st.st_mode)) {
-       if (dbitmap && ( ret = getdirparams(vol, dbitmap, ".", curdir,
-               &st, rbuf + 3 * sizeof( u_int16_t ), &buflen )) != AFP_OK ) {
-           return( ret );
+       if (dbitmap) {
+           ret = getdirparams(vol, dbitmap, ".", curdir,
+                              &st, rbuf + 3 * sizeof( u_int16_t ), &buflen );
+           if (ret != AFP_OK )
+               return( ret );
        }
         /* this is a directory */
-       *(rbuf + 2 * sizeof( u_int16_t )) = FILDIRBIT_ISDIR; 
+       *(rbuf + 2 * sizeof( u_int16_t )) = (char) FILDIRBIT_ISDIR; 
     } else {
        if (fbitmap && ( ret = getfilparams(vol, fbitmap, path, curdir, &st,
                rbuf + 3 * sizeof( u_int16_t ), &buflen )) != AFP_OK ) {
@@ -427,7 +434,7 @@ int afp_rename(obj, ibuf, ibuflen, rbuf, rbuflen )
            isad = 0;
        }
        if ((buf = realloc( odir->d_name, plen + 1 )) == NULL ) {
-           syslog( LOG_ERR, "afp_rename: realloc: %m" );
+           syslog( LOG_ERR, "afp_rename: realloc: %s", strerror(errno) );
            if (isad) {
              ad_flush(&ad, ADFLAGS_HF); /* in case of create */
              ad_close(&ad, ADFLAGS_HF);

diff --git a/etc/afpd/fork.c b/etc/afpd/fork.c
index b14499fb57ad9ced461888486ac15385e26f595a..67446661b6a7d6f6605b8cc4d18889104e6148db 100644 (file)
--- a/etc/afpd/fork.c
+++ b/etc/afpd/fork.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fork.c,v 1.6 2001-08-14 14:00:10 rufustfirefly Exp $
+ * $Id: fork.c,v 1.7 2001-08-15 01:37:34 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -70,7 +70,7 @@ static int getforkparams(ofork, bitmap, buf, buflen, attrbits )
     } else {
        aint = ad_getentrylen( ofork->of_ad, ADEID_RFORK );
        if ( ad_refresh( ofork->of_ad ) < 0 ) {
-           syslog( LOG_ERR, "getforkparams: ad_refresh: %m");
+           syslog( LOG_ERR, "getforkparams: ad_refresh: %s", strerror(errno) );
            return( AFPERR_PARAM );
        }
        /* See afp_closefork() for why this is bad */
@@ -373,7 +373,7 @@ int afp_openfork(obj, ibuf, ibuflen, rbuf, rbuflen )
         goto openfork_err;
         break;
        default:
-        syslog( LOG_ERR, "afp_openfork: ad_open: %m" );
+        syslog( LOG_ERR, "afp_openfork: ad_open: %s", strerror(errno) );
         ret = AFPERR_PARAM;
         goto openfork_err;
         break;
@@ -468,7 +468,7 @@ int afp_openfork(obj, ibuf, ibuflen, rbuf, rbuflen )
          break;
        default:
          *rbuflen = 0;
-         syslog( LOG_ERR, "afp_openfork: ad_lock: %m" );
+         syslog( LOG_ERR, "afp_openfork: ad_lock: %s", strerror(errno) );
          return( AFPERR_PARAM );
        }
       }
@@ -505,7 +505,7 @@ int afp_setforkparams(obj, ibuf, ibuflen, rbuf, rbuflen )
 
     *rbuflen = 0;
     if (( ofork = of_find( ofrefnum )) == NULL ) {
-       syslog( LOG_ERR, "afp_setforkparams: of_find: %m" );
+       syslog( LOG_ERR, "afp_setforkparams: of_find: %s", strerror(errno) );
        return( AFPERR_PARAM );
     }
 
@@ -530,7 +530,8 @@ int afp_setforkparams(obj, ibuf, ibuflen, rbuf, rbuflen )
          goto afp_setfork_err;
        
        if (ad_flush( ofork->of_ad, ADFLAGS_HF ) < 0) {
-           syslog( LOG_ERR, "afp_setforkparams: ad_flush: %m" );
+           syslog( LOG_ERR, "afp_setforkparams: ad_flush: %s",
+                   strerror(errno) );
            return( AFPERR_PARAM );
        }
     } else
@@ -593,7 +594,7 @@ int afp_bytelock(obj, ibuf, ibuflen, rbuf, rbuflen )
     ibuf += sizeof(ofrefnum);
 
     if (( ofork = of_find( ofrefnum )) == NULL ) {
-       syslog( LOG_ERR, "afp_bytelock: of_find: %m" );
+       syslog( LOG_ERR, "afp_bytelock: of_find: %s", strerror(errno) );
        return( AFPERR_PARAM );
     }
 
@@ -693,7 +694,7 @@ static __inline__ ssize_t read_file(struct ofork *ofork, int eid,
 
     cc = ad_read(ofork->of_ad, eid, offset, rbuf, *rbuflen);
     if ( cc < 0 ) {
-       syslog( LOG_ERR, "afp_read: ad_read: %m" );
+       syslog( LOG_ERR, "afp_read: ad_read: %s", strerror(errno) );
        *rbuflen = 0;
        return( AFPERR_PARAM );
     }
@@ -754,7 +755,7 @@ int afp_read(obj, ibuf, ibuflen, rbuf, rbuflen)
     ibuf += sizeof( u_short );
 
     if (( ofork = of_find( ofrefnum )) == NULL ) {
-       syslog( LOG_ERR, "afp_read: of_find: %m" );
+       syslog( LOG_ERR, "afp_read: of_find: %s", strerror(errno) );
        err = AFPERR_PARAM;
        goto afp_read_err;
     }
@@ -852,7 +853,7 @@ int afp_read(obj, ibuf, ibuflen, rbuf, rbuflen)
          if (errno == EINVAL)
            goto afp_read_loop;
          else {
-           syslog(LOG_ERR, "afp_read: ad_readfile: %m");
+           syslog(LOG_ERR, "afp_read: ad_readfile: %s", strerror(errno));
            goto afp_read_exit;
          }
        }
@@ -887,7 +888,7 @@ afp_read_loop:
       goto afp_read_done;
 
 afp_read_exit:
-      syslog(LOG_ERR, "afp_read: %m");
+      syslog(LOG_ERR, "afp_read: %s", strerror(errno));
       dsi_readdone(dsi);
       ad_tmplock(ofork->of_ad, eid, ADLOCK_CLR, saveoff, reqcount);
       obj->exit(1);
@@ -935,12 +936,12 @@ int afp_flushfork(obj, ibuf, ibuflen, rbuf, rbuflen )
     memcpy(&ofrefnum, ibuf, sizeof( ofrefnum ));
 
     if (( ofork = of_find( ofrefnum )) == NULL ) {
-       syslog( LOG_ERR, "afp_flushfork: of_find: %m" );
+       syslog( LOG_ERR, "afp_flushfork: of_find: %s", strerror(errno) );
        return( AFPERR_PARAM );
     }
 
     if ( flushfork( ofork ) < 0 ) {
-       syslog( LOG_ERR, "afp_flushfork: %m" );
+       syslog( LOG_ERR, "afp_flushfork: %s", strerror(errno) );
     }
 
     return( AFP_OK );
@@ -955,8 +956,8 @@ int flushfork( ofork )
 
     if ( ad_dfileno( ofork->of_ad ) != -1 &&
            fsync( ad_dfileno( ofork->of_ad )) < 0 ) {
-       syslog( LOG_ERR, "flushfork: dfile(%d) %m", 
-               ad_dfileno(ofork->of_ad) );
+       syslog( LOG_ERR, "flushfork: dfile(%d) %s", 
+               ad_dfileno(ofork->of_ad), strerror(errno) );
        err = -1;
     }
 

diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index 434ca5ad173fc58f78e4dc50117975cba36d16d2..65a6162e63398be46b26e5ed2b4686fcce3b72c1 100644 (file)
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.10 2001-06-25 15:18:01 rufustfirefly Exp $
+ * $Id: main.c,v 1.11 2001-08-15 01:37:34 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -180,7 +180,7 @@ int main( ac, av )
      * XXX: this should really be setup after the initial connections. */
     if (!(server_children = server_child_alloc(default_options.connections,
                                               CHILD_NFORKS))) {
-      syslog(LOG_ERR, "main: server_child alloc: %m");
+      syslog( LOG_ERR, "main: server_child alloc: %s", strerror(errno) );
       afp_exit(1);
     }
       
@@ -189,7 +189,7 @@ int main( ac, av )
     sigemptyset( &sv.sa_mask );
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGCHLD, &sv, 0 ) < 0 ) {
-       syslog( LOG_ERR, "main: sigaction: %m" );
+       syslog( LOG_ERR, "main: sigaction: %s", strerror(errno) );
        afp_exit(1);
     }
 
@@ -199,11 +199,11 @@ int main( ac, av )
     sigaddset(&sv.sa_mask, SIGTERM);
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGHUP, &sv, 0 ) < 0 ) {
-       syslog( LOG_ERR, "main: sigaction: %m" );
+       syslog( LOG_ERR, "main: sigaction: %s", strerror(errno) );
        afp_exit(1);
     }
     if ( sigaction( SIGTERM, &sv, 0 ) < 0 ) {
-       syslog( LOG_ERR, "main: sigaction: %m" );
+       syslog( LOG_ERR, "main: sigaction: %s", strerror(errno) );
        afp_exit(1);
     }
     
@@ -220,7 +220,7 @@ int main( ac, av )
     sigaddset(&sigs, SIGTERM);
     sigprocmask(SIG_BLOCK, &sigs, NULL);
     if (!(configs = configinit(&default_options))) {
-      syslog(LOG_ERR, "main: no servers configured: %m\n");
+      syslog(LOG_ERR, "main: no servers configured: %s\n", strerror(errno));
       afp_exit(1);
     }
     sigprocmask(SIG_UNBLOCK, &sigs, NULL);
@@ -244,7 +244,7 @@ int main( ac, av )
       if (select(FD_SETSIZE, &rfds, NULL, NULL, NULL) < 0) {
        if (errno == EINTR)
          continue;
-       syslog(LOG_ERR, "main: can't wait for input: %m");
+       syslog(LOG_ERR, "main: can't wait for input: %s", strerror(errno));
        break;
       }
       

diff --git a/etc/afpd/ofork.c b/etc/afpd/ofork.c
index cb4072e0819e01773956b5d042138e550bf40075..82c6c9f4e63e7516b6f15dce23614e766336c9af 100644 (file)
--- a/etc/afpd/ofork.c
+++ b/etc/afpd/ofork.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ofork.c,v 1.4 2001-06-20 18:33:04 rufustfirefly Exp $
+ * $Id: ofork.c,v 1.5 2001-08-15 01:37:34 srittau Exp $
  *
  * Copyright (c) 1996 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -15,6 +15,7 @@
 #include <sys/stat.h> /* works around a bug */
 #include <sys/param.h>
 #include <syslog.h>
+#include <errno.h>
 
 #include <atalk/adouble.h>
 
@@ -89,7 +90,7 @@ int of_flush(const struct vol *vol)
     for ( refnum = 0; refnum < nforks; refnum++ ) {
        if (oforks[ refnum ] != NULL && (oforks[refnum]->of_vol == vol) &&
             flushfork( oforks[ refnum ] ) < 0 ) {
-           syslog( LOG_ERR, "of_flush: %m" );
+           syslog( LOG_ERR, "of_flush: %s", strerror(errno) );
        }
     }
     return( 0 );
@@ -164,7 +165,7 @@ of_alloc(vol, dir, path, ofrefnum, eid, ad)
     of_refnum = refnum % nforks;
     if (( oforks[ of_refnum ] =
            (struct ofork *)malloc( sizeof( struct ofork ))) == NULL ) {
-       syslog( LOG_ERR, "of_alloc: malloc: %m" );
+       syslog( LOG_ERR, "of_alloc: malloc: %s", strerror(errno) );
        return NULL;
     }
     of = oforks[of_refnum];
@@ -173,7 +174,7 @@ of_alloc(vol, dir, path, ofrefnum, eid, ad)
     if (!ad) {
         ad = malloc( sizeof( struct adouble ) );
         if (!ad) {
-            syslog( LOG_ERR, "of_alloc: malloc: %m" );
+            syslog( LOG_ERR, "of_alloc: malloc: %s", strerror(errno) );
             return NULL;
         }
 
@@ -206,7 +207,7 @@ of_alloc(vol, dir, path, ofrefnum, eid, ad)
      * of long unicode names */
     if (( of->of_name =(char *)malloc(MACFILELEN + 1)) ==
        NULL ) {
-       syslog( LOG_ERR, "of_alloc: malloc: %m" );
+       syslog( LOG_ERR, "of_alloc: malloc: %s", strerror(errno) );
        if (!ad)
          free(of->of_ad);
        free(of);

diff --git a/etc/afpd/status.c b/etc/afpd/status.c
index 19934b67f2efcf14de0d90517fd18ac7532c3586..b222f509810870b1dee300a5853e0434adf3eaf5 100644 (file)
--- a/etc/afpd/status.c
+++ b/etc/afpd/status.c
@@ -1,5 +1,5 @@
 /*
- * $Id: status.c,v 1.3 2001-06-20 18:33:04 rufustfirefly Exp $
+ * $Id: status.c,v 1.4 2001-08-15 01:37:34 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -274,8 +274,8 @@ static void status_icon(char *data, const char *icondata,
       memcpy(sigdata, &ret, sizeof(ret));
 }
 
-const void status_init(AFPConfig *aspconfig, AFPConfig *dsiconfig,
-                       const struct afp_options *options)
+void status_init(AFPConfig *aspconfig, AFPConfig *dsiconfig,
+                const struct afp_options *options)
 {
   ASP asp;
   DSI *dsi;

diff --git a/etc/afpd/status.h b/etc/afpd/status.h
index 3a51a57ddc825a58053bbf8074600a11313d37e9..a0b5282e0b7bea974cdd3e06780cb8170d1e6c43 100644 (file)
--- a/etc/afpd/status.h
+++ b/etc/afpd/status.h
@@ -1,5 +1,5 @@
 /*
- * $Id: status.h,v 1.3 2001-06-20 18:33:04 rufustfirefly Exp $
+ * $Id: status.h,v 1.4 2001-08-15 01:37:34 srittau Exp $
  */
 
 #ifndef AFPD_STATUS_H
@@ -29,8 +29,8 @@
 
 extern void status_versions __P((char * /*status*/));
 extern void status_uams __P((char * /*status*/, const char * /*authlist*/));
-extern const void status_init __P((AFPConfig *, AFPConfig *,
-                                  const struct afp_options *));
+extern void status_init __P((AFPConfig *, AFPConfig *,
+                            const struct afp_options *));
 extern int      afp_getsrvrinfo __P((AFPObj *, char *, int, char *, int *));
 
 #endif

diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c
index 8c1029b705bc6c8e0b7802994825bd696583d45b..60b52d294707d152122b12683e52a467fad226a0 100644 (file)
--- a/etc/afpd/unix.c
+++ b/etc/afpd/unix.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unix.c,v 1.19 2001-07-31 19:50:14 srittau Exp $
+ * $Id: unix.c,v 1.20 2001-08-15 01:37:34 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -242,7 +243,8 @@ inline int stickydirmode(name, mode, dropbox)
    } else { /* end if S_IWOTH and not S_IROTH */
 #endif /* DROPKLUDGE */
        if ( (retval=chmod( name, DIRBITS | mode )) < 0 )  {
-          syslog( LOG_ERR, "stickydirmode: chmod \"%s\": %m", name );
+          syslog( LOG_ERR, "stickydirmode: chmod \"%s\": %s",
+                 name, strerror(errno) );
        }
 #ifdef DROPKLUDGE
      } /* end if not mode */
@@ -268,7 +270,7 @@ int setdeskmode( mode )
     }
     if (( desk = opendir( "." )) == NULL ) {
        if ( chdir( wd ) < 0 ) {
-           syslog( LOG_ERR, "setdeskmode: chdir %s: %m", wd );
+           syslog( LOG_ERR, "setdeskmode: chdir %s: %s", wd, strerror(errno) );
        }
        return( -1 );
     }
@@ -292,33 +294,37 @@ int setdeskmode( mode )
            strcat( modbuf, subp->d_name );
            /* XXX: need to preserve special modes */
            if (stat(modbuf, &st) < 0) {
-               syslog( LOG_ERR, "setdeskmode: stat %s: %m", modbuf );
+               syslog( LOG_ERR, "setdeskmode: stat %s: %s",
+                       modbuf, strerror(errno) );
                continue;
            }       
 
            if (S_ISDIR(st.st_mode)) {
              if ( chmod( modbuf,  DIRBITS | mode ) < 0 ) {
-               syslog( LOG_ERR, "setdeskmode: chmod %s: %m", modbuf );
+               syslog( LOG_ERR, "setdeskmode: chmod %s: %s",
+                       modbuf, strerror(errno) );
              }
            } else if ( chmod( modbuf,  mode ) < 0 ) {
-               syslog( LOG_ERR, "setdeskmode: chmod %s: %m", modbuf );
+               syslog( LOG_ERR, "setdeskmode: chmod %s: %s",
+                       modbuf, strerror(errno) );
            }
 
        }
        closedir( sub );
        /* XXX: need to preserve special modes */
        if ( chmod( deskp->d_name,  DIRBITS | mode ) < 0 ) {
-           syslog( LOG_ERR, "setdeskmode: chmod %s: %m", deskp->d_name );
+           syslog( LOG_ERR, "setdeskmode: chmod %s: %s",
+                   deskp->d_name, strerror(errno) );
        }
     }
     closedir( desk );
     if ( chdir( wd ) < 0 ) {
-       syslog( LOG_ERR, "setdeskmode: chdir %s: %m", wd );
+       syslog( LOG_ERR, "setdeskmode: chdir %s: %s", wd, strerror(errno) );
        return -1;
     }
     /* XXX: need to preserve special modes */
     if ( chmod( ".AppleDesktop",  DIRBITS | mode ) < 0 ) {
-       syslog( LOG_ERR, "setdeskmode: chmod .AppleDesktop: %m" );
+       syslog( LOG_ERR, "setdeskmode: chmod .AppleDesktop: %s", strerror(errno) );
     }
     return( 0 );
 }
@@ -335,7 +341,7 @@ int setdirmode( mode, noadouble, dropbox )
     DIR                        *dir;
 
     if (( dir = opendir( "." )) == NULL ) {
-       syslog( LOG_ERR, "setdirmode: opendir .: %m" );
+       syslog( LOG_ERR, "setdirmode: opendir .: %s", strerror(errno) );
        return( -1 );
     }
 
@@ -344,7 +350,8 @@ int setdirmode( mode, noadouble, dropbox )
            continue;
        }
        if ( stat( dirp->d_name, &st ) < 0 ) {
-           syslog( LOG_ERR, "setdirmode: stat %s: %m", dirp->d_name );
+           syslog( LOG_ERR, "setdirmode: stat %s: %s",
+                   dirp->d_name, strerror(errno) );
            continue;
        }
 
@@ -361,7 +368,7 @@ int setdirmode( mode, noadouble, dropbox )
     if (( dir = opendir( ".AppleDouble" )) == NULL ) {
         if (noadouble)
          goto setdirmode_noadouble;
-       syslog( LOG_ERR, "setdirmode: opendir .AppleDouble: %m" );
+       syslog( LOG_ERR, "setdirmode: opendir .AppleDouble: %s", strerror(errno) );
        return( -1 );
     }
     strcpy( buf, ".AppleDouble" );
@@ -376,7 +383,7 @@ int setdirmode( mode, noadouble, dropbox )
        strcat( buf, dirp->d_name );
 
        if ( stat( buf, &st ) < 0 ) {
-           syslog( LOG_ERR, "setdirmode: stat %s: %m", buf );
+           syslog( LOG_ERR, "setdirmode: stat %s: %s", buf, strerror(errno) );
            continue;
        }
 
@@ -417,7 +424,7 @@ int setdeskowner( uid, gid )
     }
     if (( desk = opendir( "." )) == NULL ) {
        if ( chdir( wd ) < 0 ) {
-           syslog( LOG_ERR, "setdeskowner: chdir %s: %m", wd );
+           syslog( LOG_ERR, "setdeskowner: chdir %s: %s", wd, strerror(errno) );
        }
        return( -1 );
     }
@@ -442,22 +449,25 @@ int setdeskowner( uid, gid )
            strcat( modbuf, subp->d_name );
            /* XXX: add special any uid, ignore group bits */
            if ( chown( modbuf, uid, gid ) < 0 ) {
-               syslog( LOG_ERR, "setdeskown: chown %s: %m", modbuf );
+               syslog( LOG_ERR, "setdeskown: chown %s: %s",
+                       modbuf, strerror(errno) );
            }
        }
        closedir( sub );
        /* XXX: add special any uid, ignore group bits */
        if ( chown( deskp->d_name, uid, gid ) < 0 ) {
-           syslog( LOG_ERR, "setdeskowner: chown %s: %m", deskp->d_name );
+           syslog( LOG_ERR, "setdeskowner: chown %s: %s",
+                   deskp->d_name, strerror(errno) );
        }
     }
     closedir( desk );
     if ( chdir( wd ) < 0 ) {
-       syslog( LOG_ERR, "setdeskowner: chdir %s: %m", wd );
+       syslog( LOG_ERR, "setdeskowner: chdir %s: %s", wd, strerror(errno) );
        return -1;
     }
     if ( chown( ".AppleDesktop", uid, gid ) < 0 ) {
-       syslog( LOG_ERR, "setdeskowner: chown .AppleDesktop: %m" );
+       syslog( LOG_ERR, "setdeskowner: chown .AppleDesktop: %s",
+               strerror(errno) );
     }
     return( 0 );
 }
@@ -486,12 +496,14 @@ int setdirowner( uid, gid, noadouble )
            continue;
        };
        if ( stat( dirp->d_name, &st ) < 0 ) {
-           syslog( LOG_ERR, "setdirowner: stat %s: %m", dirp->d_name );
+           syslog( LOG_ERR, "setdirowner: stat %s: %s",
+                   dirp->d_name, strerror(errno) );
            continue;
        }
        if (( st.st_mode & S_IFMT ) == S_IFREG ) {
            if ( chown( dirp->d_name, uid, gid ) < 0 ) {
-               syslog( LOG_DEBUG, "setdirowner: chown %s: %m", dirp->d_name );
+               syslog( LOG_DEBUG, "setdirowner: chown %s: %s",
+                       dirp->d_name, strerror(errno) );
                /* return ( -1 ); Sometimes this is okay */
            }
        }
@@ -513,8 +525,8 @@ int setdirowner( uid, gid, noadouble )
        *m = '\0';
        strcat( buf, dirp->d_name );
        if ( chown( buf, uid, gid ) < 0 ) {
-           syslog( LOG_DEBUG, "setdirowner: chown %d/%d %s: %m",
-                   uid, gid, buf );
+           syslog( LOG_DEBUG, "setdirowner: chown %d/%d %s: %s",
+                   uid, gid, buf, strerror(errno) );
            /* return ( -1 ); Sometimes this is okay */
        }
     }
@@ -524,12 +536,12 @@ int setdirowner( uid, gid, noadouble )
      * We cheat: we know that chown doesn't do anything.
      */
     if ( stat( ".AppleDouble", &st ) < 0 ) {
-       syslog( LOG_ERR, "setdirowner: stat .AppleDouble: %m" );
+       syslog( LOG_ERR, "setdirowner: stat .AppleDouble: %s", strerror(errno) );
        return( -1 );
     }
     if ( gid && gid != st.st_gid && chown( ".AppleDouble", uid, gid ) < 0 ) {
-       syslog( LOG_DEBUG, "setdirowner: chown %d/%d .AppleDouble: %m",
-               uid, gid);
+       syslog( LOG_DEBUG, "setdirowner: chown %d/%d .AppleDouble: %s",
+               uid, gid, strerror(errno) );
        /* return ( -1 ); Sometimes this is okay */
     }
 
@@ -538,8 +550,8 @@ setdirowner_noadouble:
        return( -1 );
     }
     if ( gid && gid != st.st_gid && chown( ".", uid, gid ) < 0 ) {
-        syslog( LOG_DEBUG, "setdirowner: chown %d/%d .: %m",
-               uid, gid);
+        syslog( LOG_DEBUG, "setdirowner: chown %d/%d .: %s",
+               uid, gid, strerror(errno) );
     }
 
     return( 0 );

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index 42744291cab288f81e8b85d70046aa5b3114d162..b1a4b351dcbf74d4238759050d342068d7a7d866 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.9 2001-08-14 14:00:10 rufustfirefly Exp $
+ * $Id: volume.c,v 1.10 2001-08-15 01:37:34 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -417,18 +417,18 @@ static int creatvol(const char *path, char *name, struct vol_option *options)
 
     if (( volume =
            (struct vol *)calloc(1, sizeof( struct vol ))) == NULL ) {
-       syslog( LOG_ERR, "creatvol: malloc: %m" );
+       syslog( LOG_ERR, "creatvol: malloc: %s", strerror(errno) );
        return -1;
     }
     if (( volume->v_name =
            (char *)malloc( vlen + 1 )) == NULL ) {
-       syslog( LOG_ERR, "creatvol: malloc: %m" );
+       syslog( LOG_ERR, "creatvol: malloc: %s", strerror(errno) );
        free(volume);
        return -1;
     }
     if (( volume->v_path =
            (char *)malloc( strlen( path ) + 1 )) == NULL ) {
-       syslog( LOG_ERR, "creatvol: malloc: %m" );
+       syslog( LOG_ERR, "creatvol: malloc: %s", strerror(errno) );
        free(volume->v_name);
        free(volume);
        return -1;
@@ -565,7 +565,7 @@ static void setextmap( ext, type, creator, user)
     if ( em == NULL ) {
        if (( em =
                (struct extmap *)malloc( sizeof( struct extmap ))) == NULL ) {
-           syslog( LOG_ERR, "setextmap: malloc: %m" );
+           syslog( LOG_ERR, "setextmap: malloc: %s", strerror(errno) );
            return;
        }
        em->em_next = extmap;
@@ -746,7 +746,7 @@ static int readvolfile(obj, p1, p2, user, pwent)
     }
     volfree(save_options, NULL);
     if ( fclose( fp ) != 0 ) {
-       syslog( LOG_ERR, "readvolfile: fclose: %m" );
+       syslog( LOG_ERR, "readvolfile: fclose: %s", strerror(errno) );
     }
     return( 0 );
 }
@@ -840,7 +840,8 @@ static int getvolparams( bitmap, vol, st, buf, buflen )
     int                *buflen;
 {
     struct adouble     ad;
-    int                        bit = 0, aint, isad = 1;
+    int                        bit = 0, isad = 1;
+    u_int32_t          aint;
     u_short            ashort;
     u_int32_t          bfree, btotal, bsize;
     VolSpace            xbfree, xbtotal; /* extended bytes */
@@ -1033,8 +1034,8 @@ int afp_getsrvrparms(obj, ibuf, ibuflen, rbuf, rbuflen )
     data = rbuf + 5;
     for ( vcnt = 0, volume = volumes; volume; volume = volume->v_next ) {
        if ( stat( volume->v_path, &st ) < 0 ) {
-           syslog( LOG_INFO, "afp_getsrvrparms: stat %s: %m", 
-                   volume->v_path );
+           syslog( LOG_INFO, "afp_getsrvrparms: stat %s: %s",
+                   volume->v_path, strerror(errno) );
            continue;           /* can't access directory */
        }
        if (!S_ISDIR(st.st_mode)) {
@@ -1061,7 +1062,7 @@ int afp_getsrvrparms(obj, ibuf, ibuflen, rbuf, rbuflen )
     *rbuflen = data - rbuf;
     data = rbuf;
     if ( gettimeofday( &tv, 0 ) < 0 ) {
-       syslog( LOG_ERR, "afp_getsrvrparms: gettimeofday: %m" );
+       syslog( LOG_ERR, "afp_getsrvrparms: gettimeofday: %s", strerror(errno) );
        *rbuflen = 0;
        return AFPERR_PARAM;
     }
@@ -1127,7 +1128,7 @@ int afp_openvol(obj, ibuf, ibuflen, rbuf, rbuflen )
 
     if (( volume->v_flags & AFPVOL_OPEN  ) == 0 ) {
         if ((dir = dirnew(strlen(volume->v_name) + 1)) == NULL) {
-           syslog( LOG_ERR, "afp_openvol: malloc: %m" );
+           syslog( LOG_ERR, "afp_openvol: malloc: %s", strerror(errno) );
            ret = AFPERR_MISC;
            goto openvol_err;
        }
@@ -1271,7 +1272,7 @@ void setvoltime(obj, vol )
      * [RS] */
 
     if ( gettimeofday( &tv, 0 ) < 0 ) {
-       syslog( LOG_ERR, "setvoltime: gettimeofday: %m" );
+       syslog( LOG_ERR, "setvoltime: gettimeofday: %s", strerror(errno) );
        return;
     }
     if( utime( vol->v_path, NULL ) < 0 ) {