From 781dfa351934e5c0f6927456458a9f1a19442107 Mon Sep 17 00:00:00 2001 From: Kiyoshi Aman Date: Tue, 4 Jun 2019 23:47:29 -0500 Subject: usr.bin/sed: make buildable --- usr.bin/sed/main.c | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) (limited to 'usr.bin/sed/main.c') diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c index cfe9d35..69def8b 100644 --- a/usr.bin/sed/main.c +++ b/usr.bin/sed/main.c @@ -34,25 +34,6 @@ * SUCH DAMAGE. */ -#if HAVE_NBTOOL_CONFIG_H -#include "nbtool_config.h" -#endif - -#include -__RCSID("$NetBSD: main.c,v 1.34 2015/03/12 12:40:41 christos Exp $"); -#ifdef __FBSDID -__FBSDID("$FreeBSD: head/usr.bin/sed/main.c 252231 2013-06-26 04:14:19Z pfg $"); -#endif - -#ifndef lint -__COPYRIGHT("@(#) Copyright (c) 1992, 1993\ - The Regents of the University of California. All rights reserved."); -#endif - -#if 0 -static const char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/3/94"; -#endif - #include #include #include @@ -69,6 +50,7 @@ static const char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/3/94"; #define _WITH_GETLINE #include #include +#include #include #include @@ -123,11 +105,11 @@ const char *outfname; /* Output file name */ static char oldfname[PATH_MAX]; /* Old file name (for in-place editing) */ static char tmpfname[PATH_MAX]; /* Temporary file name (for in-place editing) */ static const char *inplace; /* Inplace edit file extension. */ -u_long linenum; +unsigned long linenum; static void add_compunit(enum e_cut, char *); static void add_file(char *); -static void usage(void) __dead; +static void usage(void); int main(int argc, char *argv[]) @@ -148,7 +130,7 @@ main(int argc, char *argv[]) rflags = REG_EXTENDED; break; case 'I': - inplace = optarg ? optarg : __UNCONST(""); + inplace = optarg ? optarg : ""; ispan = 1; /* span across input files */ break; case 'a': @@ -166,15 +148,11 @@ main(int argc, char *argv[]) add_compunit(CU_FILE, optarg); break; case 'i': - inplace = optarg ? optarg : __UNCONST(""); + inplace = optarg ? optarg : ""; ispan = 0; /* don't span across input files */ break; case 'l': -#ifdef _IOLBF c = setvbuf(stdout, NULL, _IOLBF, 0); -#else - c = setlinebuf(stdout); -#endif if (c) warn("setting line buffered output failed"); break; @@ -182,12 +160,7 @@ main(int argc, char *argv[]) nflag = 1; break; case 'u': -#ifdef _IONBF c = setvbuf(stdout, NULL, _IONBF, 0); -#else - c = -1; - errno = EOPNOTSUPP; -#endif if (c) warn("setting unbuffered output failed"); break; -- cgit v1.2.3-60-g2f50