From: didg <didg>
Date: Fri, 14 Nov 2008 10:04:52 +0000 (+0000)
Subject: replace remaining %m printf glibc extension with %s strerror(errno)
X-Git-Tag: netatalk-2-0-4-beta1~13
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=c78b39f491fcb71c19f3510da169e7b3790f649c

replace remaining %m printf glibc extension with %s strerror(errno)
---

diff --git a/etc/atalkd/config.c b/etc/atalkd/config.c
index 2989bb14..fe3eb2a6 100644
--- a/etc/atalkd/config.c
+++ b/etc/atalkd/config.c
@@ -1,5 +1,5 @@
 /*
- * $Id: config.c,v 1.13.6.5.2.4 2005-09-27 10:40:41 didg Exp $
+ * $Id: config.c,v 1.13.6.5.2.5 2008-11-14 10:04:52 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -271,7 +271,7 @@ int writeconf( cf )
                                       &zonename)) ) {
                     if ( NULL == 
                       (zonename = strdup(((struct ziptab *)l->l_data)->zt_name))) {
-		        LOG(log_error, logtype_atalkd, "malloc: %m" );
+		        LOG(log_error, logtype_atalkd, "malloc: %s",  strerror(errno) );
 		        return( -1 );
                     }
                     len = ((struct ziptab *)l->l_data)->zt_len;
@@ -850,16 +850,16 @@ int plumb()
 	*p = '\0';
 
 	if (( fd = open( device, O_RDWR, 0 )) < 0 ) {
-	    LOG(log_error, logtype_atalkd, "%s: %m", device );
+	    LOG(log_error, logtype_atalkd, "%s: %s", device, strerror(errno) );
 	    return -1;
 	}
 	if ( ioctl( fd, I_PUSH, "ddp" ) < 0 ) {
-	    LOG(log_error, logtype_atalkd, "I_PUSH: %m" );
+	    LOG(log_error, logtype_atalkd, "I_PUSH: %s", strerror(errno) );
 	    close(fd);
 	    return -1;
 	}
 	if ( ioctl( fd, IF_UNITSEL, ppa ) < 0 ) {
-	    LOG(log_error, logtype_atalkd, "IF_UNITSEL: %m" );
+	    LOG(log_error, logtype_atalkd, "IF_UNITSEL: %s", strerror(errno) );
 	    close(fd);
 	    return -1;
 	}
diff --git a/etc/atalkd/rtmp.c b/etc/atalkd/rtmp.c
index 7c879556..1c82a4ca 100644
--- a/etc/atalkd/rtmp.c
+++ b/etc/atalkd/rtmp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rtmp.c,v 1.12.8.1 2004-05-12 21:21:48 didg Exp $
+ * $Id: rtmp.c,v 1.12.8.1.2.1 2008-11-14 10:04:52 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -968,8 +968,8 @@ int gateroute( command, rtmp )
 		    (struct sockaddr_at *) &dst,
 		    (struct sockaddr_at *) &gate,
 		    RTF_UP | RTF_GATEWAY )) {
-	    LOG(log_error, logtype_atalkd, "route: %u -> %u.%u: %m", net,
-	    	    ntohs( gate.sat_addr.s_net ), gate.sat_addr.s_node );
+	    LOG(log_error, logtype_atalkd, "route: %u -> %u.%u: %s", net,
+	    	    ntohs( gate.sat_addr.s_net ), gate.sat_addr.s_node, strerror(errno) );
 	    continue;
 	}
 #endif /* ! BSD4_4 */
diff --git a/etc/papd/comment.c b/etc/papd/comment.c
index e8bb270e..869c028e 100644
--- a/etc/papd/comment.c
+++ b/etc/papd/comment.c
@@ -1,5 +1,5 @@
 /*
- * $Id: comment.c,v 1.8 2002-09-29 23:29:13 sibaz Exp $
+ * $Id: comment.c,v 1.8.10.1 2008-11-14 10:04:52 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 
 #include "comment.h"
 
@@ -37,7 +38,7 @@ void compush( comment )
 
     if (( cs = (struct comstate *)malloc( sizeof( struct comstate ))) ==
 	    NULL ) {
-	LOG(log_error, logtype_papd, "malloc: %m" );
+	LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 	exit( 1 );
     }
 
diff --git a/etc/papd/lp.c b/etc/papd/lp.c
index 4c70acd6..4fdbe9cf 100644
--- a/etc/papd/lp.c
+++ b/etc/papd/lp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: lp.c,v 1.14.8.4.2.2 2008-08-14 20:19:19 didg Exp $
+ * $Id: lp.c,v 1.14.8.4.2.3 2008-11-14 10:04:52 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -311,7 +311,7 @@ void lp_person( person )
 	free( lp.lp_person );
     }
     if (( lp.lp_person = (char *)malloc( strlen( person ) + 1 )) == NULL ) {
-	LOG(log_error, logtype_papd, "malloc: %m" );
+	LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 	exit( 1 );
     }
     strcpy( lp.lp_person, person );
@@ -342,7 +342,7 @@ void lp_host( host )
 	free( lp.lp_host );
     }
     if (( lp.lp_host = (char *)malloc( strlen( host ) + 1 )) == NULL ) {
-	LOG(log_error, logtype_papd, "malloc: %m" );
+	LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 	exit( 1 );
     }
     strcpy( lp.lp_host, host );
@@ -431,10 +431,10 @@ int lp_init( out, sat )
 			LOG(log_info, logtype_papd, "CAP error: could not read username");
 		    }
 		} else {
-		    LOG(log_info, logtype_papd, "CAP error: %m");
+		    LOG(log_info, logtype_papd, "CAP error: %s", strerror(errno));
 		}
 	    } else {
-		LOG(log_info, logtype_papd, "CAP error: %m");
+		LOG(log_info, logtype_papd, "CAP error: %s", strerror(errno));
 	    }
 	}
 
@@ -462,7 +462,7 @@ int lp_init( out, sat )
     }
 
     if ( gethostname( hostname, sizeof( hostname )) < 0 ) {
-	LOG(log_error, logtype_papd, "gethostname: %m" );
+	LOG(log_error, logtype_papd, "gethostname: %s", strerror(errno) );
 	exit( 1 );
     }
 
@@ -480,7 +480,7 @@ int lp_init( out, sat )
 #ifndef HAVE_CUPS
 	/* check if queuing is enabled: mode & 010 on lock file */
 	if ( stat( printer->p_lock, &st ) < 0 ) {
-	    LOG(log_error, logtype_papd, "lp_init: %s: %m", printer->p_lock );
+	    LOG(log_error, logtype_papd, "lp_init: %s: %s", printer->p_lock, strerror(errno) );
 	    spoolerror( out, NULL );
 	    return( -1 );
 	}
