386BSD 0.1 development

[unix-history] / usr / src / bin / echo / echo.c

diff --git a/usr/src/bin/echo/echo.c b/usr/src/bin/echo/echo.c
index 03dbe69..b6c8262 100644 (file)
--- a/usr/src/bin/echo/echo.c
+++ b/usr/src/bin/echo/echo.c
@@ -1,24 +1,71 @@
-static char *sccsid = "@(#)echo.c      4.1 (Berkeley) %G%";
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)echo.c     5.4 (Berkeley) 4/3/91";
+#endif /* not lint */
+

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>
+#include <string.h>

 
 

+/* ARGSUSED */

 main(argc, argv)
 main(argc, argv)

-int argc;
-char *argv[];
+       int argc;
+       char **argv;

 {
 {

-       register int i, nflg;
+       int nflag;

 
 

-       nflg = 0;
-       if(argc > 1 && argv[1][0] == '-' && argv[1][1] == 'n') {
-               nflg++;
-               argc--;
-               argv++;
+       /* This utility may NOT do getopt(3) option parsing. */
+       if (*++argv && !strcmp(*argv, "-n")) {
+               ++argv;
+               nflag = 1;

        }
        }

-       for(i=1; i<argc; i++) {
-               fputs(argv[i], stdout);
-               if (i < argc-1)
+       else
+               nflag = 0;
+
+       while (*argv) {
+               (void)printf("%s", *argv);
+               if (*++argv)

                        putchar(' ');
        }
                        putchar(' ');
        }

-       if(nflg == 0)
+       if (!nflag)

                putchar('\n');
        exit(0);
 }
                putchar('\n');
        exit(0);
 }