*** ./corelib/shell.cpp.ORIG Mon May 30 21:59:12 2011 --- ./corelib/shell.cpp Mon May 30 22:00:32 2011 *************** *** 75,80 **** --- 75,136 ---- #define _PATH_TTY "/dev/tty" #endif + #ifdef _AIX51 + /* $Id: vsyslog.c,v 1.2 2000/09/20 03:42:30 robert Exp $ + /* + * Copyright (c) 1994-1996 Sam Leffler + * Copyright (c) 1994-1996 Silicon Graphics, Inc. + * HylaFAX is a trademark of Silicon Graphics, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation for any purpose is hereby granted without fee, provided + * that (i) the above copyright notices and this permission notice appear in + * all copies of the software and related documentation, and (ii) the names of + * Sam Leffler and Silicon Graphics may not be used in any advertising or + * publicity relating to the software without the specific, prior written + * permission of Sam Leffler and Silicon Graphics. + * + * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * + * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR + * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF + * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + #include + #include + #include + #include + #include + #include + + void + vsyslog(int pri, const char* fmt, va_list ap) + { + char tbuf[2048], fmt_cpy[1024]; + char* cp; + char c; + + /* substitute error message for %m */ + for (cp = fmt_cpy; c = *fmt; ++fmt) { + if (c == '%' && fmt[1] == 'm') { + const char* dp; + ++fmt; + for (dp = strerror(errno); *cp = *dp++; ++cp) + ; + } else + *cp++ = c; + *cp = '\0'; + } + (void) vsnprintf(tbuf, sizeof(tbuf), fmt_cpy, ap); + (void) syslog(pri, "%s", tbuf); + } + #endif + using namespace UCOMMON_NAMESPACE; static shell::loglevel_t errlevel = shell::WARN; *** ./inc/ucommon/platform.h.ORIG Mon May 30 21:56:23 2011 --- ./inc/ucommon/platform.h Mon May 30 21:57:51 2011 *************** *** 300,306 **** --- 300,310 ---- #include #include + #if defined(_AIX51) && !defined(_AIX52) + #include + #else #include + #endif #include #endif *** ./commoncpp/socket.cpp.ORIG Mon May 30 22:36:14 2011 --- ./commoncpp/socket.cpp Mon May 30 22:35:22 2011 *************** *** 108,114 **** } # define DUP_SOCK(s,state) dupSocket(s,state) #else ! socket_t Socket::dupSocket(socket_t so, enum Socket::State state) { return dup(so); } --- 108,114 ---- } # define DUP_SOCK(s,state) dupSocket(s,state) #else ! socket_t Socket::dupSocket(socket_t so, Socket::State state) { return dup(so); }