@@ -506,7 +506,7 @@ int lp_init( out, sat )
 
 	n = 0;
 	if (( len = read( fd, buf, sizeof( buf ))) < 0 ) {
-	    LOG(log_error, logtype_papd, "lp_init read: %m" );
+	    LOG(log_error, logtype_papd, "lp_init read: %s", strerror(errno) );
 	    spoolerror( out, NULL );
 	    return( -1 );
 	}
@@ -575,7 +575,7 @@ int lp_open( out, sat )
 	if (lp.lp_person != NULL) {
 	    if((pwent = getpwnam(lp.lp_person)) != NULL) {
 		if(setreuid(pwent->pw_uid, pwent->pw_uid) != 0) {
-		    LOG(log_info, logtype_papd, "setreuid error: %m");
+		    LOG(log_info, logtype_papd, "setreuid error: %s", strerror(errno));
 		}
 	    } else {
 		LOG(log_info, logtype_papd, "Error getting username (%s)", lp.lp_person);
@@ -584,7 +584,7 @@ int lp_open( out, sat )
 
 	lp_setup_comments(CH_UNIX);
 	if (( lp.lp_stream = popen( pipexlate(printer->p_printer), "w" )) == NULL ) {
-	    LOG(log_error, logtype_papd, "lp_open popen %s: %m", printer->p_printer );
+	    LOG(log_error, logtype_papd, "lp_open popen %s: %s", printer->p_printer, strerror(errno) );
 	    spoolerror( out, NULL );
 	    return( -1 );
 	}
@@ -593,13 +593,13 @@ int lp_open( out, sat )
 	sprintf( name, "df%c%03d%s", lp.lp_letter++, lp.lp_seq, hostname );
 
 	if (( fd = open( name, O_WRONLY|O_CREAT|O_EXCL, 0660 )) < 0 ) {
-	    LOG(log_error, logtype_papd, "lp_open %s: %m", name );
+	    LOG(log_error, logtype_papd, "lp_open %s: %s", name, strerror(errno) );
 	    spoolerror( out, NULL );
 	    return( -1 );
 	}
 
 	if ( NULL == (lp.lp_spoolfile = (char *) malloc (strlen (name) +1)) ) {
-	    LOG(log_error, logtype_papd, "malloc: %m");
+	    LOG(log_error, logtype_papd, "malloc: %s", strerror(errno));
 	    exit(1);
 	}
 	strcpy ( lp.lp_spoolfile, name);	
@@ -619,13 +619,13 @@ int lp_open( out, sat )
 	}
 
 	if (fchown(fd, pwent->pw_uid, -1) < 0) {
-	    LOG(log_error, logtype_papd, "chown %s %s: %m", pwent->pw_name, name);
+	    LOG(log_error, logtype_papd, "chown %s %s: %s", pwent->pw_name, name, strerror(errno));
 	    spoolerror( out, NULL );
 	    return( -1 );
 	}
 
 	if (( lp.lp_stream = fdopen( fd, "w" )) == NULL ) {
-	    LOG(log_error, logtype_papd, "lp_open fdopen: %m" );
+	    LOG(log_error, logtype_papd, "lp_open fdopen: %s", strerror(errno) );
 	    spoolerror( out, NULL );
 	    return( -1 );
 	}
@@ -724,14 +724,14 @@ int lp_write(in, buf, len )
     }
     else if ( bufpos) {
         if ( fwrite( tempbuf, 1, bufpos, lp.lp_stream ) != bufpos ) {
-            LOG(log_error, logtype_papd, "lp_write: %m" );
+            LOG(log_error, logtype_papd, "lp_write: %s", strerror(errno) );
             abort();
         }
         bufpos=0;
     }
 
     if ( fwrite( tbuf, 1, len, lp.lp_stream ) != len ) {
-	LOG(log_error, logtype_papd, "lp_write: %m" );
+	LOG(log_error, logtype_papd, "lp_write: %s", strerror(errno) );
 	abort();
     }
     return( 0 );
