[Midnightbsd-cvs] src [10825] sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 10825
          http://svnweb.midnightbsd.org/src/?rev=10825
Author:   laffer1
Date:     2018-06-10 16:25:20 -0400 (Sun, 10 Jun 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/usr.sbin/crunch/crunchgen/Makefile
    trunk/usr.sbin/crunch/crunchgen/crunched_main.c
    trunk/usr.sbin/crunch/crunchgen/crunchgen.1
    trunk/usr.sbin/crunch/crunchgen/crunchgen.c

Property Changed:
----------------
    trunk/usr.sbin/crunch/crunchgen/crunchgen.1
    trunk/usr.sbin/crunch/crunchgen/mkskel.sh

Modified: trunk/usr.sbin/crunch/crunchgen/Makefile
===================================================================
--- trunk/usr.sbin/crunch/crunchgen/Makefile	2018-06-10 20:25:03 UTC (rev 10824)
+++ trunk/usr.sbin/crunch/crunchgen/Makefile	2018-06-10 20:25:20 UTC (rev 10825)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/crunch/crunchgen/Makefile 80029 2001-07-20 06:20:32Z obrien $
 
 PROG=	crunchgen
 SRCS=	crunchgen.c crunched_skel.c

Modified: trunk/usr.sbin/crunch/crunchgen/crunched_main.c
===================================================================
--- trunk/usr.sbin/crunch/crunchgen/crunched_main.c	2018-06-10 20:25:03 UTC (rev 10824)
+++ trunk/usr.sbin/crunch/crunchgen/crunched_main.c	2018-06-10 20:25:20 UTC (rev 10825)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1994 University of Maryland
  * All Rights Reserved.
@@ -22,8 +23,6 @@
  * Author: James da Silva, Systems Design and Analysis Group
  *			   Computer Science Department
  *			   University of Maryland at College Park
- *
- * $MidnightBSD$
  */
 /*
  * crunched_main.c - main program for crunched binaries, it branches to a
@@ -35,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/crunch/crunchgen/crunched_main.c 237625 2012-06-27 04:39:30Z obrien $");
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/usr.sbin/crunch/crunchgen/crunchgen.1
===================================================================
--- trunk/usr.sbin/crunch/crunchgen/crunchgen.1	2018-06-10 20:25:03 UTC (rev 10824)
+++ trunk/usr.sbin/crunch/crunchgen/crunchgen.1	2018-06-10 20:25:20 UTC (rev 10825)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\"
 .\" Copyright (c) 1994 University of Maryland
 .\" All Rights Reserved.
@@ -22,7 +23,7 @@
 .\" Author: James da Silva, Systems Design and Analysis Group
 .\"			   Computer Science Department
 .\"			   University of Maryland at College Park
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/crunch/crunchgen/crunchgen.1 213573 2010-10-08 12:40:16Z uqs $
 .\"
 .Dd December 23, 2005
 .Dt CRUNCHGEN 1


Property changes on: trunk/usr.sbin/crunch/crunchgen/crunchgen.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/crunch/crunchgen/crunchgen.c
===================================================================
--- trunk/usr.sbin/crunch/crunchgen/crunchgen.c	2018-06-10 20:25:03 UTC (rev 10824)
+++ trunk/usr.sbin/crunch/crunchgen/crunchgen.c	2018-06-10 20:25:20 UTC (rev 10825)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1994 University of Maryland
  * All Rights Reserved.
@@ -22,8 +23,6 @@
  * Author: James da Silva, Systems Design and Analysis Group
  *			   Computer Science Department
  *			   University of Maryland at College Park
- *
- * $MidnightBSD$
  */
 /*
  * ========================================================================
@@ -34,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/crunch/crunchgen/crunchgen.c 246346 2013-02-05 02:57:59Z pfg $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -115,14 +114,15 @@
 int subtract_strlst(strlst_t **lista, strlst_t **listb);
 int in_list(strlst_t **listp, char *str);
 
+/* helper routines for main() */
 
-extern char *crunched_skel[];
-
 void usage(void);
 void parse_conf_file(void);
 void gen_outputs(void);
 
+extern char *crunched_skel[];
 
+
 int
 main(int argc, char **argv)
 {

Index: trunk/usr.sbin/crunch/crunchgen/mkskel.sh
===================================================================
--- trunk/usr.sbin/crunch/crunchgen/mkskel.sh	2018-06-10 20:25:03 UTC (rev 10824)
+++ trunk/usr.sbin/crunch/crunchgen/mkskel.sh	2018-06-10 20:25:20 UTC (rev 10825)

Property changes on: trunk/usr.sbin/crunch/crunchgen/mkskel.sh
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property