util.c (205793) | util.c (208592) |
---|---|
1/* 2 * Copyright (c) 1980, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 23 unchanged lines hidden (view full) --- 32 */ 33 34#ifndef lint 35#if 0 36static char sccsid[] = "@(#)aux.c 8.1 (Berkeley) 6/6/93"; 37#endif 38#endif /* not lint */ 39#include <sys/cdefs.h> | 1/* 2 * Copyright (c) 1980, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 23 unchanged lines hidden (view full) --- 32 */ 33 34#ifndef lint 35#if 0 36static char sccsid[] = "@(#)aux.c 8.1 (Berkeley) 6/6/93"; 37#endif 38#endif /* not lint */ 39#include <sys/cdefs.h> |
40__FBSDID("$FreeBSD: head/usr.bin/mail/util.c 205793 2010-03-28 13:16:08Z ed $"); | 40__FBSDID("$FreeBSD: head/usr.bin/mail/util.c 208592 2010-05-27 12:59:49Z uqs $"); |
41 42#include <sys/time.h> 43 44#include "rcv.h" 45#include "extern.h" 46 47/* 48 * Mail -- a mail program --- 442 unchanged lines hidden (view full) --- 491 /* FALLTHROUGH */ 492 493 default: 494 if (lastsp) { 495 lastsp = 0; 496 *cp2++ = ' '; 497 } 498 *cp2++ = c; | 41 42#include <sys/time.h> 43 44#include "rcv.h" 45#include "extern.h" 46 47/* 48 * Mail -- a mail program --- 442 unchanged lines hidden (view full) --- 491 /* FALLTHROUGH */ 492 493 default: 494 if (lastsp) { 495 lastsp = 0; 496 *cp2++ = ' '; 497 } 498 *cp2++ = c; |
499 if (c == ',' && *cp == ' ' && !gotlt) { | 499 if (c == ',' && !gotlt && 500 (*cp == ' ' || *cp == '"' || *cp == '<')) { |
500 *cp2++ = ' '; | 501 *cp2++ = ' '; |
501 while (*++cp == ' ') 502 ; | 502 while (*cp == ' ') 503 cp++; |
503 lastsp = 0; 504 bufend = cp2; 505 } 506 } 507 } 508 *cp2 = '\0'; 509 510 if ((cp = realloc(nbuf, strlen(nbuf) + 1)) != NULL) --- 122 unchanged lines hidden --- | 504 lastsp = 0; 505 bufend = cp2; 506 } 507 } 508 } 509 *cp2 = '\0'; 510 511 if ((cp = realloc(nbuf, strlen(nbuf) + 1)) != NULL) --- 122 unchanged lines hidden --- |