projects
/
ltt-control.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lttd: 0.75, improve error handling of file open
[ltt-control.git]
/
lttd
/
lttd.c
diff --git
a/lttd/lttd.c
b/lttd/lttd.c
index 61d24688f4283170f8cf98cb3ffe0b5075305d7c..b2e7127833141da0f66515918f73af51444398d1 100644
(file)
--- a/
lttd/lttd.c
+++ b/
lttd/lttd.c
@@
-320,15
+320,26
@@
int open_buffer_file(char *filename, char *path_channel, char *path_trace,
S_IRWXU|S_IRWXG|S_IRWXO);
if(fd_pairs->pair[fd_pairs->num_pairs-1].trace == -1) {
perror(path_trace);
S_IRWXU|S_IRWXG|S_IRWXO);
if(fd_pairs->pair[fd_pairs->num_pairs-1].trace == -1) {
perror(path_trace);
+ open_ret = -1;
+ close(fd_pairs->pair[fd_pairs->num_pairs-1].channel);
+ fd_pairs->num_pairs--;
+ goto end;
}
ret = lseek(fd_pairs->pair[fd_pairs->num_pairs-1].trace,
0, SEEK_END);
if (ret < 0) {
perror(path_trace);
}
ret = lseek(fd_pairs->pair[fd_pairs->num_pairs-1].trace,
0, SEEK_END);
if (ret < 0) {
perror(path_trace);
+ open_ret = -1;
+ close(fd_pairs->pair[fd_pairs->num_pairs-1].channel);
+ close(fd_pairs->pair[fd_pairs->num_pairs-1].trace);
+ fd_pairs->num_pairs--;
+ goto end;
}
} else {
printf("File %s exists, cannot open. Try append mode.\n", path_trace);
open_ret = -1;
}
} else {
printf("File %s exists, cannot open. Try append mode.\n", path_trace);
open_ret = -1;
+ close(fd_pairs->pair[fd_pairs->num_pairs-1].channel);
+ fd_pairs->num_pairs--;
goto end;
}
} else {
goto end;
}
} else {
@@
-338,6
+349,10
@@
int open_buffer_file(char *filename, char *path_channel, char *path_trace,
S_IRWXU|S_IRWXG|S_IRWXO);
if(fd_pairs->pair[fd_pairs->num_pairs-1].trace == -1) {
perror(path_trace);
S_IRWXU|S_IRWXG|S_IRWXO);
if(fd_pairs->pair[fd_pairs->num_pairs-1].trace == -1) {
perror(path_trace);
+ open_ret = -1;
+ close(fd_pairs->pair[fd_pairs->num_pairs-1].channel);
+ fd_pairs->num_pairs--;
+ goto end;
}
}
}
}
}
}
This page took
0.022967 seconds
and
4
git commands to generate.