[Midnightbsd-cvs] src [11500] trunk/usr.bin/bc: sync with freebsd.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jul 7 13:39:20 EDT 2018
Revision: 11500
http://svnweb.midnightbsd.org/src/?rev=11500
Author: laffer1
Date: 2018-07-07 13:39:19 -0400 (Sat, 07 Jul 2018)
Log Message:
-----------
sync with freebsd.
Modified Paths:
--------------
trunk/usr.bin/bc/Makefile
trunk/usr.bin/bc/bc.1
trunk/usr.bin/bc/bc.y
trunk/usr.bin/bc/extern.h
trunk/usr.bin/bc/scan.l
trunk/usr.bin/bc/tty.c
Modified: trunk/usr.bin/bc/Makefile
===================================================================
--- trunk/usr.bin/bc/Makefile 2018-07-07 17:38:07 UTC (rev 11499)
+++ trunk/usr.bin/bc/Makefile 2018-07-07 17:39:19 UTC (rev 11500)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/bc/Makefile 273499 2014-10-23 00:43:08Z ngie $
# $OpenBSD: Makefile,v 1.7 2013/09/19 16:12:00 otto Exp $
PROG= bc
Modified: trunk/usr.bin/bc/bc.1
===================================================================
--- trunk/usr.bin/bc/bc.1 2018-07-07 17:38:07 UTC (rev 11499)
+++ trunk/usr.bin/bc/bc.1 2018-07-07 17:39:19 UTC (rev 11500)
@@ -1,6 +1,6 @@
.\" $MidnightBSD$
-.\" $FreeBSD: stable/10/usr.bin/bc/bc.1 265533 2014-05-07 08:06:54Z delphij $
-.\" $OpenBSD: bc.1,v 1.30 2014/01/14 07:42:42 jmc Exp $
+.\" $FreeBSD: stable/10/usr.bin/bc/bc.1 292753 2015-12-26 18:26:44Z pfg $
+.\" $OpenBSD: bc.1,v 1.32 2015/11/17 05:45:35 mmcc Exp $
.\"
.\" Copyright (C) Caldera International Inc. 2001-2002.
.\" All rights reserved.
@@ -36,7 +36,7 @@
.\"
.\" @(#)bc.1 6.8 (Berkeley) 8/8/91
.\"
-.Dd April 16, 2014
+.Dd November 21 2015
.Dt BC 1
.Os
.Sh NAME
@@ -408,8 +408,9 @@
utility was written by
.An Otto Moerbeek .
.Sh BUGS
-.Ql Quit
-is interpreted when read, not when executed.
+The
+.Ql quit
+statement is interpreted when read, not when executed.
.Pp
Some non-portable extensions, as found in the GNU version of the
.Nm
Modified: trunk/usr.bin/bc/bc.y
===================================================================
--- trunk/usr.bin/bc/bc.y 2018-07-07 17:38:07 UTC (rev 11499)
+++ trunk/usr.bin/bc/bc.y 2018-07-07 17:39:19 UTC (rev 11500)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
%{
/* $OpenBSD: bc.y,v 1.44 2013/11/20 21:33:54 deraadt Exp $ */
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/bc/bc.y 292753 2015-12-26 18:26:44Z pfg $");
#include <sys/types.h>
#include <sys/wait.h>
@@ -52,7 +53,7 @@
#include "extern.h"
#include "pathnames.h"
-#define BC_VER "1.1-MidnightBSD"
+#define BC_VER "1.1-FreeBSD"
#define END_NODE ((ssize_t) -1)
#define CONST_STRING ((ssize_t) -2)
#define ALLOC_STRING ((ssize_t) -3)
@@ -1125,7 +1126,7 @@
int ch, i;
init();
- setlinebuf(stdout);
+ setvbuf(stdout, NULL, _IOLBF, 0);
sargv = malloc(argc * sizeof(char *));
if (sargv == NULL)
Modified: trunk/usr.bin/bc/extern.h
===================================================================
--- trunk/usr.bin/bc/extern.h 2018-07-07 17:38:07 UTC (rev 11499)
+++ trunk/usr.bin/bc/extern.h 2018-07-07 17:39:19 UTC (rev 11500)
@@ -1,6 +1,6 @@
/* $MidnightBSD$ */
-/* $FreeBSD: stable/10/usr.bin/bc/extern.h 265533 2014-05-07 08:06:54Z delphij $ */
-/* $OpenBSD: extern.h,v 1.10 2013/09/19 16:12:01 otto Exp $ */
+/* $FreeBSD: stable/10/usr.bin/bc/extern.h 292753 2015-12-26 18:26:44Z pfg $ */
+/* $OpenBSD: extern.h,v 1.12 2014/04/17 19:07:14 otto Exp $ */
/*
* Copyright (c) 2003, Otto Moerbeek <otto at drijf.net>
@@ -40,9 +40,9 @@
extern int sargc;
extern const char **sargv;
extern const char *filename;
-extern bool interactive;
-extern EditLine *el;
-extern History *hist;
-extern HistEvent he;
+extern bool interactive;
+extern EditLine *el;
+extern History *hist;
+extern HistEvent he;
extern char *cmdexpr;
extern struct termios ttysaved;
Modified: trunk/usr.bin/bc/scan.l
===================================================================
--- trunk/usr.bin/bc/scan.l 2018-07-07 17:38:07 UTC (rev 11499)
+++ trunk/usr.bin/bc/scan.l 2018-07-07 17:39:19 UTC (rev 11500)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
%{
/* $OpenBSD: scan.l,v 1.28 2013/09/19 16:12:01 otto Exp $ */
@@ -18,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/bc/scan.l 265533 2014-05-07 08:06:54Z delphij $");
#include <err.h>
#include <errno.h>
Modified: trunk/usr.bin/bc/tty.c
===================================================================
--- trunk/usr.bin/bc/tty.c 2018-07-07 17:38:07 UTC (rev 11499)
+++ trunk/usr.bin/bc/tty.c 2018-07-07 17:39:19 UTC (rev 11500)
@@ -1,6 +1,6 @@
/* $MidnightBSD$ */
-/* $FreeBSD: stable/10/usr.bin/bc/tty.c 265533 2014-05-07 08:06:54Z delphij $ */
-/* $OpenBSD: tty.c,v 1.2 2013/11/12 13:54:51 deraadt Exp $ */
+/* $FreeBSD: stable/10/usr.bin/bc/tty.c 292753 2015-12-26 18:26:44Z pfg $ */
+/* $OpenBSD: tty.c,v 1.3 2015/09/05 09:49:24 jsg Exp $ */
/*
* Copyright (c) 2013, Otto Moerbeek <otto at drijf.net>
@@ -31,7 +31,7 @@
{
int ret;
- while ((ret = tcsetattr(0, TCSADRAIN, t) == -1) && errno == EINTR)
+ while ((ret = tcsetattr(0, TCSADRAIN, t)) == -1 && errno == EINTR)
continue;
return ret;
}
@@ -41,7 +41,7 @@
{
int ret;
- while ((ret = tcgetattr(0, t) == -1) && errno == EINTR)
+ while ((ret = tcgetattr(0, t)) == -1 && errno == EINTR)
continue;
return ret;
}
More information about the Midnightbsd-cvs
mailing list