← Back to branch summary

~ubuntu-branches/ubuntu/utopic/dovecot/utopic-proposed

« back to all changes in this revision

Viewing changes to src/doveadm/doveadm-print-server.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-08 09:35:49 UTC
  • mfrom: (4.1.35 sid)
  • Revision ID: package-import@ubuntu.com-20140108093549-i72o93pux8p0dlaf
Tags: 1:2.2.9-1ubuntu1
* Merge from Debian unstable, remaining changes:
  + Add mail-stack-delivery package:
    - Update d/rules
    - d/control: convert existing dovecot-postfix package to a dummy
      package and add new mail-stack-delivery package.
    - Update maintainer scripts.
    - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
    - d/mail-stack-delivery.preinst: Move previously installed backups and
      config files to a new package namespace.
    - d/mail-stack-delivery.prerm: Added to handle downgrades.
  + Use Snakeoil SSL certificates by default:
    - d/control: Depend on ssl-cert.
    - d/dovecot-core.postinst: Relax grep for SSL_* a bit.
  + Add autopkgtest to debian/tests/*.
  + Add ufw integration:
    - d/dovecot-core.ufw.profile: new ufw profile.
    - d/rules: install profile in dovecot-core.
    - d/control: dovecot-core - suggest ufw.
  + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
  + Add apport hook:
    - d/rules, d/source_dovecot.py
  + Add upstart job:
    - d/rules, d/dovecot-core.dovecot.upstart, d/control,
      d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
      d/dovecot-pop3d.{postinst, postrm, prerm}.
      d/mail-stack-deliver.postinst: Convert init script to upstart.
  + Use the autotools-dev dh addon to update config.guess/config.sub for
    arm64.
* Dropped changes, included in Debian:
  - Update Dovecot name to reflect distribution in login greeting.
  - Update Drac plugin for >= 2.0.0 support.
* d/control: Drop dovecot-postfix package as its no longer required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/doveadm/doveadm-print-server.c
1
 
/* Copyright (c) 2010-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2010-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "array.h"
39
39
 
40
40
static void doveadm_print_server_print(const char *value)
41
41
{
42
 
        str_tabescape_write(ctx.str, value);
 
42
        str_append_tabescaped(ctx.str, value);
43
43
        str_append_c(ctx.str, '\t');
44
44
 
45
45
        if (++ctx.header_idx == ctx.header_count) {
56
56
                return;
57
57
        }
58
58
        T_BEGIN {
59
 
                str_tabescape_write(ctx.str, t_strndup(value, size));
 
59
                str_append_tabescaped(ctx.str, t_strndup(value, size));
60
60
        } T_END;
61
61
 
62
62
        if (str_len(ctx.str) >= IO_BLOCK_SIZE)
68
68
        if (doveadm_client == NULL)
69
69
                return;
70
70
 
71
 
        o_stream_send(client_connection_get_output(doveadm_client),
72
 
                      str_data(ctx.str), str_len(ctx.str));
 
71
        o_stream_nsend(client_connection_get_output(doveadm_client),
 
72
                       str_data(ctx.str), str_len(ctx.str));
73
73
        str_truncate(ctx.str, 0);
74
74
}
75
75