[Oorexx-svn] SF.net SVN: oorexx:[5598] main/branches/4.0.1/trunk

[<bi...@us...>]

Revision: 5598
          http://oorexx.svn.sourceforge.net/oorexx/?rev=5598&view=rev
Author:   bigrixx
Date:     2010-02-23 15:15:18 +0000 (Tue, 23 Feb 2010)

Log Message:
-----------
make windows and unix rexx -v behave consistently

Modified Paths:
--------------
    main/branches/4.0.1/trunk/utilities/rexx/platform/unix/rexx.cpp
    main/branches/4.0.1/trunk/utilities/rexx/platform/windows/rexx.cpp

Property Changed:
----------------
    main/branches/4.0.1/trunk/


Property changes on: main/branches/4.0.1/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /main/trunk:4387,4396-4397,4460,4464,4466,4468,4506,4543-4544,4547,4562,4564,4603,4605,4696,4886,4917,4922,4950-4952,4967,4969,5090,5092-5094,5104,5106,5110,5114,5133,5166,5168,5181,5203-5204,5207-5210,5223,5226,5233,5238,5252,5539
   + /main/trunk:4387,4396-4397,4460,4464,4466,4468,4506,4543-4544,4547,4562,4564,4603,4605,4696,4886,4917,4922,4950-4952,4967,4969,5090,5092-5094,5104,5106,5110,5114,5133,5166,5168,5181,5203-5204,5207-5210,5223,5226,5233,5238,5252,5271-5272,5539

Modified: main/branches/4.0.1/trunk/utilities/rexx/platform/unix/rexx.cpp
===================================================================
--- main/branches/4.0.1/trunk/utilities/rexx/platform/unix/rexx.cpp	2010-02-23 15:11:31 UTC (rev 5597)
+++ main/branches/4.0.1/trunk/utilities/rexx/platform/unix/rexx.cpp	2010-02-23 15:15:18 UTC (rev 5598)
@@ -106,14 +106,14 @@
           instore[1].strptr = NULL;
           instore[1].strlength = 0;
           real_argument = false;
-          break;
+          return 0;
 
         case 'v': case 'V':            /* display version string            */
           ptr = RexxGetVersionInformation();
-          fprintf(stderr, ptr);
-          fprintf(stderr, "\n");
+          fprintf(stdout, ptr);
+          fprintf(stdout, "\n");
           RexxFreeMemory(ptr);
-          break;
+          return 0;
 
         default:                       /* ignore other switches             */
           break;
@@ -135,8 +135,9 @@
   {
                                        /* give a simple error message       */
     fprintf(stderr,"\n");
-    fprintf(stderr,"Syntax is \"rexx [-v] filename [arguments]\"\n");
-    fprintf(stderr,"or        \"rexx [-e] program_string [arguments]\".\n");
+    fprintf(stderr,"Syntax is \"rexx filename [arguments]\"\n");
+    fprintf(stderr,"or        \"rexx -e program_string [arguments]\"\n");
+    fprintf(stderr,"or        \"rexx -v\".\n");
     return -1;
   }
 

Modified: main/branches/4.0.1/trunk/utilities/rexx/platform/windows/rexx.cpp
===================================================================
--- main/branches/4.0.1/trunk/utilities/rexx/platform/windows/rexx.cpp	2010-02-23 15:11:31 UTC (rev 5597)
+++ main/branches/4.0.1/trunk/utilities/rexx/platform/windows/rexx.cpp	2010-02-23 15:15:18 UTC (rev 5598)
@@ -121,7 +121,8 @@
             {
                 char *ptr = RexxGetVersionInformation();
                 if (ptr) {
-                    printf(ptr, "Interpreter");
+                    fprintf(stdout, ptr);
+                    fprintf(stdout, "\n");
                     RexxFreeMemory(ptr);
                 }
             }
@@ -149,8 +150,9 @@
                                        /* give a simple error message       */
     #undef printf
     printf("\n");
-    printf("Syntax: REXX [-v] ProgramName [parameter_1....parameter_n]\n");
-    printf("or    : REXX [-e] ProgramString [parameter_1....parameter_n]\n");
+    fprintf(stderr,"Syntax is \"rexx filename [arguments]\"\n");
+    fprintf(stderr,"or        \"rexx -e program_string [arguments]\"\n");
+    fprintf(stderr,"or        \"rexx -v\".\n");
     return -1;
   }
   else {                               /* real program execution            */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.