From owner-svn-src-head@freebsd.org  Sat Jan  6 07:48:18 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96EE2EC669E;
 Sat,  6 Jan 2018 07:48:18 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 726127AE06;
 Sat,  6 Jan 2018 07:48:18 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B3473F8C6;
 Sat,  6 Jan 2018 07:48:17 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w067mHp3059226;
 Sat, 6 Jan 2018 07:48:17 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w067mH17059225;
 Sat, 6 Jan 2018 07:48:17 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201801060748.w067mH17059225@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eadler set sender to
 eadler@FreeBSD.org using -f
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 6 Jan 2018 07:48:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327615 - head/usr.bin/morse
X-SVN-Group: head
X-SVN-Commit-Author: eadler
X-SVN-Commit-Paths: head/usr.bin/morse
X-SVN-Commit-Revision: 327615
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jan 2018 07:48:18 -0000

Author: eadler
Date: Sat Jan  6 07:48:17 2018
New Revision: 327615
URL: https://svnweb.freebsd.org/changeset/base/327615

Log:
  morse(6): minor nits
  
  - Use copyright comment header
  - Make it easier to compile on !FreeBSD
  - Diff reduction against DragonFlyBSD

Modified:
  head/usr.bin/morse/morse.c

Modified: head/usr.bin/morse/morse.c
==============================================================================
--- head/usr.bin/morse/morse.c	Sat Jan  6 07:02:24 2018	(r327614)
+++ head/usr.bin/morse/morse.c	Sat Jan  6 07:48:17 2018	(r327615)
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -57,8 +57,10 @@ static const char rcsid[] =
 #include <termios.h>
 #include <unistd.h>
 
+#ifdef __FreeBSD__
 /* Always use the speaker, let the open fail if -p is selected */
 #define SPEAKER "/dev/speaker"
+#endif
 
 #define WHITESPACE " \t\n"
 #define DELIMITERS " \t"
@@ -307,7 +309,7 @@ static tone_t	sound;
 static const struct morsetab *hightab;
 
 int
-main(int argc, char **argv)
+main(int argc, char *argv[])
 {
 	int    ch, lflags;
 	char  *p, *codeset;