=================================================================== RCS file: /cvs/djgpp/djgpp/src/utils/Attic/echo.c,v retrieving revision 1.1 retrieving revision 1.2 diff -p -u -r1.1 -r1.2 --- djgpp/src/utils/Attic/echo.c 1995/07/13 01:48:10 1.1 +++ /cvs/djgpp/djgpp/src/utils/Attic/echo.c 1996/08/12 22:55:54 1.2 @@ -1,3 +1,4 @@ +/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include @@ -7,6 +8,8 @@ main(int argc, char **argv) int i; int nflag=0; FILE *out = stdout; + char sep = ' '; + while (argc > 1 && argv[1][0] == '-') { if ((argc > 2) && (strcmp(argv[1], "-o") == 0)) @@ -20,7 +23,7 @@ main(int argc, char **argv) argc -= 2; argv += 2; } - if ((argc > 2) && (strcmp(argv[1], "-a") == 0)) + else if ((argc > 2) && (strcmp(argv[1], "-a") == 0)) { out = fopen(argv[2], "a"); if (!out) @@ -31,16 +34,27 @@ main(int argc, char **argv) argc -= 2; argv += 2; } - if ((argc > 1) && (strcmp(argv[1], "-n") == 0)) + else if ((argc > 1) && (strcmp(argv[1], "-n") == 0)) { nflag = 1; argc--; argv++; } + else if ((argc > 1) && (strcmp(argv[1], "-s") == 0)) + { + sep = '\n'; + argc--; + argv++; + } + else + { + fprintf(stderr, "Usage: echo [-o file] [-a file] [-n] [-s] args...\n"); + return 1; + } } for (i=1; i1) fputc(' ', out); + if (i>1) fputc(sep, out); fputs(argv[i], out); } if (!nflag)