← Back to branch summary

~ubuntu-branches/ubuntu/dapper/fetchmail/dapper-security

« back to all changes in this revision

Viewing changes to transact.c

  • Committer: Bazaar Package Importer
  • Author(s): Nathaniel McCallum
  • Date: 2004-09-03 14:53:58 UTC
  • Revision ID: james.westby@ubuntu.com-20040903145358-dluq0c58tfe3cpcm
Tags: 6.2.5-8ubuntu2
Added versioned depend on lsb-base

Show diffs side-by-side

added added

removed removed

Lines of Context:
transact.c
93
93
        {
94
94
            char        *atsign;
95
95
 
96
 
            /* 
97
 
             * Handle empty address from a To: header containing only 
98
 
             * a comment.
99
 
             */
100
 
            if (!*cp)
101
 
                continue;
102
 
 
103
96
            /*
104
97
             * If the name of the user begins with a qmail virtual
105
98
             * domain prefix, ignore the prefix.  Doing this here
568
561
            sizeticker += linelen;
569
562
            while (sizeticker >= SIZETICKER)
570
563
            {
571
 
                if (outlevel > O_SILENT && run.showdots)
 
564
                if (outlevel > O_SILENT && run.showdots && !run.use_syslog)
572
565
                {
573
566
                    fputc('.', stdout);
574
567
                    fflush(stdout);
1354
1347
            sizeticker += linelen;
1355
1348
            while (sizeticker >= SIZETICKER)
1356
1349
            {
1357
 
                if (outlevel > O_SILENT && run.showdots)
 
1350
                if (outlevel > O_SILENT && run.showdots && !run.use_syslog)
1358
1351
                {
1359
1352
                    fputc('.', stdout);
1360
1353
                    fflush(stdout);
1446
1439
    }
1447
1440
}
1448
1441
 
 
1442
 
1449
1443
#if defined(HAVE_STDARG_H)
1450
1444
void gen_send(int sock, const char *fmt, ... )
1451
1445
#else
1485
1479
 
1486
1480
    if (outlevel >= O_MONITOR)
1487
1481
    {
1488
 
        enshroud(buf);
 
1482
        char *cp;
 
1483
 
 
1484
        if (shroud[0] && (cp = strstr(buf, shroud)))
 
1485
        {
 
1486
            char        *sp;
 
1487
 
 
1488
            sp = cp + strlen(shroud);
 
1489
            *cp++ = '*';
 
1490
            while (*sp)
 
1491
                *cp++ = *sp++;
 
1492
            *cp = '\0';
 
1493
        }
1489
1494
        buf[strlen(buf)-2] = '\0';
1490
1495
        report(stdout, "%s> %s\n", protocol->name, buf);
1491
1496
    }
1570
1575
 
1571
1576
    if (outlevel >= O_MONITOR)
1572
1577
    {
1573
 
        enshroud(buf);
1574
 
        buf[strlen(buf)-2] = '\0';
 
1578
        char *cp;
 
1579
 
 
1580
        if (shroud && shroud[0] && (cp = strstr(buf, shroud)))
 
1581
        {
 
1582
            char        *sp;
 
1583
 
 
1584
            sp = cp + strlen(shroud);
 
1585
            *cp++ = '*';
 
1586
            while (*sp)
 
1587
                *cp++ = *sp++;
 
1588
            *cp = '\0';
 
1589
        }
 
1590
        buf[strlen(buf)-1] = '\0';
1575
1591
        report(stdout, "%s> %s\n", protocol->name, buf);
1576
1592
    }
1577
1593