--- evms-2.1.0/ui/cli/evms.c	2003-07-17 14:32:37 +0300

+++ evms-2.1.0/ui/cli/evms.c.new	2003-07-17 14:49:43 +0300

@@ -72,6 +72,8 @@

                                                         functions allow the EVMS Engine to provide status and error messages

                                                         for display to the user during complicated operations.               */

+static boolean awpipe = FALSE;

+

 /*--------------------------------------------------

  * Private Constants

  --------------------------------------------------*/

@@ -561,6 +563,11 @@

           continue;

         }

+	if (strcmp("--pipe", Token) == 0) {

+		awpipe = TRUE;

+		continue;

+	}

+	

         /* We have an unrecognized command line parameter! */

         printf("\n\n%s is not a valid command line parameter.  \n\nUse -h to get a list of the valid command line parameters.\n\n",Token);

         exit(EINVAL);

@@ -766,7 +773,14 @@

       memset(CommandLine, 0, sizeof(CommandLine));

 #ifdef USE_READLINE

-      line = readline("EVMS: ");

+      if (!awpipe) {

+	      line = readline("EVMS: ");

+      } else {

+	      line = readline("EVMS:\n");

+	      fflush(stdout);

+	      fflush(stderr);

+      }

+	      

       if (line)

       {

         strncpy(CommandLine, line, sizeof(CommandLine) - 1);

@@ -775,8 +789,14 @@

 #else

       /* Put out our command prompt. */

-      My_Printf("EVMS: ");

-

+      if (!awpipe) {

+	      printf("EVMS: ");

+      } else {

+	      printf("EVMS:\n");

+	      fflush(stdout);

+	      fflush(stderr);

+      }

+      

       /* Get a command line from the user. */

       fgets(CommandLine, sizeof(CommandLine), stdin);

@@ -1068,8 +1088,14 @@

         }

         My_Printf("\nThe default choice is marked with an *.\n");

-        My_Printf("Please enter the number corresponding to your choice: ");

-

+	if (!awpipe) {

+		printf("Please enter the number corresponding to your choice: ");

+	} else {

+		printf("Please enter the number corresponding to your choice:\n");

+		fflush(stdout);

+		fflush(stderr);

+	}

+	

         /* Get the user's choice. */

         Bad_Characters = NULL;

         UserChoice = 0;