Warnings from libmagic should be notices rather than sent to stderr, this fixes a...

diff --git a/ext/fileinfo/libmagic/print.c b/ext/fileinfo/libmagic/print.c
index 3ebbc019ad4d9fd208c3006b25a6fc18d87461ee..5a54fb692c478d6399a135cf8f71eebb1e83e839 100644 (file)
--- a/ext/fileinfo/libmagic/print.c
+++ b/ext/fileinfo/libmagic/print.c
@@ -29,6 +29,8 @@
  * print.c - debugging printout routines
  */
 
+#include "php.h"
+
 #include "file.h"
 #include <stdio.h>
 #include <errno.h>
@@ -51,18 +53,16 @@ protected void
 file_magwarn(struct magic_set *ms, const char *f, ...)
 {
        va_list va;
+       char *expanded_format;
+       TSRMLS_FETCH();
 
-       /* cuz we use stdout for most, stderr here */
-       (void) fflush(stdout); 
-
-       if (ms->file)
-               (void) fprintf(stderr, "%s, %lu: ", ms->file,
-                   (unsigned long)ms->line);
-       (void) fprintf(stderr, "Warning: ");
        va_start(va, f);
-       (void) vfprintf(stderr, f, va);
+       vasprintf(&expanded_format, f, va);
        va_end(va);
-       (void) fputc('\n', stderr);
+       
+       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Warning: %s", expanded_format);
+
+       efree(expanded_format);
 }
 
 protected const char *

diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt
index 079a2cb7382917a9139a7c844a1aaa70781cbc44..4aa37367835acbc7788fe21bb4628b027d0e82c7 100644 (file)
--- a/ext/fileinfo/tests/finfo_open_error.phpt
+++ b/ext/fileinfo/tests/finfo_open_error.phpt
@@ -31,7 +31,8 @@ bool(false)
 
 Warning: finfo_open() expects at most 2 parameters, 3 given in %s on line %d
 bool(false)
-unknown, 0: Warning: using regular magic file `%s'
+
+Notice: finfo_open(): Warning: using regular magic file `%s' in %s on line %d
 resource(%d) of type (file_info)
 
 Warning: finfo_open() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d