* support/rotatelogs.c (main): Exit with success on EOF.

notroj · notroj · commit fe03ef579b06 · 2011-06-27T16:16:56.000Z
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1140226 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/support/rotatelogs.c b/support/rotatelogs.c
@@ -607,7 +607,10 @@ int main (int argc, const char * const argv[])
     for (;;) {
         nRead = sizeof(buf);
         rv = apr_file_read(f_stdin, buf, &nRead);
-        if (rv != APR_SUCCESS) {
+        if (APR_STATUS_IS_EOF(rv)) {
+            break;
+        }
+        else if (rv != APR_SUCCESS) {
             exit(3);
         }
         checkRotate(&config, &status);
@@ -659,6 +662,6 @@ int main (int argc, const char * const argv[])
             }
         }
     }
-    /* Of course we never, but prevent compiler warnings */
-    return 0;
+
+    return 0; /* reached only at stdin EOF. */
 }

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,10 @@ int main (int argc, const char * const argv[])`
`607`	`607`	`for (;;) {`
`608`	`608`	`nRead = sizeof(buf);`
`609`	`609`	`rv = apr_file_read(f_stdin, buf, &nRead);`
`610`		`- if (rv != APR_SUCCESS) {`
	`610`	`+ if (APR_STATUS_IS_EOF(rv)) {`
	`611`	`+ break;`
	`612`	`+ }`
	`613`	`+ else if (rv != APR_SUCCESS) {`
`611`	`614`	`exit(3);`
`612`	`615`	`}`
`613`	`616`	`checkRotate(&config, &status);`
`@@ -659,6 +662,6 @@ int main (int argc, const char * const argv[])`
`659`	`662`	`}`
`660`	`663`	`}`
`661`	`664`	`}`
`662`		`- /* Of course we never, but prevent compiler warnings */`
`663`		`- return 0;`
	`665`	`+`
	`666`	`+ return 0; /* reached only at stdin EOF. */`
`664`	`667`	`}`