Changeset 33415 for branches/meh_branches/ppstack_test/Ohana/src/opihi/cmd.basic/echo.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/cmd.basic/echo.c (modified) (2 diffs)

branches/meh_branches/ppstack_test/Ohana/src/opihi/cmd.basic/echo.c

@@ -3 +3 @@
 int echo (int argc, char **argv) {
   
-  int i;
+  int i, N, RETURN_CHAR;
+
+  RETURN_CHAR = TRUE;
+  if ((N = get_argument (argc, argv, "-no-return"))) {
+    remove_argument (N, &argc, argv);
+    RETURN_CHAR = FALSE;
+  }
 
   for (i = 1; i < argc - 1; i++) {
@@ -9 +15 @@
   }
   if (argc >= 2) {
+    if (RETURN_CHAR) {
       gprint (GP_LOG, "%s\n", argv[argc - 1]);
+    } else {
+      gprint (GP_LOG, "%s", argv[argc - 1]);
+    }
   }
   return (TRUE);