[PATCH 3/3] Revert "scripts/common: fix write_file when opened with mmap"

[Andrej Picej]

Hi Sascha,

sorry for responding this late, but we are still getting the same errors 
as before when using bareboximd with these three patches.

Are you sure we can revert this patch? The file can still be opened in 
bareboximd with mmap(), and then be written with this write_file(), 
which fails with the same error:

> Cannot write to barebox.bin: Bad address
> CRC: write crc token to barebox.bin failed: -14
> Bad address

Best regards,
Andrej



On 11. 02. 22 10:42, Sascha Hauer wrote:
> mmap() is no longer used in read_file_2(), so this patch is no longer
> necessary.
> 
> This reverts commit 738601e1258c55953284ee10801b26b9977918c2.
> ---
>   scripts/common.c | 15 ++++-----------
>   1 file changed, 4 insertions(+), 11 deletions(-)
> 
> diff --git a/scripts/common.c b/scripts/common.c
> index 3d07be3630..2be41615ea 100644
> --- a/scripts/common.c
> +++ b/scripts/common.c
> @@ -102,33 +102,26 @@ int write_file(const char *filename, const void *buf, size_t size)
>   {
>   	int fd, ret = 0;
>   	int now;
> -	size_t left = size;
>   
> -	/* The same file may be mmapped currently, so can't use O_TRUNC here */
> -	fd = open(filename, O_WRONLY | O_CREAT,
> +	fd = open(filename, O_WRONLY | O_TRUNC | O_CREAT,
>   		  S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
>   	if (fd < 0) {
>   		fprintf(stderr, "Cannot open %s: %s\n", filename, strerror(errno));
>   		return -errno;
>   	}
>   
> -	while (left) {
> -		now = write(fd, buf, left);
> +	while (size) {
> +		now = write(fd, buf, size);
>   		if (now < 0) {
>   			fprintf(stderr, "Cannot write to %s: %s\n", filename,
>   				strerror(errno));
>   			ret = -errno;
>   			goto out;
>   		}
> -		left -= now;
> +		size -= now;
>   		buf += now;
>   	}
>   
> -	if (ftruncate(fd, size) < 0) {
> -		fprintf(stderr, "Cannot truncate file: %s", strerror(errno));
> -		ret = -errno;
> -	}
> -
>   out:
>   	close(fd);
>