← Back to branch summary

~ubuntu-branches/ubuntu/saucy/evolution-data-server/saucy

« back to all changes in this revision

Viewing changes to camel/camel-movemail.c

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-10-08 12:58:16 UTC
  • mfrom: (181.1.7 quantal)
  • Revision ID: package-import@ubuntu.com-20121008125816-i3n76e8c0m64e7xp
Tags: 3.6.0-0ubuntu2
https://launchpad.net/bugs/1038047
https://launchpad.net/bugs/1038047
* Fix LP: #1038047 part 1 - Don't abort in e_source_registry_new* when a
  problem occurs connecting to the Dbus service
  - add debian/patches/dont-abort-in-e_source_registry_new.patch
  - update debian/patches/series
* Fix LP: #1038047 part 2 - libedataserver depends on
  evolution-data-server-common to ensure that the GSettings schemas are
  present
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
camel/camel-movemail.c
306
306
        gchar buffer[4096];
307
307
        gint written = 0;
308
308
 
309
 
        d(printf("writing %d bytes ... ", bytes));
 
309
        d (printf ("writing %d bytes ... ", bytes));
310
310
 
311
311
        if (lseek (fromfd, start, SEEK_SET) != start)
312
312
                return -1;
328
328
 
329
329
                /* check for 'end of file' */
330
330
                if (towrite == 0) {
331
 
                        d(printf("end of file?\n"));
 
331
                        d (printf ("end of file?\n"));
332
332
                        break;
333
333
                }
334
334
 
343
343
                bytes -= toread;
344
344
        }
345
345
 
346
 
        d(printf("written %d bytes\n", written));
 
346
        d (printf ("written %d bytes\n", written));
347
347
 
348
348
        return written;
349
349
}
364
364
        gchar *filterbuffer;
365
365
        gint filterlen, filterpre;
366
366
 
367
 
        d(printf("writing %d bytes ... ", bytes));
 
367
        d (printf ("writing %d bytes ... ", bytes));
368
368
 
369
369
        camel_mime_filter_reset (filter);
370
370
 
386
386
                if (towrite == -1)
387
387
                        return -1;
388
388
 
389
 
                d(printf("read %d unfiltered bytes\n", towrite));
 
389
                d (printf ("read %d unfiltered bytes\n", towrite));
390
390
 
391
391
                /* check for 'end of file' */
392
392
                if (towrite == 0) {
393
 
                        d(printf("end of file?\n"));
394
 
                        camel_mime_filter_complete (filter, buffer + PRE_SIZE, towrite, PRE_SIZE,
395
 
                                                   &filterbuffer, &filterlen, &filterpre);
 
393
                        d (printf ("end of file?\n"));
 
394
                        camel_mime_filter_complete (
 
395
                                filter, buffer + PRE_SIZE, towrite, PRE_SIZE,
 
396
                                &filterbuffer, &filterlen, &filterpre);
396
397
                        towrite = filterlen;
397
398
                        if (towrite == 0)
398
399
                                break;
399
400
                } else {
400
 
                        camel_mime_filter_filter (filter, buffer + PRE_SIZE, towrite, PRE_SIZE,
401
 
                                                 &filterbuffer, &filterlen, &filterpre);
 
401
                        camel_mime_filter_filter (
 
402
                                filter, buffer + PRE_SIZE, towrite, PRE_SIZE,
 
403
                                &filterbuffer, &filterlen, &filterpre);
402
404
                        towrite = filterlen;
403
405
                }
404
406
 
405
 
                d(printf("writing %d filtered bytes\n", towrite));
 
407
                d (printf ("writing %d filtered bytes\n", towrite));
406
408
 
407
409
                do {
408
410
                        toread = write (tofd, filterbuffer, towrite);
415
417
                bytes -= toread;
416
418
        }
417
419
 
418
 
        d(printf("written %d bytes\n", written));
 
420
        d (printf ("written %d bytes\n", written));
419
421
 
420
422
        return written;
421
423
}
429
431
        struct iovec iv[4];
430
432
        gint outlen = 0, len;
431
433
 
432
 
        iv[1].iov_base = ":";
 
434
        iv[1].iov_base = ":";
433
435
        iv[1].iov_len = 1;
434
 
        iv[3].iov_base = "\n";
 
436
        iv[3].iov_base = "\n";
435
437
        iv[3].iov_len = 1;
436
438
 
437
439
        while (header) {
438
 
                if (g_ascii_strcasecmp(header->name, "Content-Length")) {
 
440
                if (g_ascii_strcasecmp (header->name, "Content-Length")) {
439
441
                        iv[0].iov_base = header->name;
440
442
                        iv[0].iov_len = strlen (header->name);
441
443
                        iv[2].iov_base = header->value;
453
455
        }
454
456
 
455
457
        do {
456
 
                len = write(fd, "\n", 1);
 
458
                len = write (fd, "\n", 1);
457
459
        } while (len == -1 && errno == EINTR);
458
460
 
459
461
        if (len == -1)
461
463
 
462
464
        outlen += 1;
463
465
 
464
 
        d(printf("Wrote %d bytes of headers\n", outlen));
 
466
        d (printf ("Wrote %d bytes of headers\n", outlen));
465
467
 
466
468
        return outlen;
467
469
}
520
522
                        if (solaris_header_write (dfd, camel_mime_parser_headers_raw (mp)) == -1)
521
523
                                goto fail;
522
524
 
523
 
                        cl = camel_mime_parser_header(mp, "content-length", NULL);
 
525
                        cl = camel_mime_parser_header (mp, "content-length", NULL);
524
526
                        if (cl == NULL) {
525
 
                                g_warning("Required Content-Length header is missing from solaris mail box @ %d", (gint)camel_mime_parser_tell(mp));
 
527
                                g_warning ("Required Content-Length header is missing from solaris mail box @ %d", (gint) camel_mime_parser_tell (mp));
526
528
                                camel_mime_parser_drop_step (mp);
527
529
                                camel_mime_parser_drop_step (mp);
528
530
                                camel_mime_parser_step (mp, &buffer, &len);
541
543
                        if (newpos != -1)
542
544
                                camel_mime_parser_seek (mp, newpos, SEEK_SET);
543
545
                } else {
544
 
                        g_error("Inalid parser state: %d", camel_mime_parser_state(mp));
 
546
                        g_error ("Inalid parser state: %d", camel_mime_parser_state (mp));
545
547
                }
546
548
                g_free (from);
547
549
        }