← Back to branch summary

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

« back to all changes in this revision

Viewing changes to pigeonhole/src/lib-managesieve/managesieve-parser.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:
pigeonhole/src/lib-managesieve/managesieve-parser.c
1
 
/* Copyright (c) 2002-2012 Pigeonhole authors, see the included COPYING file
 
1
/* Copyright (c) 2002-2013 Pigeonhole authors, see the included COPYING file
2
2
 */
3
3
 
4
4
#include "lib.h"
174
174
                                /* -1 because we skipped the '"' prefix */
175
175
                                str_unescape(str + parser->str_first_escape-1);
176
176
                        }
177
 
        
 
177
 
178
178
                        arg->_data.str = str;
179
179
                        arg->str_len = strlen(str);
180
180
                }
396
396
                                parser->error = "Invalid UTF-8 character in literal string.";
397
397
                                return FALSE;
398
398
                        }
399
 
                        
 
399
 
400
400
                        managesieve_parser_save_arg(parser, data,
401
401
                                             (size_t)parser->literal_size);
402
402
                        parser->cur_pos = (size_t)parser->literal_size;
620
620
        struct quoted_string_istream *qsstream =
621
621
                (struct quoted_string_istream *)stream;
622
622
        const unsigned char *data;
623
 
        size_t i, dest, size;
 
623
        size_t i, dest, size, avail;
624
624
        ssize_t ret = 0;
625
625
        bool slash;
626
626
 
648
648
        }
649
649
 
650
650
        /* Allocate buffer space */
651
 
        if (!i_stream_get_buffer_space(stream, size, NULL))
 
651
        if (!i_stream_try_alloc(stream, size, &avail))
652
652
                return -2;
653
653
 
654
654
        /* Parse quoted string content */
712
712
        return ret;
713
713
}
714
714
 
715
 
static const struct stat *quoted_string_istream_stat
 
715
static int quoted_string_istream_stat
716
716
(struct istream_private *stream, bool exact)
717
717
{
718
 
        return i_stream_stat(stream->parent, exact);
 
718
        const struct stat *st;
 
719
 
 
720
        if (i_stream_stat(stream->parent, exact, &st) < 0)
 
721
                return -1;
 
722
 
 
723
        stream->statbuf = *st;
 
724
        return 0;
719
725
}
720
726
 
721
727
static struct istream *quoted_string_istream_create