@@ -753,7 +753,7 @@ int lp_cancel()
     for ( letter = 'A'; letter < lp.lp_letter; letter++ ) {
 	sprintf( name, "df%c%03d%s", letter, lp.lp_seq, hostname );
 	if ( unlink( name ) < 0 ) {
-	    LOG(log_error, logtype_papd, "lp_cancel unlink %s: %m", name );
+	    LOG(log_error, logtype_papd, "lp_cancel unlink %s: %s", name, strerror(errno) );
 	}
     }
 
@@ -787,11 +787,11 @@ int lp_print()
 #ifndef HAVE_CUPS
 	sprintf( tfname, "tfA%03d%s", lp.lp_seq, hostname );
 	if (( fd = open( tfname, O_WRONLY|O_EXCL|O_CREAT, 0660 )) < 0 ) {
-	    LOG(log_error, logtype_papd, "lp_print %s: %m", tfname );
+	    LOG(log_error, logtype_papd, "lp_print %s: %s", tfname, strerror(errno) );
 	    return 0;
 	}
 	if (( cfile = fdopen( fd, "w" )) == NULL ) {
-	    LOG(log_error, logtype_papd, "lp_print %s: %m", tfname );
+	    LOG(log_error, logtype_papd, "lp_print %s: %s", tfname, strerror(errno) );
 	    return 0;
 	}
 	fprintf( cfile, "H%s\n", hostname );	/* XXX lp_host? */
@@ -832,32 +832,32 @@ int lp_print()
 
 	sprintf( cfname, "cfA%03d%s", lp.lp_seq, hostname );
 	if ( link( tfname, cfname ) < 0 ) {
-	    LOG(log_error, logtype_papd, "lp_print can't link %s to %s: %m", cfname,
-		    tfname );
+	    LOG(log_error, logtype_papd, "lp_print can't link %s to %s: %s", cfname,
+		    tfname, strerror(errno) );
 	    return 0;
 	}
 	unlink( tfname );
 
 	if (( s = lp_conn_unix()) < 0 ) {
-	    LOG(log_error, logtype_papd, "lp_print: lp_conn_unix: %m" );
+	    LOG(log_error, logtype_papd, "lp_print: lp_conn_unix: %s", strerror(errno) );
 	    return 0;
 	}
 
 	sprintf( buf, "\1%s\n", printer->p_printer );
 	n = strlen( buf );
 	if ( write( s, buf, n ) != n ) {
-	    LOG(log_error, logtype_papd, "lp_print write: %m" );
+	    LOG(log_error, logtype_papd, "lp_print write: %s" , strerror(errno));
 	    return 0;
 	}
 	if ( read( s, buf, 1 ) != 1 ) {
-	    LOG(log_error, logtype_papd, "lp_print read: %m" );
+	    LOG(log_error, logtype_papd, "lp_print read: %s" , strerror(errno));
 	    return 0;
 	}
 
 	lp_disconn_unix( s );
 
 	if ( buf[ 0 ] != '\0' ) {
-	    LOG(log_error, logtype_papd, "lp_print lpd said %c: %m", buf[ 0 ] );
+	    LOG(log_error, logtype_papd, "lp_print lpd said %c: %s", buf[ 0 ], strerror(errno) );
 	    return 0;
 	}
 #else
@@ -896,7 +896,7 @@ int lp_conn_unix()
     struct sockaddr_un	saun;
 
     if (( s = socket( AF_UNIX, SOCK_STREAM, 0 )) < 0 ) {
-	LOG(log_error, logtype_papd, "lp_conn_unix socket: %m" );
+	LOG(log_error, logtype_papd, "lp_conn_unix socket: %s", strerror(errno) );
 	return( -1 );
     }
     memset( &saun, 0, sizeof( struct sockaddr_un ));
@@ -904,7 +904,7 @@ int lp_conn_unix()
     strcpy( saun.sun_path, _PATH_DEVPRINTER );
     if ( connect( s, (struct sockaddr *)&saun,
 	    strlen( saun.sun_path ) + 2 ) < 0 ) {
-	LOG(log_error, logtype_papd, "lp_conn_unix connect %s: %m", saun.sun_path );
+	LOG(log_error, logtype_papd, "lp_conn_unix connect %s: %s", saun.sun_path, strerror(errno) );
 	close( s );
 	return( -1 );
     }
@@ -930,7 +930,7 @@ int lp_conn_inet()
     }
 
     if ( gethostname( hostname, sizeof( hostname )) < 0 ) {
-	LOG(log_error, logtype_papd, "gethostname: %m" );
+	LOG(log_error, logtype_papd, "gethostname: %s", strerror(errno) );
 	exit( 1 );
     }
 
@@ -940,7 +940,7 @@ int lp_conn_inet()
     }
 
     if (( privfd = rresvport( &port )) < 0 ) {
-	LOG(log_error, logtype_papd, "lp_connect: socket: %m" );
+	LOG(log_error, logtype_papd, "lp_connect: socket: %s", strerror(errno) );
 	close( privfd );
 	return( -1 );
     }
@@ -953,7 +953,7 @@ int lp_conn_inet()
 
     if ( connect( privfd, (struct sockaddr *)&sin,
 	    sizeof( struct sockaddr_in )) < 0 ) {
-	LOG(log_error, logtype_papd, "lp_connect: %m" );
+	LOG(log_error, logtype_papd, "lp_connect: %s", strerror(errno) );
 	close( privfd );
 	return( -1 );
     }
