Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/sed Improve modularity of "sed" source:
details: https://anonhg.NetBSD.org/src/rev/7063b8db49c1
branches: trunk
changeset: 336420:7063b8db49c1
user: asau <asau%NetBSD.org@localhost>
date: Sat Feb 28 21:56:53 2015 +0000
description:
Improve modularity of "sed" source:
- move program source input subroutines into compiler part;
- move data I/O subroutines into processor part.
diffstat:
usr.bin/sed/compile.c | 110 +++++++++++++++++-
usr.bin/sed/extern.h | 31 +++-
usr.bin/sed/main.c | 307 ++-----------------------------------------------
usr.bin/sed/process.c | 185 +++++++++++++++++++++++++++++-
4 files changed, 326 insertions(+), 307 deletions(-)
diffs (truncated from 810 to 300 lines):
diff -r e83a80d8d42a -r 7063b8db49c1 usr.bin/sed/compile.c
--- a/usr.bin/sed/compile.c Sat Feb 28 21:44:33 2015 +0000
+++ b/usr.bin/sed/compile.c Sat Feb 28 21:56:53 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: compile.c,v 1.43 2014/06/26 02:14:32 christos Exp $ */
+/* $NetBSD: compile.c,v 1.44 2015/02/28 21:56:53 asau Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -38,7 +38,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: compile.c,v 1.43 2014/06/26 02:14:32 christos Exp $");
+__RCSID("$NetBSD: compile.c,v 1.44 2015/02/28 21:56:53 asau Exp $");
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/usr.bin/sed/compile.c 259132 2013-12-09 18:57:20Z eadler $");
#endif
@@ -73,6 +73,8 @@
int lh_ref;
} *labels[LHSZ];
+static char *cu_fgets(char *, int, int *);
+
static char *compile_addr(char *, struct s_addr *);
static char *compile_ccl(char **, char *);
static char *compile_delimited(char *, char *, int);
@@ -91,6 +93,14 @@
static void uselabel(void);
/*
+ * Current file and line number; line numbers restart across compilation
+ * units, but span across input files. The latter is optional if editing
+ * in place.
+ */
+static const char *fname; /* File name. */
+static u_long linenum;
+
+/*
* Command specification. This is used to drive the command parser.
*/
struct s_format {
@@ -945,3 +955,99 @@
}
}
}
+
+/*
+ * Like fgets, but go through the chain of compilation units chaining them
+ * together. Empty strings and files are ignored.
+ */
+char *
+cu_fgets(char *buf, int n, int *more)
+{
+ static enum {ST_EOF, ST_FILE, ST_STRING} state = ST_EOF;
+ static FILE *f; /* Current open file */
+ static char *s; /* Current pointer inside string */
+ static char string_ident[30];
+ char *p;
+
+again:
+ switch (state) {
+ case ST_EOF:
+ if (script == NULL) {
+ if (more != NULL)
+ *more = 0;
+ return (NULL);
+ }
+ linenum = 0;
+ switch (script->type) {
+ case CU_FILE:
+ if ((f = fopen(script->s, "r")) == NULL)
+ err(1, "%s", script->s);
+ fname = script->s;
+ state = ST_FILE;
+ goto again;
+ case CU_STRING:
+ if (((size_t)snprintf(string_ident,
+ sizeof(string_ident), "\"%s\"", script->s)) >=
+ sizeof(string_ident) - 1)
+ (void)strcpy(string_ident +
+ sizeof(string_ident) - 6, " ...\"");
+ fname = string_ident;
+ s = script->s;
+ state = ST_STRING;
+ goto again;
+ }
+ case ST_FILE:
+ if ((p = fgets(buf, n, f)) != NULL) {
+ linenum++;
+ if (linenum == 1 && buf[0] == '#' && buf[1] == 'n')
+ nflag = 1;
+ if (more != NULL)
+ *more = !feof(f);
+ return (p);
+ }
+ script = script->next;
+ (void)fclose(f);
+ state = ST_EOF;
+ goto again;
+ case ST_STRING:
+ if (linenum == 0 && s[0] == '#' && s[1] == 'n')
+ nflag = 1;
+ p = buf;
+ for (;;) {
+ if (n-- <= 1) {
+ *p = '\0';
+ linenum++;
+ if (more != NULL)
+ *more = 1;
+ return (buf);
+ }
+ switch (*s) {
+ case '\0':
+ state = ST_EOF;
+ if (s == script->s) {
+ script = script->next;
+ goto again;
+ } else {
+ script = script->next;
+ *p = '\0';
+ linenum++;
+ if (more != NULL)
+ *more = 0;
+ return (buf);
+ }
+ case '\n':
+ *p++ = '\n';
+ *p = '\0';
+ s++;
+ linenum++;
+ if (more != NULL)
+ *more = 0;
+ return (buf);
+ default:
+ *p++ = *s++;
+ }
+ }
+ }
+ /* NOTREACHED */
+ return (NULL);
+}
diff -r e83a80d8d42a -r 7063b8db49c1 usr.bin/sed/extern.h
--- a/usr.bin/sed/extern.h Sat Feb 28 21:44:33 2015 +0000
+++ b/usr.bin/sed/extern.h Sat Feb 28 21:56:53 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.14 2014/06/06 21:56:39 wiz Exp $ */
+/* $NetBSD: extern.h,v 1.15 2015/02/28 21:56:53 asau Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -36,24 +36,39 @@
* $FreeBSD: head/usr.bin/sed/extern.h 170608 2007-06-12 12:05:24Z yar $
*/
+/*
+ * Linked list of units (strings and files) to be compiled
+ */
+struct s_compunit {
+ struct s_compunit *next;
+ enum e_cut {CU_FILE, CU_STRING} type;
+ char *s; /* Pointer to string or fname */
+};
+
+/*
+ * Linked list of files to be processed
+ */
+struct s_flist {
+ char *fname;
+ struct s_flist *next;
+};
+
+extern struct s_compunit *script;
+extern struct s_flist *files;
extern struct s_command *prog;
extern struct s_appends *appends;
extern regmatch_t *match;
extern size_t maxnsub;
-extern u_long linenum;
extern size_t appendnum;
-extern int aflag, eflag, nflag;
-extern const char *fname, *outfname;
+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 *);
void compile(void);
void cspace(SPACE *, const char *, size_t, enum e_spflag);
-char *cu_fgets(char *, int, int *);
-int mf_fgets(SPACE *, enum e_spflag);
-int lastline(void);
-void process(void);
+int process(void);
void resetstate(void);
char *strregerror(int, regex_t *);
void *xmalloc(size_t);
diff -r e83a80d8d42a -r 7063b8db49c1 usr.bin/sed/main.c
--- a/usr.bin/sed/main.c Sat Feb 28 21:44:33 2015 +0000
+++ b/usr.bin/sed/main.c Sat Feb 28 21:56:53 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.30 2014/06/26 02:14:32 christos Exp $ */
+/* $NetBSD: main.c,v 1.31 2015/02/28 21:56:53 asau Exp $ */
/*-
* Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
@@ -39,7 +39,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.30 2014/06/26 02:14:32 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.31 2015/02/28 21:56:53 asau Exp $");
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/usr.bin/sed/main.c 252231 2013-06-26 04:14:19Z pfg $");
#endif
@@ -61,7 +61,6 @@
#include <err.h>
#include <errno.h>
#include <fcntl.h>
-#include <libgen.h>
#include <limits.h>
#include <locale.h>
#include <regex.h>
@@ -76,54 +75,29 @@
#include "extern.h"
/*
- * Linked list of units (strings and files) to be compiled
- */
-struct s_compunit {
- struct s_compunit *next;
- enum e_cut {CU_FILE, CU_STRING} type;
- char *s; /* Pointer to string or fname */
-};
-
-/*
* Linked list pointer to compilation units and pointer to current
* next pointer.
*/
-static struct s_compunit *script, **cu_nextp = &script;
-
-/*
- * Linked list of files to be processed
- */
-struct s_flist {
- char *fname;
- struct s_flist *next;
-};
+struct s_compunit *script;
+static struct s_compunit **cu_nextp = &script;
/*
* Linked list pointer to files and pointer to current
* next pointer.
*/
-static struct s_flist *files, **fl_nextp = &files;
+struct s_flist *files;
+static struct s_flist **fl_nextp = &files;
FILE *infile; /* Current input file */
FILE *outfile; /* Current output file */
-int aflag, eflag, nflag;
+int aflag;
+static int eflag;
+int nflag;
int rflags = 0;
-static int rval; /* Exit status */
-
-static int ispan; /* Whether inplace editing spans across files */
-/*
- * Current file and line number; line numbers restart across compilation
- * units, but span across input files. The latter is optional if editing
- * in place.
- */
-const char *fname; /* File name. */
-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;
+int ispan; /* Whether inplace editing spans across files */
+const char *inplace; /* Inplace edit file extension. */
static void add_compunit(enum e_cut, char *);
static void add_file(char *);
@@ -132,6 +106,7 @@
int
main(int argc, char *argv[])
{
+ int rval; /* Exit status */
int c, fflag;
char *temp_arg;
@@ -212,7 +187,7 @@
add_file(*argv);
else
add_file(NULL);
Home |
Main Index |
Thread Index |
Old Index