Module Name: src
Committed By: asau
Date: Sun Mar 1 00:38:01 UTC 2015
Modified Files:
src/usr.bin/sed: extern.h main.c process.c
Log Message:
Move data I/O file pointers into processing part.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/sed/extern.h
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/sed/main.c
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/sed/process.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/sed/extern.h
diff -u src/usr.bin/sed/extern.h:1.15 src/usr.bin/sed/extern.h:1.16
--- src/usr.bin/sed/extern.h:1.15 Sat Feb 28 21:56:53 2015
+++ src/usr.bin/sed/extern.h Sun Mar 1 00:38:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.15 2015/02/28 21:56:53 asau Exp $ */
+/* $NetBSD: extern.h,v 1.16 2015/03/01 00:38:01 asau Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -62,7 +62,6 @@ extern size_t maxnsub;
extern size_t appendnum;
extern int aflag, nflag;
extern int ispan;
-extern FILE *infile, *outfile;
extern int rflags; /* regex flags to use */
void cfclose(struct s_command *, struct s_command *);
Index: src/usr.bin/sed/main.c
diff -u src/usr.bin/sed/main.c:1.31 src/usr.bin/sed/main.c:1.32
--- src/usr.bin/sed/main.c:1.31 Sat Feb 28 21:56:53 2015
+++ src/usr.bin/sed/main.c Sun Mar 1 00:38:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.31 2015/02/28 21:56:53 asau Exp $ */
+/* $NetBSD: main.c,v 1.32 2015/03/01 00:38:01 asau Exp $ */
/*-
* Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
@@ -39,7 +39,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.31 2015/02/28 21:56:53 asau Exp $");
+__RCSID("$NetBSD: main.c,v 1.32 2015/03/01 00:38:01 asau Exp $");
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/usr.bin/sed/main.c 252231 2013-06-26 04:14:19Z pfg $");
#endif
@@ -88,9 +88,6 @@ static struct s_compunit **cu_nextp = &s
struct s_flist *files;
static struct s_flist **fl_nextp = &files;
-FILE *infile; /* Current input file */
-FILE *outfile; /* Current output file */
-
int aflag;
static int eflag;
int nflag;
Index: src/usr.bin/sed/process.c
diff -u src/usr.bin/sed/process.c:1.47 src/usr.bin/sed/process.c:1.48
--- src/usr.bin/sed/process.c:1.47 Sat Feb 28 21:56:53 2015
+++ src/usr.bin/sed/process.c Sun Mar 1 00:38:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: process.c,v 1.47 2015/02/28 21:56:53 asau Exp $ */
+/* $NetBSD: process.c,v 1.48 2015/03/01 00:38:01 asau Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -38,7 +38,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: process.c,v 1.47 2015/02/28 21:56:53 asau Exp $");
+__RCSID("$NetBSD: process.c,v 1.48 2015/03/01 00:38:01 asau Exp $");
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/usr.bin/sed/process.c 192732 2009-05-25 06:45:33Z brian $");
#endif
@@ -87,6 +87,9 @@ static __inline int regexec_e(regex_t *
static void regsub(SPACE *, char *, char *);
static int substitute(struct s_command *);
+static FILE *infile; /* Current input file */
+static FILE *outfile; /* Current output file */
+
/*
* Current file and line number; line numbers restart across compilation
* units, but span across input files. The latter is optional if editing