@@ -968,7 +968,7 @@ int lp_rmjob( job )
     int		n, s;
 
     if (( s = lp_conn_inet()) < 0 ) {
-	LOG(log_error, logtype_papd, "lp_rmjob: %m" );
+	LOG(log_error, logtype_papd, "lp_rmjob: %s", strerror(errno) );
 	return( -1 );
     }
 
@@ -979,7 +979,7 @@ int lp_rmjob( job )
     sprintf( buf, "\5%s %s %d\n", printer->p_printer, lp.lp_person, job );
     n = strlen( buf );
     if ( write( s, buf, n ) != n ) {
-	LOG(log_error, logtype_papd, "lp_rmjob write: %m" );
+	LOG(log_error, logtype_papd, "lp_rmjob write: %s", strerror(errno) );
 	lp_disconn_inet( s );
 	return( -1 );
     }
@@ -1010,14 +1010,14 @@ int lp_queue( out )
     int				n, len, s;
 	
     if (( s = lp_conn_unix()) < 0 ) {
-	LOG(log_error, logtype_papd, "lp_queue: %m" );
+	LOG(log_error, logtype_papd, "lp_queue: %s", strerror(errno) );
 	return( -1 );
     }
 
     sprintf( buf, "\3%s\n", printer->p_printer );
     n = strlen( buf );
     if ( write( s, buf, n ) != n ) {
-	LOG(log_error, logtype_papd, "lp_queue write: %m" );
+	LOG(log_error, logtype_papd, "lp_queue write: %s", strerror(errno) );
 	lp_disconn_unix( s );
 	return( -1 );
     }
diff --git a/etc/papd/main.c b/etc/papd/main.c
index 291dc6e5..de9ca08b 100644
--- a/etc/papd/main.c
+++ b/etc/papd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.18.6.2.2.3 2008-08-07 07:51:14 didg Exp $
+ * $Id: main.c,v 1.18.6.2.2.4 2008-11-14 10:04:52 didg Exp $
  *
  * Copyright (c) 1990,1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -311,7 +311,7 @@ int main( ac, av )
 	}
 			
 	if (( pr->p_atp = atp_open( ATADDR_ANYPORT, &pr->p_addr )) == NULL ) {
-	    LOG(log_error, logtype_papd, "atp_open: %m" );
+	    LOG(log_error, logtype_papd, "atp_open: %s", strerror(errno) );
 	    papd_exit( 1 );
 	}
 	if ( nbp_rgstr( atp_sockaddr( pr->p_atp ), pr->p_name, pr->p_type,
@@ -336,7 +336,7 @@ int main( ac, av )
     sigemptyset( &sv.sa_mask );
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGTERM, &sv, 0 ) < 0 ) {
-	LOG(log_error, logtype_papd, "sigaction: %m" );
+	LOG(log_error, logtype_papd, "sigaction: %s", strerror(errno) );
 	papd_exit( 1 );
     }
 
@@ -344,7 +344,7 @@ int main( ac, av )
     sigemptyset( &sv.sa_mask );
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGCHLD, &sv, 0 ) < 0 ) {
-	LOG(log_error, logtype_papd, "sigaction: %m" );
+	LOG(log_error, logtype_papd, "sigaction: %s", strerror(errno) );
 	papd_exit( 1 );
     }
 
@@ -365,7 +365,7 @@ int main( ac, av )
 	    if ( errno == EINTR ) {
 		continue;
 	    }
-	    LOG(log_error, logtype_papd, "select: %m" );
+	    LOG(log_error, logtype_papd, "select: %s", strerror(errno) );
 	    papd_exit( 1 );
 	}
 
@@ -389,7 +389,7 @@ int main( ac, av )
 		atpb.atp_rreqdata = cbuf;
 		atpb.atp_rreqdlen = sizeof( cbuf );
 		if ( atp_rreq( pr->p_atp, &atpb ) < 0 ) {
-		    LOG(log_error, logtype_papd, "atp_rreq: %m" );
+		    LOG(log_error, logtype_papd, "atp_rreq: %s", strerror(errno) );
 		    continue;
 		}
 
