syslog

diff --git a/config.m4 b/config.m4
index cce2affd5ed24391a819d0d435bfaf08dfcd12b6..e0890da903c012a73062bbc88cb7a826656ec254 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -29,6 +29,7 @@ if test "$PHP_PSI" != no; then
                [sys_types.m4],
                [sys_uio.m4],
                [sys_utsname.m4],
+               [syslog.m4],
                [time.m4],
                [wchar.m4]], [
                dnl pecl build
@@ -59,6 +60,7 @@ if test "$PHP_PSI" != no; then
        PSI_CHECK_SYS_STAT
        PSI_CHECK_SYS_UIO
        PSI_CHECK_SYS_UTSNAME
+       PSI_CHECK_SYSLOG
        PSI_CHECK_WCHAR
 
        PHP_SUBST(PSI_SHARED_LIBADD)
@@ -72,7 +74,7 @@ if test "$PHP_PSI" != no; then
        AC_DEFINE_UNQUOTED([PSI_REDIRS], [$PSI_REDIRS], [Redirected functions])
        AC_DEFINE_UNQUOTED([PSI_DECLS], [$PSI_DECLS], [Predefined functions])
        AC_DEFINE_UNQUOTED([PSI_VA_DECLS], [$PSI_VA_DECLS], [Predefined vararg functions])
-       
+
 
        PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src)
        PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)

diff --git a/m4/stdio.m4 b/m4/stdio.m4
index 82aaa1b467bc912c0cdb42b7db6c07325bdd8800..7d601f581723031cc3a28f3a731a587373562cf9 100644 (file)
--- a/m4/stdio.m4
+++ b/m4/stdio.m4
@@ -71,13 +71,13 @@ AC_DEFUN(PSI_CHECK_STDIO, [
     PSI_DECL(FILE *tmpfile, [(void)])
     PSI_DECL(char *tmpnam, [(char *s)])
     PSI_DECL(int ungetc, [(int c, FILE *stream)])
-       
-       PSI_DECL(int dprintf, [(int fd, char *fmt)], vararg)
-       PSI_DECL(int fprintf, [(FILE *stream, char *fmt)], vararg)
-       PSI_DECL(int fscanf, [(FILE *stream, char *fmt)], vararg)
-       PSI_DECL(int printf, [(char *fmt)], vararg)
-       PSI_DECL(int scanf, [(char *fmt)], vararg)
-       PSI_DECL(int snprintf, [(char *str, size_t size, char *fmt)], vararg)
-       PSI_DECL(int sprintf, [(char *str, char *fmt)], vararg)
-       PSI_DECL(int sscanf, [(char *str, char *fmt)], vararg)
+
+       PSI_DECL(int dprintf, [(int fd, char *format)], vararg)
+       PSI_DECL(int fprintf, [(FILE *stream, char *format)], vararg)
+       PSI_DECL(int fscanf, [(FILE *stream, char *format)], vararg)
+       PSI_DECL(int printf, [(char *format)], vararg)
+       PSI_DECL(int scanf, [(char *format)], vararg)
+       PSI_DECL(int snprintf, [(char *str, size_t size, char *format)], vararg)
+       PSI_DECL(int sprintf, [(char *str, char *format)], vararg)
+       PSI_DECL(int sscanf, [(char *str, char *format)], vararg)
 ])

diff --git a/m4/wchar.m4 b/m4/wchar.m4
index 97a0b9e70da2bc9f556299a7d1c1c35b5ae4d9b2..ebffee9b5e3c5468fb54fc8ce4e1a21f815c3d98 100644 (file)
--- a/m4/wchar.m4
+++ b/m4/wchar.m4
@@ -1,9 +1,13 @@
 AC_DEFUN(PSI_CHECK_WCHAR, [
        AC_CHECK_HEADERS(wchar.h)
-       
+
        PSI_TYPE(wint_t, int)
-       
+
        PSI_CONST(WINT_MIN, int)
        PSI_CONST(WINT_MAX, int)
        PSI_CONST(WEOF, int)
+
+       PSI_DECL(int wprintf, [(wchar_t *format)], vararg)
+       PSI_DECL(int fwprintf, [(FILE *stream, wchar_t *format)], vararg)
+       PSI_DECL(int swprintf, [(wchar_t *wcs, size_t maxlen, wchar_t *format)], vararg)
 ])

diff --git a/psi.d/stdio.psi b/psi.d/stdio.psi
index 0741874ac5ba0af4ee0ddefb83c3672ad3278d8e..685d6c8dda4d0298b6f7fd4f68e89eebc0c1370e 100644 (file)
--- a/psi.d/stdio.psi
+++ b/psi.d/stdio.psi
@@ -65,8 +65,8 @@ function psi\rewind(object $stream) : void {
        return void(rewind);
 }
 
-//extern int printf(const char *fmt, ...);
+//extern int printf(const char *format, ...);
 function psi\printf(string $fmt, mixed ...$args) : int {
-       let fmt = strval($fmt);
+       let format = strval($fmt);
        return to_int(printf);
 }

diff --git a/src/context.c b/src/context.c
index 3b5c734e106da577a7aa90a3cf4bea0d876eecab..64fce3799b157fc9c5dbb41bedb88f6785a71cb1 100644 (file)
--- a/src/context.c
+++ b/src/context.c
@@ -77,6 +77,9 @@
 #ifdef HAVE_TIME_H
 # include <time.h>
 #endif
+#ifdef HAVE_SYSLOG_H
+# include <syslog.h>
+#endif
 #ifdef HAVE_WCHAR_H
 # include <wchar.h>
 #endif