mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-03 15:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Uemis downloader: don't ignore return values from fs operations

Browse source 
In most cases the existing code might have done the right thing, but some
of the hard to reproduce errors might actually stem from the fact that we
have intermittend fs errors. Maybe this addresses things?

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-03-05 18:27:33 -08:00
parent 1b103c5c69
commit e1a1c218c4
1 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
uemis-downloader.c
View file

@ -134,6 +134,8 @@ static long bytes_available(int file)
long now = lseek(file, 0, SEEK_CUR); long now = lseek(file, 0, SEEK_CUR);
result = lseek(file, 0, SEEK_END); result = lseek(file, 0, SEEK_END);
lseek(file, now, SEEK_SET); lseek(file, now, SEEK_SET);
if (now == -1 || result == -1)
return 0;
return result; return result;
} }
@ -249,13 +251,18 @@ static void trigger_response(int file, char *command, int nr, long tailpos)
#if UEMIS_DEBUG & 4 #if UEMIS_DEBUG & 4
fprintf(debugfile, ":tr %s (after seeks)\n", fl); fprintf(debugfile, ":tr %s (after seeks)\n", fl);
#endif #endif
lseek(file, 0, SEEK_SET); if (lseek(file, 0, SEEK_SET) == -1)
write(file, fl, strlen(fl)); goto fs_error;
lseek(file, tailpos, SEEK_SET); if (write(file, fl, strlen(fl)) == -1)
write(file, fl + 1, strlen(fl + 1)); goto fs_error;
if (lseek(file, tailpos, SEEK_SET) == -1)
goto fs_error;
if (write(file, fl + 1, strlen(fl + 1)) == -1)
goto fs_error;
#ifndef WIN32 #ifndef WIN32
fsync(file); fsync(file);
#endif #endif
fs_error:
close(file); close(file);
} }
@ -491,10 +498,16 @@ static bool uemis_get_answer(const char *path, char *request, int n_param_in,
ans_file = subsurface_open(ans_path, O_RDONLY, 0666); ans_file = subsurface_open(ans_path, O_RDONLY, 0666);
size = bytes_available(ans_file); size = bytes_available(ans_file);
if (size > 3) { if (size > 3) {
char *buf = malloc(size - 2); char *buf;
lseek(ans_file, 3, SEEK_CUR); int r;
read(ans_file, buf, size - 3); if (lseek(ans_file, 3, SEEK_CUR) == -1)
buf[size - 3] = '\0'; goto fs_error;
buf = malloc(size - 2);
if ((r = read(ans_file, buf, size - 3) != size - 3)) {
free(buf);
goto fs_error;
}
buf[r] = '\0';
buffer_add(&mbuf, &mbuf_size, buf); buffer_add(&mbuf, &mbuf_size, buf);
show_progress(buf, what); show_progress(buf, what);
free(buf); free(buf);
@ -515,10 +528,15 @@ static bool uemis_get_answer(const char *path, char *request, int n_param_in,
ans_file = subsurface_open(ans_path, O_RDONLY, 0666); ans_file = subsurface_open(ans_path, O_RDONLY, 0666);
size = bytes_available(ans_file); size = bytes_available(ans_file);
if (size > 3) { if (size > 3) {
int r;
if (lseek(ans_file, 3, SEEK_CUR) == -1)
goto fs_error;
buf = malloc(size - 2); buf = malloc(size - 2);
lseek(ans_file, 3, SEEK_CUR); if ((r = read(ans_file, buf, size - 3)) != size - 3) {
read(ans_file, buf, size - 3); free(buf);
buf[size - 3] = '\0'; goto fs_error;
}
buf[r] = '\0';
buffer_add(&mbuf, &mbuf_size, buf); buffer_add(&mbuf, &mbuf_size, buf);
show_progress(buf, what); show_progress(buf, what);
#if UEMIS_DEBUG & 8 #if UEMIS_DEBUG & 8
@ -545,6 +563,8 @@ static bool uemis_get_answer(const char *path, char *request, int n_param_in,
fprintf(debugfile, "::: %d: %s\n", i, param_buff[i]); fprintf(debugfile, "::: %d: %s\n", i, param_buff[i]);
#endif #endif
return found_answer; return found_answer;
fs_error:
return false;
} }
static void parse_divespot(char *buf) static void parse_divespot(char *buf)