summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKiyoshi Aman <kiyoshi.aman+adelie@gmail.com>2019-06-03 07:28:52 -0500
committerKiyoshi Aman <kiyoshi.aman+adelie@gmail.com>2019-06-03 07:28:52 -0500
commit631eb2a4d278457dcf249279610a574d3b5dbcaa (patch)
tree7553a581558418931d998da4c8de4b0bba611656
parent8818a57e8e7b6821bbf8701835c3c8cfaf729cd7 (diff)
downloaduserland-631eb2a4d278457dcf249279610a574d3b5dbcaa.tar.gz
userland-631eb2a4d278457dcf249279610a574d3b5dbcaa.tar.bz2
userland-631eb2a4d278457dcf249279610a574d3b5dbcaa.tar.xz
userland-631eb2a4d278457dcf249279610a574d3b5dbcaa.zip
usr.bin/pr: make buildable
-rw-r--r--usr.bin/pr/egetopt.c9
-rw-r--r--usr.bin/pr/pr.c19
2 files changed, 2 insertions, 26 deletions
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 5c43476..d327596 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -33,15 +33,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-from: static char sccsid[] = "@(#)egetopt.c 8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: egetopt.c,v 1.9 2011/09/06 18:26:06 joerg Exp $");
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 91e8075..f2981df 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -35,20 +35,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1993\
- The Regents of the University of California. All rights reserved.");
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-from: static char sccsid[] = "@(#)pr.c 8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: pr.c,v 1.24 2012/08/01 02:27:48 ginsbach Exp $");
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
@@ -61,7 +47,6 @@ __RCSID("$NetBSD: pr.c,v 1.24 2012/08/01 02:27:48 ginsbach Exp $");
#include <string.h>
#include <time.h>
#include <unistd.h>
-#include <util.h>
#include "pr.h"
#include "extern.h"
@@ -128,7 +113,7 @@ static int prhead(char *, const char *, int);
static void prpause(int);
static int prtail(int, int);
static int setup(int, char **);
-__dead static void terminate(int);
+static void terminate(int);
static void usage(void);
static int vertcol(int, char **);
@@ -1573,7 +1558,7 @@ static void
terminate(int which_sig)
{
flsh_errs();
- (void)raise_default_signal(which_sig);
+ (void)raise(which_sig);
exit(1);
}