/*
- * $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.
&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;
*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;
}
/*
- * $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.
(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 */
/*
- * $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.
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <errno.h>
#include "comment.h"
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 );
}
/*
- * $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.
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 );
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 );
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));
}
}
}
if ( gethostname( hostname, sizeof( hostname )) < 0 ) {
- LOG(log_error, logtype_papd, "gethostname: %m" );
+ LOG(log_error, logtype_papd, "gethostname: %s", strerror(errno) );
exit( 1 );
}
#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 );
}
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 );
}
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);
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 );
}
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);
}
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 );
}
}
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 );
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) );
}
}
#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? */
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
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 ));
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 );
}
}
if ( gethostname( hostname, sizeof( hostname )) < 0 ) {
- LOG(log_error, logtype_papd, "gethostname: %m" );
+ LOG(log_error, logtype_papd, "gethostname: %s", strerror(errno) );
exit( 1 );
}
}
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 );
}
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 );
}
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 );
}
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 );
}
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 );
}
/*
- * $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.
}
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,
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 );
}
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 );
}
if ( errno == EINTR ) {
continue;
}
- LOG(log_error, logtype_papd, "select: %m" );
+ LOG(log_error, logtype_papd, "select: %s", strerror(errno) );
papd_exit( 1 );
}
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;
}
*/
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;
* 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;
}
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;
#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 );
}
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 );
}
* 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;
* 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 */
}
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 );
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 );
} 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 );
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 );
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 );
/*
- * $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.
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <errno.h>
#include <atalk/logger.h>
#include <sys/types.h>
#include <sys/param.h>
}
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 );
}
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 );
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 );
}
/*
- * $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.
*
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 );
}
}
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 );
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 );
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);
}
/*
- * $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.
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 );
}
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 ) {
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;
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 */
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 );
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 );
}
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;
break;
default :
- LOG(log_error, logtype_papd, "atp_rsel: %m" );
+ LOG(log_error, logtype_papd, "atp_rsel: %s", strerror(errno) );
return( -1 );
}
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;
/*
- * $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.
#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*/
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 );
}
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 */
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 )));
}
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 );
}
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 );
}
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: */
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 );
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;
break;
case CNID_DBPATH:
if ((vol->v_dbpath = strdup(value)) == NULL) {
- fprintf (stderr, "strdup: %m");
+ fprintf (stderr, "strdup: %s", strerror(errno));
return -1;
}
break;
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));
/* 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);