|
 |
b1047b |
diff --git a/tshark.c b/tshark.c
|
|
|
b1047b |
index 8c8de07..8cc4fae 100644
|
|
|
b1047b |
--- a/tshark.c
|
|
|
b1047b |
+++ b/tshark.c
|
|
|
b1047b |
@@ -286,7 +286,7 @@ print_usage(gboolean print_ver)
|
|
|
b1047b |
#endif
|
|
|
b1047b |
/*fprintf(output, "\n");*/
|
|
|
b1047b |
fprintf(output, "Input file:\n");
|
|
|
b1047b |
- fprintf(output, " -r <infile> set the filename to read from (no pipes or stdin!)\n");
|
|
|
b1047b |
+ fprintf(output, " -r <infile> set the filename to read from (no stdin!)\n");
|
|
|
b1047b |
|
|
|
b1047b |
fprintf(output, "\n");
|
|
|
b1047b |
fprintf(output, "Processing:\n");
|
|
|
b1047b |
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c
|
|
|
b1047b |
index c670c6e..e359cd7 100644
|
|
|
b1047b |
--- a/wiretap/file_wrappers.c
|
|
|
b1047b |
+++ b/wiretap/file_wrappers.c
|
|
|
b1047b |
@@ -1046,7 +1046,8 @@ file_seek(FILE_T file, gint64 offset, int whence, int *err)
|
|
|
b1047b |
|
|
|
b1047b |
/* if within raw area while reading, just go there */
|
|
|
b1047b |
if (file->compression == UNCOMPRESSED && file->pos + offset >= file->raw
|
|
|
b1047b |
- && (offset < 0 || offset >= file->have) /* seek only when we don't have that offset in buffer */)
|
|
|
b1047b |
+ && (offset < 0 || offset >= file->have) /* seek only when we don't have that offset in buffer */
|
|
|
b1047b |
+ && (file->fast_seek) /* seek only when random access is supported */)
|
|
|
b1047b |
{
|
|
|
b1047b |
if (ws_lseek64(file->fd, offset - file->have, SEEK_CUR) == -1) {
|
|
|
b1047b |
*err = errno;
|