diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-05-02 22:02:27 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-05-02 22:02:27 +0000 |
| commit | 7460ff63b6ca645c3c455e2ccab7e6e28b6064d0 (patch) | |
| tree | 4d1053c0a8e646fdec513e9dfeca55333cec6a34 | |
| parent | f67c59cf7f50288c6d2bb069cbf2975391f904d6 (diff) | |
| download | ATCD-7460ff63b6ca645c3c455e2ccab7e6e28b6064d0.tar.gz | |
ChangeLogTag: Thu May 2 16:53:43 2002 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/utils/catior/catior.cpp | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 6fb667a832c..0a7affef729 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Thu May 2 16:53:43 2002 Balachandran Natarajan <bala@cs.wustl.edu> + + * utils/catior/catior.cpp (main): An file with an IOR and a "\n" + confused the "catior" into thinking that there is one more IOR + in this file. Fix to rectify this. Thanks to Gautam Thaker + <gthaker@atl.lmco.com> for the fix. + Thu May 2 07:56:24 2002 Chad Elliott <elliott_c@ociweb.com> * tests/Queued_Message_Test/Queued_Message_Test.cpp: diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index ccd923a698d..502ea5dc8c6 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -448,6 +448,7 @@ main (int argc, char *argv[]) return -1; } + int have_some_input = 0; while (!ifstr.eof()) { char ch; @@ -459,8 +460,10 @@ main (int argc, char *argv[]) if (ch == '\n' || ifstr.eof ()) break; aString += ch; + have_some_input = 1; } - + if (have_some_input == 0) + break; ACE_DEBUG ((LM_DEBUG, "\nhere is the IOR\n%s\n\n", aString.rep ())); |