[Midnightbsd-cvs] src [10371] trunk/usr.sbin/ngctl: tag
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jun 3 19:16:32 EDT 2018
Revision: 10371
http://svnweb.midnightbsd.org/src/?rev=10371
Author: laffer1
Date: 2018-06-03 19:16:31 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
tag
Modified Paths:
--------------
trunk/usr.sbin/ngctl/Makefile
trunk/usr.sbin/ngctl/config.c
trunk/usr.sbin/ngctl/connect.c
trunk/usr.sbin/ngctl/debug.c
trunk/usr.sbin/ngctl/dot.c
trunk/usr.sbin/ngctl/list.c
trunk/usr.sbin/ngctl/main.c
trunk/usr.sbin/ngctl/mkpeer.c
trunk/usr.sbin/ngctl/msg.c
trunk/usr.sbin/ngctl/name.c
trunk/usr.sbin/ngctl/ngctl.8
trunk/usr.sbin/ngctl/ngctl.h
trunk/usr.sbin/ngctl/rmhook.c
trunk/usr.sbin/ngctl/show.c
trunk/usr.sbin/ngctl/shutdown.c
trunk/usr.sbin/ngctl/status.c
trunk/usr.sbin/ngctl/types.c
trunk/usr.sbin/ngctl/write.c
Property Changed:
----------------
trunk/usr.sbin/ngctl/ngctl.8
Modified: trunk/usr.sbin/ngctl/Makefile
===================================================================
--- trunk/usr.sbin/ngctl/Makefile 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/Makefile 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.22 2007/10/09 23:31:11 obrien Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/ngctl/Makefile 177714 2008-03-29 17:44:40Z ru $
# $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $
.include <bsd.own.mk>
@@ -13,7 +14,7 @@
NGCTL_NO_LIBEDIT=
.endif
-.if ${MK_LIBTHR} == "no" && ${MK_LIBKSE} == "no"
+.if ${MK_LIBTHR} == "no"
NGCTL_NO_LIBEDIT=
.endif
Modified: trunk/usr.sbin/ngctl/config.c
===================================================================
--- trunk/usr.sbin/ngctl/config.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/config.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* config.c
*
@@ -33,7 +34,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/config.c,v 1.6 2006/07/17 08:35:47 stefanf Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/config.c 160423 2006-07-17 08:35:47Z stefanf $
*/
#include <err.h>
Modified: trunk/usr.sbin/ngctl/connect.c
===================================================================
--- trunk/usr.sbin/ngctl/connect.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/connect.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* connect.c
@@ -34,7 +35,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/connect.c,v 1.5 2006/06/28 10:38:38 glebius Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/connect.c 160002 2006-06-28 10:38:38Z glebius $
*/
#include <err.h>
Modified: trunk/usr.sbin/ngctl/debug.c
===================================================================
--- trunk/usr.sbin/ngctl/debug.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/debug.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* debug.c
@@ -34,7 +35,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/debug.c,v 1.5 2006/07/17 08:35:47 stefanf Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/debug.c 160423 2006-07-17 08:35:47Z stefanf $
*/
#include <netgraph.h>
Modified: trunk/usr.sbin/ngctl/dot.c
===================================================================
--- trunk/usr.sbin/ngctl/dot.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/dot.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* dot.c
@@ -35,7 +36,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/dot.c,v 1.5 2007/02/06 08:48:28 kevlo Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/dot.c 166529 2007-02-06 08:48:28Z kevlo $
*/
#include <err.h>
Modified: trunk/usr.sbin/ngctl/list.c
===================================================================
--- trunk/usr.sbin/ngctl/list.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/list.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* list.c
@@ -34,7 +35,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/list.c,v 1.9 2007/02/06 08:48:28 kevlo Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/list.c 166529 2007-02-06 08:48:28Z kevlo $
*/
#include <err.h>
Modified: trunk/usr.sbin/ngctl/main.c
===================================================================
--- trunk/usr.sbin/ngctl/main.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/main.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* main.c
@@ -34,10 +35,12 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/main.c,v 1.23 2007/02/06 08:48:28 kevlo Exp $
* $Whistle: main.c,v 1.12 1999/11/29 19:17:46 archie Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: stable/10/usr.sbin/ngctl/main.c 277577 2015-01-23 17:49:16Z glebius $");
+
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/select.h>
@@ -69,7 +72,7 @@
/* Internal functions */
static int ReadFile(FILE *fp);
static void ReadSockets(fd_set *);
-static int DoParseCommand(char *line);
+static int DoParseCommand(const char *line);
static int DoCommand(int ac, char **av);
static int DoInteractive(void);
static const struct ngcmd *FindCommand(const char *string);
@@ -79,7 +82,7 @@
static int HelpCmd(int ac, char **av);
static int QuitCmd(int ac, char **av);
#ifdef EDITLINE
-static sig_atomic_t unblock;
+static volatile sig_atomic_t unblock;
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
#endif
@@ -225,7 +228,7 @@
#ifdef EDITLINE
/* Signal handler for Monitor() thread. */
static void
-Unblock(int signal)
+Unblock(int signal __unused)
{
unblock = 1;
@@ -236,7 +239,7 @@
* can be blocked in el_gets().
*/
static void *
-Monitor(void *v)
+Monitor(void *v __unused)
{
struct sigaction act;
const int maxfd = MAX(csock, dsock) + 1;
@@ -270,7 +273,7 @@
}
static char *
-Prompt(EditLine *el)
+Prompt(EditLine *el __unused)
{
return (PROMPT);
@@ -322,8 +325,10 @@
history(hist, &hev, H_ENTER, buf);
pthread_kill(monitor, SIGUSR1);
pthread_mutex_lock(&mutex);
- if (DoParseCommand((char *)buf) == CMDRTN_QUIT)
+ if (DoParseCommand(buf) == CMDRTN_QUIT) {
+ pthread_mutex_unlock(&mutex);
break;
+ }
pthread_cond_signal(&cond);
pthread_mutex_unlock(&mutex);
}
@@ -423,13 +428,13 @@
* Parse a command line and execute the command
*/
static int
-DoParseCommand(char *line)
+DoParseCommand(const char *line)
{
char *av[MAX_ARGS];
int ac;
/* Parse line */
- for (ac = 0, av[0] = strtok(line, WHITESPACE);
+ for (ac = 0, av[0] = strtok((char *)line, WHITESPACE);
ac < MAX_ARGS - 1 && av[ac];
av[++ac] = strtok(NULL, WHITESPACE));
Modified: trunk/usr.sbin/ngctl/mkpeer.c
===================================================================
--- trunk/usr.sbin/ngctl/mkpeer.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/mkpeer.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* mkpeer.c
@@ -34,7 +35,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/mkpeer.c,v 1.5 2006/07/17 08:35:47 stefanf Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/mkpeer.c 160423 2006-07-17 08:35:47Z stefanf $
*/
#include <err.h>
Modified: trunk/usr.sbin/ngctl/msg.c
===================================================================
--- trunk/usr.sbin/ngctl/msg.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/msg.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* msg.c
@@ -35,9 +36,11 @@
* OF SUCH DAMAGE.
*
* $Whistle: msg.c,v 1.2 1999/11/29 23:38:35 archie Exp $
- * $FreeBSD: src/usr.sbin/ngctl/msg.c,v 1.8 2006/09/21 01:48:47 kan Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: stable/10/usr.sbin/ngctl/msg.c 216588 2010-12-20 09:36:54Z charnier $");
+
#include <err.h>
#include <netgraph.h>
#include <stdio.h>
@@ -121,7 +124,7 @@
* Read and display the next incoming control message
*/
void
-MsgRead()
+MsgRead(void)
{
struct ng_mesg *m, *m2;
struct ng_mesg *ascii;
Modified: trunk/usr.sbin/ngctl/name.c
===================================================================
--- trunk/usr.sbin/ngctl/name.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/name.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* name.c
@@ -34,7 +35,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/name.c,v 1.5 2006/07/17 08:35:47 stefanf Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/name.c 160423 2006-07-17 08:35:47Z stefanf $
*/
#include <err.h>
Modified: trunk/usr.sbin/ngctl/ngctl.8
===================================================================
--- trunk/usr.sbin/ngctl/ngctl.8 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/ngctl.8 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1996-1999 Whistle Communications, Inc.
.\" All rights reserved.
.\"
@@ -30,7 +31,7 @@
.\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
.\" OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.16 2005/01/17 07:44:42 ru Exp $
+.\" $FreeBSD: stable/10/usr.sbin/ngctl/ngctl.8 140368 2005-01-17 07:44:44Z ru $
.\" $Whistle: ngctl.8,v 1.6 1999/01/20 03:19:44 archie Exp $
.\"
.Dd January 19, 1999
Property changes on: trunk/usr.sbin/ngctl/ngctl.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/ngctl/ngctl.h
===================================================================
--- trunk/usr.sbin/ngctl/ngctl.h 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/ngctl.h 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* ngctl.h
@@ -34,7 +35,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/ngctl.h,v 1.13 2006/05/24 14:46:55 glebius Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/ngctl.h 158882 2006-05-24 14:46:55Z glebius $
*/
#define MAX_CMD_ALIAS 8
Modified: trunk/usr.sbin/ngctl/rmhook.c
===================================================================
--- trunk/usr.sbin/ngctl/rmhook.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/rmhook.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* rmhook.c
@@ -34,7 +35,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/rmhook.c,v 1.5 2006/06/28 10:38:38 glebius Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/rmhook.c 160002 2006-06-28 10:38:38Z glebius $
*/
#include <err.h>
Modified: trunk/usr.sbin/ngctl/show.c
===================================================================
--- trunk/usr.sbin/ngctl/show.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/show.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* show.c
@@ -34,7 +35,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/show.c,v 1.7 2007/02/06 08:48:28 kevlo Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/show.c 166529 2007-02-06 08:48:28Z kevlo $
*/
#include <err.h>
Modified: trunk/usr.sbin/ngctl/shutdown.c
===================================================================
--- trunk/usr.sbin/ngctl/shutdown.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/shutdown.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* shutdown.c
@@ -34,7 +35,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/shutdown.c,v 1.4 2006/06/28 10:38:38 glebius Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/shutdown.c 160002 2006-06-28 10:38:38Z glebius $
*/
#include <err.h>
Modified: trunk/usr.sbin/ngctl/status.c
===================================================================
--- trunk/usr.sbin/ngctl/status.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/status.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* status.c
@@ -34,7 +35,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/status.c,v 1.5 2006/07/17 08:35:47 stefanf Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/status.c 160423 2006-07-17 08:35:47Z stefanf $
*/
#include <err.h>
Modified: trunk/usr.sbin/ngctl/types.c
===================================================================
--- trunk/usr.sbin/ngctl/types.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/types.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* types.c
@@ -34,7 +35,7 @@
* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/types.c,v 1.7 2006/07/17 08:35:47 stefanf Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/types.c 160423 2006-07-17 08:35:47Z stefanf $
*/
#include <err.h>
Modified: trunk/usr.sbin/ngctl/write.c
===================================================================
--- trunk/usr.sbin/ngctl/write.c 2018-06-03 23:15:31 UTC (rev 10370)
+++ trunk/usr.sbin/ngctl/write.c 2018-06-03 23:16:31 UTC (rev 10371)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* write.c
@@ -30,7 +31,7 @@
* THIS SOFTWARE, EVEN IF ARCHIE L. COBBS IS ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/ngctl/write.c,v 1.3 2006/06/28 10:38:38 glebius Exp $
+ * $FreeBSD: stable/10/usr.sbin/ngctl/write.c 160002 2006-06-28 10:38:38Z glebius $
*/
#include <sys/types.h>
More information about the Midnightbsd-cvs
mailing list