Changeset 988 for vendor/current/lib/util/dprintf.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/lib/util/dprintf.c (modified) (2 diffs)

vendor/current/lib/util/dprintf.c

@@ -34 +34 @@
 #include "includes.h"
 #include "system/locale.h"
-#include "param/param.h"
 
-static smb_iconv_t display_cd = (smb_iconv_t)-1;
-
-void d_set_iconv(smb_iconv_t cd)
+static int d_vfprintf(FILE *f, const char *format, va_list ap) 
 {
-        if (display_cd != (smb_iconv_t)-1)
-                talloc_free(display_cd);
-
-        display_cd = cd;
-}
-
-_PUBLIC_ int d_vfprintf(FILE *f, const char *format, va_list ap) 
-{
-        char *p, *p2;
-        int ret, clen;
-        va_list ap2;
-
-        /* If there's nothing to convert, take a shortcut */
-        if (display_cd == (smb_iconv_t)-1) {
-                return vfprintf(f, format, ap);
-        }
-
-        /* do any message translations */
-        va_copy(ap2, ap);
-        ret = vasprintf(&p, format, ap2);
-        va_end(ap2);
-
-        if (ret <= 0) return ret;
-
-        clen = iconv_talloc(NULL, display_cd, p, ret, (void **)&p2);
-        if (clen == -1) {
-                /* the string can't be converted - do the best we can,
-                   filling in non-printing chars with '?' */
-                int i;
-                for (i=0;i<ret;i++) {
-                        if (isprint(p[i]) || isspace(p[i])) {
-                                fwrite(p+i, 1, 1, f);
-                        } else {
-                                fwrite("?", 1, 1, f);
-                        }
-                }
-                SAFE_FREE(p);
-                return ret;
-        }
-
-        /* good, its converted OK */
-        SAFE_FREE(p);
-        ret = fwrite(p2, 1, clen, f);
-        talloc_free(p2);
-
-        return ret;
+        return vfprintf(f, format, ap);
 }
 
@@ -101 +53 @@
 }
 
-_PUBLIC_ int d_printf(const char *format, ...)
+static FILE *outfile;
+
+_PUBLIC_  int d_printf(const char *format, ...)
 {
         int ret;
-        va_list ap;
-
-        va_start(ap, format);
-        ret = d_vfprintf(stdout, format, ap);
-        va_end(ap);
-
-        return ret;
+       va_list ap;
+       
+       if (!outfile) outfile = stdout;
+       
+       va_start(ap, format);
+       ret = d_vfprintf(outfile, format, ap);
+       va_end(ap);
+       
+       return ret;
 }
 
+/* interactive programs need a way of tell d_*() to write to stderr instead
+   of stdout */
+void display_set_stderr(void)
+{
+        outfile = stderr;
+}