[U-Boot] [PATCH 1/4] Add option -r to env import to allow import of text files with CRLF as line endings

Stephen Warren
2014-07-31T19:57:12Z

On 07/31/2014 01:51 PM, Tom Rini wrote:
> On Wed, Jul 30, 2014 at 04:47:57PM -0600, Stephen Warren wrote:
>
>> On 07/14/2014 09:49 AM, Alexander Holler wrote:
>>> When this option is enabled, CRLF is treated like LF when importing environments
>> >from text files, which means CRs ('\r') in front of LFs ('\n') are just ignored.
>>>
>>> Drawback of enabling this option is that (maybe exported) variables which have
>>> a trailing CR in their content will get imported without that CR. But this
>>> drawback is very unlikely and the big advantage of letting Windows user create
>>> a *working* uEnv.txt too is likely more welcome.
>>
>> This patch doesn't seem to have been applied, yet patches 2..4 in
>> the series were. This means that various boot scripts use "env
>> import -t -r ..." which fails due to the unknown option -r...
>
> commit ecd1446fe1df00d7f7b9de286dba309d93b51870
> Author: Alexander Holler <holler@ahsoftware.de>
> Date: Mon Jul 14 17:49:55 2014 +0200
>
> Add option -r to env import to allow import of text files with CRLF as line
>
> is what I have.

Huh, I do see that now. I must have been looking at the content of
common/cmd_nvedit.c from the wrong branch, which didn't include that
patch. I could have sworn I checked git history too, but evidently not.
It is indeed clearly there right before the patches which use it. Sorry
for the noise.