Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/sed The latest refactoring changes broke sed -i:
details: https://anonhg.NetBSD.org/src/rev/67533cd19322
branches: trunk
changeset: 336705:67533cd19322
user: christos <christos%NetBSD.org@localhost>
date: Thu Mar 12 12:40:41 2015 +0000
description:
The latest refactoring changes broke sed -i:
cd /tmp; echo foo > test; sed -i.orig s,fo,ba, test
Back them out until they are fixed.
diffstat:
usr.bin/sed/compile.c | 113 +-----------------
usr.bin/sed/extern.h | 37 ++---
usr.bin/sed/main.c | 315 +++++++++++++++++++++++++++++++++++++++++++++++--
usr.bin/sed/process.c | 206 +-------------------------------
4 files changed, 327 insertions(+), 344 deletions(-)
diffs (truncated from 877 to 300 lines):
diff -r 23302567644f -r 67533cd19322 usr.bin/sed/compile.c
--- a/usr.bin/sed/compile.c Thu Mar 12 11:32:16 2015 +0000
+++ b/usr.bin/sed/compile.c Thu Mar 12 12:40:41 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: compile.c,v 1.45 2015/03/01 00:51:08 asau Exp $ */
+/* $NetBSD: compile.c,v 1.46 2015/03/12 12:40:41 christos Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -38,7 +38,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: compile.c,v 1.45 2015/03/01 00:51:08 asau Exp $");
+__RCSID("$NetBSD: compile.c,v 1.46 2015/03/12 12:40:41 christos Exp $");
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/usr.bin/sed/compile.c 259132 2013-12-09 18:57:20Z eadler $");
#endif
@@ -73,8 +73,6 @@
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);
@@ -93,14 +91,6 @@
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 {
@@ -154,6 +144,9 @@
*compile_stream(&prog) = NULL;
fixuplabel(prog, NULL);
uselabel();
+ if (appendnum > 0)
+ appends = xmalloc(sizeof(struct s_appends) * appendnum);
+ match = xmalloc((maxnsub + 1) * sizeof(regmatch_t));
}
#define EATSPACE() do { \
@@ -952,99 +945,3 @@
}
}
}
-
-/*
- * 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 23302567644f -r 67533cd19322 usr.bin/sed/extern.h
--- a/usr.bin/sed/extern.h Thu Mar 12 11:32:16 2015 +0000
+++ b/usr.bin/sed/extern.h Thu Mar 12 12:40:41 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.19 2015/03/01 01:07:46 asau Exp $ */
+/* $NetBSD: extern.h,v 1.20 2015/03/12 12:40:41 christos Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -36,34 +36,25 @@
* $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, nflag;
-extern int ispan;
+extern int aflag, eflag, nflag;
+extern const char *fname, *outfname;
+extern FILE *infile, *outfile;
extern int rflags; /* regex flags to use */
+void cfclose(struct s_command *, struct s_command *);
void compile(void);
-int process(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);
+void resetstate(void);
char *strregerror(int, regex_t *);
void *xmalloc(size_t);
void *xrealloc(void *, size_t);
diff -r 23302567644f -r 67533cd19322 usr.bin/sed/main.c
--- a/usr.bin/sed/main.c Thu Mar 12 11:32:16 2015 +0000
+++ b/usr.bin/sed/main.c Thu Mar 12 12:40:41 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.33 2015/03/01 01:00:07 asau Exp $ */
+/* $NetBSD: main.c,v 1.34 2015/03/12 12:40:41 christos Exp $ */
/*-
* Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
@@ -39,7 +39,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.33 2015/03/01 01:00:07 asau Exp $");
+__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
@@ -61,6 +61,7 @@
#include <err.h>
#include <errno.h>
#include <fcntl.h>
+#include <libgen.h>
#include <limits.h>
#include <locale.h>
#include <regex.h>
@@ -75,26 +76,54 @@
#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.
*/
-struct s_compunit *script;
-static struct s_compunit **cu_nextp = &script;
+static struct s_compunit *script, **cu_nextp = &script;
+
+/*
+ * Linked list of files to be processed
+ */
+struct s_flist {
+ char *fname;
+ struct s_flist *next;
+};
/*
* Linked list pointer to files and pointer to current
* next pointer.
*/
-struct s_flist *files;
-static struct s_flist **fl_nextp = &files;
+static struct s_flist *files, **fl_nextp = &files;
+
+FILE *infile; /* Current input file */
+FILE *outfile; /* Current output file */
+
+int aflag, eflag, nflag;
+int rflags = 0;
+static int rval; /* Exit status */
+
+static int ispan; /* Whether inplace editing spans across files */
-int aflag;
-static int eflag;
-int nflag;
-int rflags = 0;
-
-int ispan; /* Whether inplace editing spans across files */
-const char *inplace; /* Inplace edit file extension. */
+/*
+ * 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;
static void add_compunit(enum e_cut, char *);
Home |
Main Index |
Thread Index |
Old Index