@@ -434,7 +434,7 @@ int main( ac, av )
 		     */
 		    if (( atp = atp_open( ATADDR_ANYPORT, 
 					  &pr->p_addr)) == NULL ) {
-			LOG(log_error, logtype_papd, "atp_open: %m" );
+			LOG(log_error, logtype_papd, "atp_open: %s", strerror(errno) );
 			rbuf[ 2 ] = rbuf[ 3 ] = 0xff;  /* printer busy */
 			rbuf[ 4 ] = 0; /* FIXME is it right? */
 			err = 1;
@@ -453,7 +453,7 @@ int main( ac, av )
 		     * This may error out if we lose a route, so we won't die().
 		     */
 		    if ( atp_sresp( pr->p_atp, &atpb ) < 0 ) {
-			LOG(log_error, logtype_papd, "atp_sresp: %m" );
+			LOG(log_error, logtype_papd, "atp_sresp: %s", strerror(errno) );
 			err = 1;
 		    }
 
@@ -466,7 +466,7 @@ int main( ac, av )
 
 		    switch ( c = fork()) {
 		    case -1 :
-			LOG(log_error, logtype_papd, "fork: %m" );
+			LOG(log_error, logtype_papd, "fork: %s", strerror(errno) );
                         atp_close(atp);
 			continue;
 
@@ -476,13 +476,13 @@ int main( ac, av )
 			#ifndef HAVE_CUPS
 			if (( printer->p_flags & P_SPOOLED ) &&
 				chdir( printer->p_spool ) < 0 ) {
-			    LOG(log_error, logtype_papd, "chdir %s: %m", printer->p_spool );
+			    LOG(log_error, logtype_papd, "chdir %s: %s", printer->p_spool, strerror(errno) );
 			    exit( 1 );
 			}
 			#else
 			if (( printer->p_flags & P_SPOOLED ) &&
 				chdir( SPOOLDIR ) < 0 ) {
-			    LOG(log_error, logtype_papd, "chdir %s: %m", SPOOLDIR );
+			    LOG(log_error, logtype_papd, "chdir %s: %s", SPOOLDIR, strerror(errno) );
 			    exit( 1 );
 			}
 
@@ -492,7 +492,7 @@ int main( ac, av )
 			sigemptyset( &sv.sa_mask );
 			sv.sa_flags = SA_RESTART;
 			if ( sigaction( SIGTERM, &sv, 0 ) < 0 ) {
-			    LOG(log_error, logtype_papd, "sigaction: %m" );
+			    LOG(log_error, logtype_papd, "sigaction: %s", strerror(errno) );
 			    exit( 1 );
 			}
 
@@ -530,7 +530,7 @@ int main( ac, av )
 		     * This may error out if we lose a route, so we won't die().
 		     */
 		    if ( atp_sresp( pr->p_atp, &atpb ) < 0 ) {
-			LOG(log_error, logtype_papd, "atp_sresp: %m" );
+			LOG(log_error, logtype_papd, "atp_sresp: %s", strerror(errno) );
 		    }
 		    break;
 
@@ -555,7 +555,7 @@ int main( ac, av )
 		 * This may error out if we lose a route, so we won't die().
 		 */
 		if ( atp_sresp( pr->p_atp, &atpb ) < 0 ) {
-		    LOG(log_error, logtype_papd, "atp_sresp: %m" );
+		    LOG(log_error, logtype_papd, "atp_sresp: %s", strerror(errno) );
 		}
 #endif /* notdef */
 	    }
@@ -829,7 +829,7 @@ int rprintcap( pr )
     if ( pr->p_ppdfile == defprinter.p_ppdfile ) {
 	if ( (p = (char *) cups_get_printer_ppd ( pr->p_printer )) != NULL ) {
 	    if (( pr->p_ppdfile = (char *)malloc( strlen( p ) + 1 )) == NULL ) {
-	    	LOG(log_error, logtype_papd, "malloc: %m" );
+	    	LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 		exit( 1 );
 	    }
 	    strcpy( pr->p_ppdfile, p );
@@ -864,7 +864,7 @@ int rprintcap( pr )
 	    pr->p_spool = defprinter.p_spool;
 	} else {
 	    if (( pr->p_spool = (char *)malloc( strlen( p ) + 1 )) == NULL ) {
-		LOG(log_error, logtype_papd, "malloc: %m" );
+		LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 		exit( 1 );
 	    }
 	    strcpy( pr->p_spool, p );
@@ -888,7 +888,7 @@ int rprintcap( pr )
 	    } else {
 		if (( pr->p_role =
 			(char *)malloc( strlen( p ) + 1 )) == NULL ) {
-		    LOG(log_error, logtype_papd, "malloc: %m" );
+		    LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 		    exit( 1 );
 		}
 		strcpy( pr->p_role, p );
@@ -914,7 +914,7 @@ int rprintcap( pr )
 	if (( p = pgetstr( "pc", &a )) != NULL ) {
 	    if (( pr->p_pagecost_msg =
 		    (char *)malloc( strlen( p ) + 1 )) == NULL ) {
-		LOG(log_error, logtype_papd, "malloc: %m" );
+		LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 		exit( 1 );
 	    }
 	    strcpy( pr->p_pagecost_msg, p );
@@ -939,7 +939,7 @@ int rprintcap( pr )
 	    pr->p_lock = defprinter.p_lock;
 	} else {
 	    if (( pr->p_lock = (char *)malloc( strlen( p ) + 1 )) == NULL ) {
-		LOG(log_error, logtype_papd, "malloc: %m" );
+		LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 		exit( 1 );
 	    }
 	    strcpy( pr->p_lock, p );
diff --git a/etc/papd/ppd.c b/etc/papd/ppd.c
index b1b97683..c4f7c69f 100644
--- a/etc/papd/ppd.c
+++ b/etc/papd/ppd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ppd.c,v 1.9.8.1.2.2 2005-02-06 10:16:02 didg Exp $
+ * $Id: ppd.c,v 1.9.8.1.2.3 2008-11-14 10:04:52 didg Exp $
  *
  * Copyright (c) 1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <atalk/logger.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -192,7 +193,7 @@ int read_ppd( file, fcnt )
     }
 
     if (( ppdfile = fopen( file, "r" )) == NULL ) {
-	LOG(log_error, logtype_papd, "read_ppd %s: %m", file );
+	LOG(log_error, logtype_papd, "read_ppd %s: %s", file, strerror(errno) );
 	return( -1 );
     }
 
@@ -216,12 +217,12 @@ int read_ppd( file, fcnt )
 
 	    if (( pfo = (struct ppd_font *)malloc( sizeof( struct ppd_font )))
 		    == NULL ) {
-		LOG(log_error, logtype_papd, "malloc: %m" );
+		LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 		exit( 1 );
 	    }
 	    if (( pfo->pd_font =
 		    (char *)malloc( strlen( pe->pe_option ) + 1 )) == NULL ) {
-		LOG(log_error, logtype_papd, "malloc: %m" );
+		LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 		exit( 1 );
 	    }
 	    strcpy( pfo->pd_font, pe->pe_option );
@@ -240,7 +241,7 @@ int read_ppd( file, fcnt )
 	if ( pfe->pd_name ) { /*&& (pfe->pd_value == NULL) ) { */
 	    if (( pfe->pd_value =
 		    (char *)malloc( strlen( pe->pe_value ) + 1 )) == NULL ) {
-		LOG(log_error, logtype_papd, "malloc: %m" );
+		LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 		exit( 1 );
 	    }
 
diff --git a/etc/papd/print_cups.c b/etc/papd/print_cups.c
index 1b5568a4..aee03dd1 100644
--- a/etc/papd/print_cups.c
+++ b/etc/papd/print_cups.c
@@ -1,5 +1,5 @@
 /*
- * $Id: print_cups.c,v 1.1.2.1.2.2 2005-09-27 10:40:41 didg Exp $
+ * $Id: print_cups.c,v 1.1.2.1.2.3 2008-11-14 10:04:52 didg Exp $
  *
  * Copyright 2004 Bjoern Fernhomberg.
  *
@@ -384,7 +384,7 @@ cups_autoadd_printers ( struct printer	*defprinter, struct printer *printers)
         for  (i=0; i< num_dests; i++)
         {
 		if (( pr = (struct printer *)malloc( sizeof( struct printer )))	== NULL ) {
-			LOG(log_error, logtype_papd, "malloc: %m" );
+			LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 			exit( 1 );
 		}
 	
@@ -403,7 +403,7 @@ cups_autoadd_printers ( struct printer	*defprinter, struct printer *printers)
 		}
 
 		if (( pr->p_name = (char *)malloc( strlen( name ) + 1 )) == NULL ) {
-			LOG(log_error, logtype_papd, "malloc: %m" );
+			LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 			exit( 1 );
 		}
 		strcpy( pr->p_name, name );
@@ -415,14 +415,14 @@ cups_autoadd_printers ( struct printer	*defprinter, struct printer *printers)
 		pr->p_flags |= P_CUPS_AUTOADDED;
 			
 		if (( pr->p_printer = (char *)malloc( strlen( dests[i].name ) + 1 )) == NULL ) {
-			LOG(log_error, logtype_papd, "malloc: %m" );
+			LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
                		exit( 1 );
         	}
         	strcpy( pr->p_printer, dests[i].name );			
 
         	if ( (p = (char *) cups_get_printer_ppd ( pr->p_printer )) != NULL ) {
         		if (( pr->p_ppdfile = (char *)malloc( strlen( p ) + 1 )) == NULL ) {
-				LOG(log_error, logtype_papd, "malloc: %m" );
+				LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
                			exit( 1 );
         		}
         		strcpy( pr->p_ppdfile, p );
@@ -493,7 +493,7 @@ to_ascii ( char  *inptr, char **outptr)
 	char *out, *osav;
 
 	if ( NULL == (out = (char*) malloc ( strlen ( inptr) + 1 )) ) {
-		LOG(log_error, logtype_papd, "malloc: %m" );
+		LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
 		exit (1);
 	}
 
diff --git a/etc/papd/session.c b/etc/papd/session.c
index 1f9f3a9a..3821674c 100644
--- a/etc/papd/session.c
+++ b/etc/papd/session.c
@@ -1,5 +1,5 @@
 /*
- * $Id: session.c,v 1.14.8.1.2.1 2005-01-31 17:01:07 didg Exp $
+ * $Id: session.c,v 1.14.8.1.2.2 2008-11-14 10:04:52 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -102,7 +102,7 @@ int session( atp, sat )
     atpb.atp_sreqto = 5;		/* retry timer */
     atpb.atp_sreqtries = -1;		/* infinite retries */
     if ( atp_sreq( atp, &atpb, oquantum, ATP_XO )) {
-	LOG(log_error, logtype_papd, "atp_sreq: %m" );
+	LOG(log_error, logtype_papd, "atp_sreq: %s", strerror(errno) );
 	return( -1 );
     }
 
@@ -121,7 +121,7 @@ int session( atp, sat )
 
 	do { /* do list until success or an unrecoverable error occurs */
 	  if (( cc = select( FD_SETSIZE, &fds, 0, 0, &tv )) < 0 )
-	      LOG(log_error, logtype_papd, "select: %m" ); /* log all errors */
+	      LOG(log_error, logtype_papd, "select: %s", strerror(errno) ); /* log all errors */
 	} while (( cc < 0 ) && (errno == 4));
 
 	if ( cc < 0 ) {
@@ -147,7 +147,7 @@ int session( atp, sat )
 	    atpb.atp_sreqto = 0;		/* best effort */
 	    atpb.atp_sreqtries = 1;		/* try once */
 	    if ( atp_sreq( atp, &atpb, 0, 0 )) {
-		LOG(log_error, logtype_papd, "atp_sreq: %m" );
+		LOG(log_error, logtype_papd, "atp_sreq: %s", strerror(errno) );
 		return( -1 );
 	    }
 	    continue;
@@ -162,7 +162,7 @@ int session( atp, sat )
 	    atpb.atp_rreqdata = cbuf;
 	    atpb.atp_rreqdlen = sizeof( cbuf );
 	    if ( atp_rreq( atp, &atpb ) < 0 ) {
-		LOG(log_error, logtype_papd, "atp_rreq: %m" );
+		LOG(log_error, logtype_papd, "atp_rreq: %s", strerror(errno) );
 		return( -1 );
 	    }
 	    /* sanity */
@@ -208,7 +208,7 @@ int session( atp, sat )
 		atpb.atp_sresiov = niov;
 		atpb.atp_sresiovcnt = 1;
 		if ( atp_sresp( atp, &atpb ) < 0 ) {
-		    LOG(log_error, logtype_papd, "atp_sresp: %m" );
+		    LOG(log_error, logtype_papd, "atp_sresp: %s", strerror(errno) );
 		    exit( 1 );
 		}
 		return( 0 );
@@ -230,7 +230,7 @@ int session( atp, sat )
 	    atpb.atp_rresiov = niov;
 	    atpb.atp_rresiovcnt = oquantum;
 	    if ( atp_rresp( atp, &atpb ) < 0 ) {
-		LOG(log_error, logtype_papd, "atp_rresp: %m" );
+		LOG(log_error, logtype_papd, "atp_rresp: %s", strerror(errno) );
 		return( -1 );
 	    }
 
@@ -270,7 +270,7 @@ int session( atp, sat )
 	    atpb.atp_sreqto = 5;		/* retry timer */
 	    atpb.atp_sreqtries = -1;		/* infinite retries */
 	    if ( atp_sreq( atp, &atpb, oquantum, ATP_XO )) {
-		LOG(log_error, logtype_papd, "atp_sreq: %m" );
+		LOG(log_error, logtype_papd, "atp_sreq: %s", strerror(errno) );
 		return( -1 );
 	    }
 	    break;
@@ -279,7 +279,7 @@ int session( atp, sat )
 	    break;
 
 	default :
-	    LOG(log_error, logtype_papd, "atp_rsel: %m" );
+	    LOG(log_error, logtype_papd, "atp_rsel: %s", strerror(errno) );
 	    return( -1 );
 	}
 
@@ -316,7 +316,7 @@ int session( atp, sat )
 	    atpb.atp_sresiov = niov;
 	    atpb.atp_sresiovcnt = i;	/* reported by stevebn@pc1.eos.co.uk */
 	    if ( atp_sresp( atp, &atpb ) < 0 ) {
-		LOG(log_error, logtype_papd, "atp_sresp: %m" );
+		LOG(log_error, logtype_papd, "atp_sresp: %s", strerror(errno) );
 		return( -1 );
 	    }
 	    readpending = 0;
diff --git a/etc/uams/uams_krb4/uams_krb4.c b/etc/uams/uams_krb4/uams_krb4.c
index 44767382..bc7f1430 100644
--- a/etc/uams/uams_krb4/uams_krb4.c
+++ b/etc/uams/uams_krb4/uams_krb4.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_krb4.c,v 1.6.10.1 2003-09-11 23:49:30 bfernhomberg Exp $
+ * $Id: uams_krb4.c,v 1.6.10.1.2.1 2008-11-14 10:04:52 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -233,7 +233,7 @@ static int krb4_login(void *obj, struct passwd **uam_pwd,
 #ifdef AFS
     if ( setpag() < 0 ) {
 	*rbuflen = 0;
-	LOG(log_error, logtype_default, "krb_login: setpag: %m" );
+	LOG(log_error, logtype_default, "krb_login: setpag: %s", strerror(errno) );
 	return( AFPERR_BADUAM );
     }
 #endif /*AFS*/
@@ -326,7 +326,7 @@ static int krb4_logincont(void *obj, struct passwd **uam_pwd,
 	    vi.out_size = sizeof( buf );
 
 	    if ( pioctl( 0, VIOCSETTOK, &vi, 0 ) < 0 ) {
-		LOG(log_error, logtype_default, "krb4_logincont: pioctl: %m" );
+		LOG(log_error, logtype_default, "krb4_logincont: pioctl: %s", strerror(errno) );
 		*rbuflen = 0;
 		return( AFPERR_BADUAM );
 	    }
@@ -444,7 +444,7 @@ static int krb4_logincont(void *obj, struct passwd **uam_pwd,
 		    vi.out = buf;
 		    vi.out_size = sizeof( buf );
 		    if ( pioctl( 0, VIOCSETTOK, &vi, 0 ) < 0 ) {
-			LOG(log_error, logtype_default, "krb4_logincont: pioctl: %m" );
+			LOG(log_error, logtype_default, "krb4_logincont: pioctl: %s", strerror(errno) );
 			return( AFPERR_BADUAM );
 		    }
 		    /* FALL THROUGH */
@@ -609,7 +609,7 @@ static int afskrb_login(void *obj, struct passwd *uam_pwd,
     p = rbuf;
     if ( validseskey == 0 ) {
 	if ( setpag() < 0 ) {
-	    LOG(log_error, logtype_default, "krb_login: setpag: %m" );
+	    LOG(log_error, logtype_default, "krb_login: setpag: %s", strerror(errno) );
 	    return AFPERR_BADUAM;
 	}
 	krb_set_tkt_string(( tktfile = mktemp( _PATH_AFPTKT )));
@@ -626,7 +626,7 @@ static int afskrb_login(void *obj, struct passwd *uam_pwd,
 	}
 
 	if ( unlink( tktfile ) < 0 ) {
-	    LOG(log_error, logtype_default, "krb_login: unlink %s: %m", tktfile );
+	    LOG(log_error, logtype_default, "krb_login: unlink %s: %s", tktfile, strerror(errno) );
 	    return ( AFPERR_BADUAM );
 	}
 
@@ -737,12 +737,12 @@ static int afskrb_logincont(void *obj, struct passwd *uam_pwd,
     vi.out = buf;
     vi.out_size = sizeof( buf );
     if ( pioctl( 0, VIOCSETTOK, &vi, 0 ) < 0 ) {
-	LOG(log_error, logtype_default, "krb_logincont: pioctl: %m" );
+	LOG(log_error, logtype_default, "krb_logincont: pioctl: %s", strerror(errno) );
 	return ( AFPERR_BADUAM );
     }
 
     if ( unlink( tktfile ) < 0 ) {
-	LOG(log_error, logtype_default, "krb_logincont: %s: %m", tktfile );
+	LOG(log_error, logtype_default, "krb_logincont: %s: %s", tktfile, strerror(errno) );
 	return ( AFPERR_BADUAM );
     }
 
diff --git a/libatalk/compat/snprintf.c b/libatalk/compat/snprintf.c
index 7ee7a931..6dc3c7f7 100644
--- a/libatalk/compat/snprintf.c
+++ b/libatalk/compat/snprintf.c
@@ -484,7 +484,7 @@ BUGS
  
  
  static char *const _id = "plp_snprintf V98.12.21 Copyright Patrick Powell 1988-2000 "
- "$Id: snprintf.c,v 1.1 2002-08-30 16:56:50 jmarcus Exp $"
+ "$Id: snprintf.c,v 1.1.12.1 2008-11-14 10:04:52 didg Exp $"
  " LOCAL REVISIONS: Modified for Netatalk 2002/02/12 Burkhard Schmidt";
 
 /* varargs declarations: */
@@ -1057,7 +1057,7 @@ int main( void )
 	errno = 1;
 	buffer[0] = 0;
 	n = plp_snprintf( buffer, 0, (t="test")); printf( "[%d] %s = '%s'\n", n, t, buffer );
-	n = plp_snprintf( buffer, sizeof(buffer), (t="errno '%m'")); printf( "[%d] %s = '%s'\n", n, t, buffer );
+	n = plp_snprintf( buffer, sizeof(buffer), (t="errno '%s'")); printf( "[%d] %s = '%s'\n", n, t, buffer, strerror(errno) );
 	n = plp_snprintf( buffer, sizeof(buffer), (t = "%s"), test1 ); printf( "[%d] %s = '%s'\n", n, t, buffer );
 	n = plp_snprintf( buffer, sizeof(buffer), (t = "%12s"), test1 ); printf( "[%d] %s = '%s'\n", n, t, buffer );
 	n = plp_snprintf( buffer, sizeof(buffer), (t = "%-12s"), test1 ); printf( "[%d] %s = '%s'\n", n, t, buffer );
diff --git a/libatalk/util/volinfo.c b/libatalk/util/volinfo.c
index 2b049604..ac1e61d0 100644
--- a/libatalk/util/volinfo.c
+++ b/libatalk/util/volinfo.c
@@ -251,25 +251,25 @@ static int parseline ( char *buf, struct volinfo *vol)
     switch (option) {
       case MAC_CHARSET:
         if ((vol->v_maccodepage = strdup(value)) == NULL) {
-	    fprintf (stderr, "strdup: %m");
+	    fprintf (stderr, "strdup: %s", strerror(errno));
             return -1;
         }
         break;
       case VOL_CHARSET:
         if ((vol->v_volcodepage = strdup(value)) == NULL) {
-	    fprintf (stderr, "strdup: %m");
+	    fprintf (stderr, "strdup: %s", strerror(errno));
             return -1;
         }
         break;
       case CNIDBACKEND:
         if ((vol->v_cnidscheme = strdup(value)) == NULL) {
-	    fprintf (stderr, "strdup: %m");
+	    fprintf (stderr, "strdup: %s", strerror(errno));
             return -1;
         }
         break;
       case CNIDDBDHOST:
         if ((vol->v_dbd_host = strdup(value)) == NULL) {
-	    fprintf (stderr, "strdup: %m");
+	    fprintf (stderr, "strdup: %s", strerror(errno));
             return -1;
         }
         break;
@@ -278,7 +278,7 @@ static int parseline ( char *buf, struct volinfo *vol)
         break;
       case CNID_DBPATH:
         if ((vol->v_dbpath = strdup(value)) == NULL) {
-	    fprintf (stderr, "strdup: %m");
+	    fprintf (stderr, "strdup: %s", strerror(errno));
             return -1;
         }
         break;
@@ -341,7 +341,7 @@ int loadvolinfo (char *path, struct volinfo *vol)
         return -1;
 
     if ((vol->v_path = strdup(volinfofile)) == NULL ) {
-	fprintf (stderr, "strdup: %m");
+	fprintf (stderr, "strdup: %s", strerror(errno));
         return (-1);
     }
     strlcat(volinfofile, ".AppleDesktop/", sizeof(volinfofile));
@@ -349,7 +349,7 @@ int loadvolinfo (char *path, struct volinfo *vol)
 
     /* open the file read only */
     if ( NULL == (fp = fopen( volinfofile, "r")) )  {
-	fprintf (stderr, "error opening volinfo (%s): %m", volinfofile);
+	fprintf (stderr, "error opening volinfo (%s): %s", volinfofile, strerror(errno));
         return (-1);
     }
     fd = fileno(fp);