diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 18:16:50 +0100 | 
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 18:16:50 +0100 | 
| commit | e633ccf714eb423c4522924c3b611dac2e176c5e (patch) | |
| tree | 096e7acc625b790e6860fe446f56775d578b60ff | |
| parent | Add NO_OPENSSL option (diff) | |
| parent | shared.c: return original errno (diff) | |
| download | cgit-e633ccf714eb423c4522924c3b611dac2e176c5e.tar.gz cgit-e633ccf714eb423c4522924c3b611dac2e176c5e.tar.bz2 cgit-e633ccf714eb423c4522924c3b611dac2e176c5e.zip | |
Merge branch 'stable'
Diffstat (limited to '')
| -rw-r--r-- | shared.c | 8 | 
1 files changed, 5 insertions, 3 deletions
| @@ -400,15 +400,16 @@ int cgit_close_filter(struct cgit_filter *filter)   */  int readfile(const char *path, char **buf, size_t *size)  { -	int fd; +	int fd, e;  	struct stat st;  	fd = open(path, O_RDONLY);  	if (fd == -1)  		return errno;  	if (fstat(fd, &st)) { +		e = errno;  		close(fd); -		return errno; +		return e;  	}  	if (!S_ISREG(st.st_mode)) {  		close(fd); @@ -416,7 +417,8 @@ int readfile(const char *path, char **buf, size_t *size)  	}  	*buf = xmalloc(st.st_size + 1);  	*size = read_in_full(fd, *buf, st.st_size); +	e = errno;  	(*buf)[*size] = '\0';  	close(fd); -	return (*size == st.st_size ? 0 : errno); +	return (*size == st.st_size ? 0 : e);  } | 
