git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sverre Rabbelier <srabbelier@gmail.com>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] Let mailsplit and mailinfo handle mails with CRLF  line-endings
Date: Tue, 4 Aug 2009 10:34:37 -0700	[thread overview]
Message-ID: <fabb9a1e0908041034y1a43fdf6nae14ec106a82f00c@mail.gmail.com> (raw)
In-Reply-To: <20090804172638.GA15136@blimp.localdomain>

Heya,

On Tue, Aug 4, 2009 at 10:26, Alex Riesen<raa.lkml@gmail.com> wrote:
>        }
> +       if (len > 1 && buf[len - 2] == '\r')
> +               buf[--len - 1] = '\n';
>        buf[len] = '\0';

How about something like:

+       if (len > 1 && buf[len - 2] == '\r' && (buf[len - 1] == '\n'
|| buf[len - 1] == '\0'))
+               buf[--len - 1] = '\n';

To make sure that we're not erasing a \r somewhere in the middle of the content?

-- 
Cheers,

Sverre Rabbelier

  reply	other threads:[~2009-08-04 17:35 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-03 19:08 Please make git-am handle \r\n-damaged patches H. Peter Anvin
2009-08-03 21:30 ` Junio C Hamano
2009-08-03 21:56   ` Wesley J. Landaker
2009-08-03 22:56     ` H. Peter Anvin
2009-08-03 22:13   ` H. Peter Anvin
2009-08-03 22:21     ` Sverre Rabbelier
2009-08-03 22:31       ` H. Peter Anvin
2009-08-04  6:21       ` Paolo Bonzini
2009-08-04  6:35 ` Alex Riesen
2009-08-04  6:46   ` Junio C Hamano
2009-08-04 17:26     ` [PATCH] Let mailsplit and mailinfo handle mails with CRLF line-endings Alex Riesen
2009-08-04 17:34       ` Sverre Rabbelier [this message]
2009-08-04 18:50         ` Brandon Casey
2009-08-04 20:57         ` Alex Riesen
2009-08-04 21:03       ` [PATCH v2] " Alex Riesen
2009-08-04 21:29         ` Brandon Casey
2009-08-04 21:40           ` Brandon Casey
2009-08-04 21:58           ` Alex Riesen
2009-08-04 22:03             ` Alex Riesen
2009-08-04 22:04               ` Alex Riesen
2009-08-04 22:23             ` Brandon Casey
2009-08-04 20:59     ` Please make git-am handle \r\n-damaged patches Erik Faye-Lund
2009-08-04 21:05       ` Alex Riesen
2009-08-04 21:16         ` Erik Faye-Lund
2009-08-05 23:10       ` Tony Finch
2009-08-04 21:15     ` Nanako Shiraishi
2009-08-04 22:22       ` Junio C Hamano
2009-08-05  3:31         ` [PATCH 0/4] " Brandon Casey
2009-08-05  3:31           ` [PATCH 1/4] strbuf: add new function strbuf_getwholeline() Brandon Casey
2009-08-05  3:31             ` [PATCH 2/4] builtin-mailinfo,builtin-mailsplit: use strbufs Brandon Casey
2009-08-05  3:31               ` [PATCH 3/4] builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used Brandon Casey
2009-08-05  3:31                 ` [PATCH 4/4] Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings Brandon Casey
2009-08-05  5:49                   ` Alex Riesen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fabb9a1e0908041034y1a43fdf6nae14ec106a82f00c@mail.gmail.com \
    --to=srabbelier@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=hpa@zytor.com \
    --cc=raa.lkml@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).