diff options
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/nbsed/files/configure.ac | 15 | ||||
| -rw-r--r-- | textproc/nbsed/files/defs.h | 12 | ||||
| -rw-r--r-- | textproc/nbsed/files/process.c | 12 |
3 files changed, 21 insertions, 18 deletions
diff --git a/textproc/nbsed/files/configure.ac b/textproc/nbsed/files/configure.ac index 778aa7b0761..bb48311cf8c 100644 --- a/textproc/nbsed/files/configure.ac +++ b/textproc/nbsed/files/configure.ac @@ -1,7 +1,7 @@ -dnl $Id: configure.ac,v 1.2 2003/08/23 22:20:26 jschauma Exp $ +dnl $Id: configure.ac,v 1.3 2003/10/16 12:04:41 grant Exp $ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([nb-sed],[20030823],[agc@netbsd.org]) +AC_INIT([nb-sed],[20031016],[agc@netbsd.org]) AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_HEADER(config.h) AC_ARG_PROGRAM @@ -37,6 +37,7 @@ AC_CHECK_FUNCS(setprogname) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST +AC_C_INLINE AC_TYPE_SIZE_T # Checks for library functions. @@ -122,6 +123,16 @@ AH_BOTTOM([ #error You need either memcpy or bcopy # endif #endif + +#ifndef DEFFILEMODE +# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) +#endif + +#include <stdio.h> + +#ifndef HAVE_FGETLN +char *fgetln(FILE *, size_t *); +#endif ]) AC_CONFIG_FILES([Makefile]) diff --git a/textproc/nbsed/files/defs.h b/textproc/nbsed/files/defs.h index 18401f68a57..aeb4aec6af0 100644 --- a/textproc/nbsed/files/defs.h +++ b/textproc/nbsed/files/defs.h @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.2 2003/08/23 22:13:56 jschauma Exp $ */ +/* $NetBSD: defs.h,v 1.3 2003/10/16 12:04:41 grant Exp $ */ /*- * Copyright (c) 1992 Diomidis Spinellis. @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * from: @(#)defs.h 8.1 (Berkeley) 6/6/93 - * $NetBSD: defs.h,v 1.2 2003/08/23 22:13:56 jschauma Exp $ + * $NetBSD: defs.h,v 1.3 2003/10/16 12:04:41 grant Exp $ */ /* @@ -146,11 +146,3 @@ typedef struct { #define WARNING 2 /* Just print the warning */ #define COMPILE 3 /* Print error, count and finish script */ #define COMPILE2 3 /* Print error, count and finish script */ - -#ifndef DEFFILEMODE -#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) -#endif - -#ifndef HAVE_FGETLN -char *fgetln(FILE *, size_t *); -#endif diff --git a/textproc/nbsed/files/process.c b/textproc/nbsed/files/process.c index f59d889f7ac..7242f0d9db4 100644 --- a/textproc/nbsed/files/process.c +++ b/textproc/nbsed/files/process.c @@ -1,4 +1,4 @@ -/* $NetBSD: process.c,v 1.3 2003/08/25 16:06:49 jschauma Exp $ */ +/* $NetBSD: process.c,v 1.4 2003/10/16 12:04:41 grant Exp $ */ /*- * Copyright (c) 1992 Diomidis Spinellis. @@ -47,7 +47,7 @@ #if 0 static char sccsid[] = "@(#)process.c 8.6 (Berkeley) 4/20/94"; #else -__RCSID("$NetBSD: process.c,v 1.3 2003/08/25 16:06:49 jschauma Exp $"); +__RCSID("$NetBSD: process.c,v 1.4 2003/10/16 12:04:41 grant Exp $"); #endif #endif /* not lint */ @@ -103,10 +103,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 *); @@ -310,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; @@ -539,7 +539,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; |