BSD 4_4_Lite1 release

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

diff --git a/usr/src/usr.bin/mesg/mesg.c b/usr/src/usr.bin/mesg/mesg.c
index 7697f58..ad666f7 100644 (file)
--- a/usr/src/usr.bin/mesg/mesg.c
+++ b/usr/src/usr.bin/mesg/mesg.c
@@ -1,32 +1,61 @@
 /*
 /*

- * Copyright (c) 1987 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1987, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.

  *
  *

- * %sccs.include.redist.c%
+ * 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
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1987 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1987, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)mesg.c     5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)mesg.c     8.2 (Berkeley) 1/21/94";

 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 

+#include <err.h>

 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 

-void err __P((const char *fmt, ...));
-void usage __P((void));
-

 int
 main(argc, argv)
        int argc;
 int
 main(argc, argv)
        int argc;


@@ -40,15 +69,15 @@ main(argc, argv)
                switch (ch) {
                case '?':
                default:
                switch (ch) {
                case '?':
                default:

-                       usage();
+                       goto usage;

                }
        argc -= optind;
        argv += optind;
 
        if ((tty = ttyname(STDERR_FILENO)) == NULL)
                }
        argc -= optind;
        argv += optind;
 
        if ((tty = ttyname(STDERR_FILENO)) == NULL)

-               err("ttyname: %s", strerror(errno));
+               err(1, "ttyname");

        if (stat(tty, &sb) < 0)
        if (stat(tty, &sb) < 0)

-               err("%s: %s", strerror(errno));
+               err(1, "%s", tty);

 
        if (*argv == NULL) {
                if (sb.st_mode & S_IWGRP) {
 
        if (*argv == NULL) {
                if (sb.st_mode & S_IWGRP) {


@@ -58,52 +87,18 @@ main(argc, argv)
                (void)fprintf(stderr, "is n\n");
                exit(1);
        }
                (void)fprintf(stderr, "is n\n");
                exit(1);
        }

+

        switch (*argv[0]) {
        case 'y':
                if (chmod(tty, sb.st_mode | S_IWGRP) < 0)
        switch (*argv[0]) {
        case 'y':
                if (chmod(tty, sb.st_mode | S_IWGRP) < 0)

-                       err("%s: %s", strerror(errno));
+                       err(1, "%s", tty);

                exit(0);
        case 'n':
                if (chmod(tty, sb.st_mode & ~S_IWGRP) < 0)
                exit(0);
        case 'n':
                if (chmod(tty, sb.st_mode & ~S_IWGRP) < 0)

-                       err("%s: %s", strerror(errno));
+                       err(1, "%s", tty);

                exit(1);
        }
                exit(1);
        }

-       usage();
-       /* NOTREACHED */
-}
-
-void
-usage()
-{
-       (void)fprintf(stderr, "usage: mesg [y | n]\n");
-       exit(2);
-}

 
 

-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-void
-#if __STDC__
-err(const char *fmt, ...)
-#else
-err(fmt, va_alist)
-       char *fmt;
-       va_dcl
-#endif
-{
-       va_list ap;
-#if __STDC__
-       va_start(ap, fmt);
-#else
-       va_start(ap);
-#endif
-       (void)fprintf(stderr, "mesg: ");
-       (void)vfprintf(stderr, fmt, ap);
-       va_end(ap);
-       (void)fprintf(stderr, "\n");
+usage: (void)fprintf(stderr, "usage: mesg [y | n]\n");

        exit(2);
        exit(2);

-       /* NOTREACHED */

 }
 }