1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
--- 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 */
|
