16f1f17d67
Add three patches: patch-aa: If you use CHUNK_INPUT without this patch, you end up with many error messages xferstats in free(): warning: modified (chunk-) pointer (or you may want to fix chunks...) patch-ab: If number of "Files Transmitted" is divisible by CHUNK_INPUT without this patch, you end up with error "No data to process." instead of results. patch-ac: Typical beginner's bug in C: feof() is used before read function, where its result is not tested then. Without this patch the last line is counted twice. PR: 44015 Submitted by: Cejka Rudolf <cejkar@fit.vutbr.cz>
84 lines
2 KiB
Text
84 lines
2 KiB
Text
--- parselog.c.orig Sun Oct 13 17:39:55 2002
|
|
+++ parselog.c Sun Oct 13 17:42:12 2002
|
|
@@ -202,15 +202,11 @@
|
|
|
|
while (1) {
|
|
if (pointers->config->use_stdin) {
|
|
- if (feof(stdin))
|
|
+ if (fgets(foo, sizeof(foo), stdin) == NULL)
|
|
break;
|
|
- /* there's probably a better way to do this :) */
|
|
- fgets(foo, sizeof(foo), stdin);
|
|
} else {
|
|
- if (feof(log_stream))
|
|
+ if (fgets(foo, sizeof(foo), log_stream) == NULL)
|
|
break;
|
|
-
|
|
- fgets(foo, sizeof(foo), log_stream);
|
|
}
|
|
|
|
if ((len = strlen(foo)) < 42)
|
|
@@ -455,10 +451,8 @@
|
|
#ifdef HAVE_MMAP
|
|
if (pointers->config->use_stdin)
|
|
{
|
|
- if (feof(stdin))
|
|
+ if (fgets(foo, sizeof(foo), stdin) == NULL)
|
|
break;
|
|
- /* there's probably a better way to do this :) */
|
|
- fgets(foo, sizeof(foo), stdin);
|
|
}
|
|
else
|
|
{
|
|
@@ -497,17 +491,13 @@
|
|
#else /* HAVE_MMAP */
|
|
if (pointers->config->use_stdin)
|
|
{
|
|
- if (feof(stdin))
|
|
+ if (fgets(foo, sizeof(foo), stdin) == NULL)
|
|
break;
|
|
- /* there's probably a better way to do this :) */
|
|
- fgets(foo, sizeof(foo), stdin);
|
|
}
|
|
else
|
|
{
|
|
- if (feof(log_stream))
|
|
+ if (fgets(foo, sizeof(foo), log_stream) == NULL)
|
|
break;
|
|
-
|
|
- fgets(foo, sizeof(foo), log_stream);
|
|
}
|
|
#endif /* HAVE_MMAP */
|
|
|
|
@@ -770,10 +760,8 @@
|
|
#ifdef HAVE_MMAP
|
|
if (pointers->config->use_stdin)
|
|
{
|
|
- if (feof(stdin))
|
|
+ if (fgets(foo, sizeof(foo), stdin) == NULL)
|
|
break;
|
|
- /* there's probably a better way to do this :) */
|
|
- fgets(foo, 2047, stdin);
|
|
}
|
|
else
|
|
{
|
|
@@ -812,17 +800,13 @@
|
|
#else /* HAVE_MMAP */
|
|
if (pointers->config->use_stdin)
|
|
{
|
|
- if (feof(stdin))
|
|
+ if (fgets(foo, sizeof(foo), stdin) == NULL)
|
|
break;
|
|
- /* there's probably a better way to do this :) */
|
|
- fgets(foo, 2047, stdin);
|
|
}
|
|
else
|
|
{
|
|
- if (feof(log_stream))
|
|
+ if (fgets(foo, sizeof(foo), log_stream) == NULL)
|
|
break;
|
|
-
|
|
- fgets(foo, sizeof(foo), log_stream);
|
|
}
|
|
#endif /* HAVE_MMAP */
|
|
|