diff --git a/commands/Makefile b/commands/Makefile index 8054fa5db..42f26b6b7 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -24,7 +24,7 @@ SUBDIR= aal add_route adduser advent arp ash at autil awk \ profile progressbar proto pr_routes ps pwd pwdauth \ ramdisk rarpd rawspeed rcp rdate readall readclock \ readfs reboot remsync rev rget rlogin rlogind rmdir \ - rotate rsh rshd service setup shar size \ + rotate rsh rshd sed service setup shar size \ sleep slip sort spell split srccrc stat strings strip \ stty su sum svclog swapfs swifi sync synctree sysenv \ syslogd tail talk talkd tcpd tcpdp tcpstat tee telnet \ diff --git a/commands/sed/Makefile b/commands/sed/Makefile index de742b74e..53b7bf42e 100644 --- a/commands/sed/Makefile +++ b/commands/sed/Makefile @@ -1,10 +1,9 @@ # $NetBSD: Makefile,v 1.13 2006/06/02 19:44:48 mrg Exp $ # from: @(#)Makefile 8.1 (Berkeley) 6/6/93 -.include +.include PROG= sed SRCS= compile.c main.c misc.c process.c -WARNS= 2 -.include +.include diff --git a/commands/sed/compile.c b/commands/sed/compile.c index 09b073df5..e41be0856 100644 --- a/commands/sed/compile.c +++ b/commands/sed/compile.c @@ -72,13 +72,6 @@ #endif #include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)compile.c 8.2 (Berkeley) 4/28/95"; -#else -__RCSID("$NetBSD: compile.c,v 1.35 2007/04/17 20:30:29 christos Exp $"); -#endif -#endif /* not lint */ #include #include diff --git a/commands/sed/main.c b/commands/sed/main.c index 8f419408c..3c0f57157 100644 --- a/commands/sed/main.c +++ b/commands/sed/main.c @@ -72,18 +72,6 @@ #endif #include -#ifndef lint -__COPYRIGHT("@(#) Copyright (c) 1992, 1993\ - The Regents of the University of California. All rights reserved."); -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/3/94"; -#else -__RCSID("$NetBSD: main.c,v 1.19 2008/09/16 13:32:04 perry Exp $"); -#endif -#endif /* not lint */ #include @@ -148,7 +136,6 @@ main(int argc, char *argv[]) { int c, fflag; - setprogname(*argv); fflag = 0; while ((c = getopt(argc, argv, "ae:f:nrE")) != -1) switch (c) { diff --git a/commands/sed/misc.c b/commands/sed/misc.c index 9c5d62a43..6180027a0 100644 --- a/commands/sed/misc.c +++ b/commands/sed/misc.c @@ -72,13 +72,6 @@ #endif #include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93"; -#else -__RCSID("$NetBSD: misc.c,v 1.9 2006/06/18 05:16:41 gdamore Exp $"); -#endif -#endif /* not lint */ #include diff --git a/commands/sed/process.c b/commands/sed/process.c index 463b42236..849a18bfa 100644 --- a/commands/sed/process.c +++ b/commands/sed/process.c @@ -72,13 +72,6 @@ #endif #include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)process.c 8.6 (Berkeley) 4/20/94"; -#else -__RCSID("$NetBSD: process.c,v 1.37 2006/06/18 05:16:41 gdamore Exp $"); -#endif -#endif /* not lint */ #include #include @@ -94,6 +87,7 @@ __RCSID("$NetBSD: process.c,v 1.37 2006/06/18 05:16:41 gdamore Exp $"); #include #include #include +#include #include "defs.h" #include "extern.h" @@ -105,10 +99,10 @@ static SPACE HS, PS, SS; #define hs HS.space #define hsl HS.len -static inline int applies(struct s_command *); +static __inline int applies(struct s_command *); static void flush_appends(void); static void lputs(char *); -static inline int regexec_e(regex_t *, const char *, int, int, size_t); +static __inline int regexec_e(regex_t *, const char *, int, int, size_t); static void regsub(SPACE *, char *, char *); static int substitute(struct s_command *); @@ -316,7 +310,7 @@ new: if (!nflag && !pd) * Return TRUE if the command applies to the current line. Sets the inrange * flag to process ranges. Interprets the non-select (``!'') flag. */ -static inline int +static __inline int applies(struct s_command *cp) { int r; @@ -549,7 +543,7 @@ lputs(char *s) err(FATAL, "stdout: %s", strerror(errno ? errno : EIO)); } -static inline int +static __inline int regexec_e(regex_t *preg, const char *string, int eflags, int nomatch, size_t slen) { int eval;