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.
This commit is contained in:
christos
parent
f449d0c454
commit
cefb10afe1
|
|
@ -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 @@ static struct labhash {
|
|||
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);
|
||||
|
|
@ -92,14 +90,6 @@ static struct s_command
|
|||
static void fixuplabel(struct s_command *, struct s_command *);
|
||||
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.
|
||||
*/
|
||||
|
|
@ -154,6 +144,9 @@ compile(void)
|
|||
*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 @@ uselabel(void)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* 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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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 @@ static const char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/3/94";
|
|||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <libgen.h>
|
||||
#include <limits.h>
|
||||
#include <locale.h>
|
||||
#include <regex.h>
|
||||
|
|
@ -74,27 +75,55 @@ static const char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/3/94";
|
|||
#include "defs.h"
|
||||
#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;
|
||||
|
||||
int aflag;
|
||||
static int eflag;
|
||||
int nflag;
|
||||
FILE *infile; /* Current input file */
|
||||
FILE *outfile; /* Current output file */
|
||||
|
||||
int aflag, eflag, nflag;
|
||||
int rflags = 0;
|
||||
static int rval; /* Exit status */
|
||||
|
||||
int ispan; /* Whether inplace editing spans across files */
|
||||
const char *inplace; /* Inplace edit file extension. */
|
||||
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;
|
||||
|
||||
static void add_compunit(enum e_cut, char *);
|
||||
static void add_file(char *);
|
||||
|
|
@ -103,7 +132,6 @@ static void usage(void) __dead;
|
|||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
int rval; /* Exit status */
|
||||
int c, fflag;
|
||||
char *temp_arg;
|
||||
|
||||
|
|
@ -184,7 +212,8 @@ main(int argc, char *argv[])
|
|||
add_file(*argv);
|
||||
else
|
||||
add_file(NULL);
|
||||
rval = process();
|
||||
process();
|
||||
cfclose(prog, NULL);
|
||||
if (fclose(stdout))
|
||||
err(1, "stdout");
|
||||
exit(rval);
|
||||
|
|
@ -200,6 +229,249 @@ usage(void)
|
|||
exit(1);
|
||||
}
|
||||
|
||||
/*
|
||||
* 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);
|
||||
}
|
||||
|
||||
/*
|
||||
* Like fgets, but go through the list of files chaining them together.
|
||||
* Set len to the length of the line.
|
||||
*/
|
||||
int
|
||||
mf_fgets(SPACE *sp, enum e_spflag spflag)
|
||||
{
|
||||
struct stat sb;
|
||||
size_t len;
|
||||
static char *p = NULL;
|
||||
static size_t plen = 0;
|
||||
int c;
|
||||
static int firstfile;
|
||||
|
||||
if (infile == NULL) {
|
||||
/* stdin? */
|
||||
if (files->fname == NULL) {
|
||||
if (inplace != NULL)
|
||||
errx(1, "-I or -i may not be used with stdin");
|
||||
infile = stdin;
|
||||
fname = "stdin";
|
||||
outfile = stdout;
|
||||
outfname = "stdout";
|
||||
}
|
||||
firstfile = 1;
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
if (infile != NULL && (c = getc(infile)) != EOF) {
|
||||
(void)ungetc(c, infile);
|
||||
break;
|
||||
}
|
||||
/* If we are here then either eof or no files are open yet */
|
||||
if (infile == stdin) {
|
||||
sp->len = 0;
|
||||
return (0);
|
||||
}
|
||||
if (infile != NULL) {
|
||||
fclose(infile);
|
||||
if (*oldfname != '\0') {
|
||||
/* if there was a backup file, remove it */
|
||||
unlink(oldfname);
|
||||
/*
|
||||
* Backup the original. Note that hard links
|
||||
* are not supported on all filesystems.
|
||||
*/
|
||||
if ((link(fname, oldfname) != 0) &&
|
||||
(rename(fname, oldfname) != 0)) {
|
||||
warn("rename()");
|
||||
if (*tmpfname)
|
||||
unlink(tmpfname);
|
||||
exit(1);
|
||||
}
|
||||
*oldfname = '\0';
|
||||
}
|
||||
if (*tmpfname != '\0') {
|
||||
if (outfile != NULL && outfile != stdout)
|
||||
if (fclose(outfile) != 0) {
|
||||
warn("fclose()");
|
||||
unlink(tmpfname);
|
||||
exit(1);
|
||||
}
|
||||
outfile = NULL;
|
||||
if (rename(tmpfname, fname) != 0) {
|
||||
/* this should not happen really! */
|
||||
warn("rename()");
|
||||
unlink(tmpfname);
|
||||
exit(1);
|
||||
}
|
||||
*tmpfname = '\0';
|
||||
}
|
||||
outfname = NULL;
|
||||
}
|
||||
if (firstfile == 0)
|
||||
files = files->next;
|
||||
else
|
||||
firstfile = 0;
|
||||
if (files == NULL) {
|
||||
sp->len = 0;
|
||||
return (0);
|
||||
}
|
||||
fname = files->fname;
|
||||
if (inplace != NULL) {
|
||||
if (lstat(fname, &sb) != 0)
|
||||
err(1, "%s", fname);
|
||||
if (!(sb.st_mode & S_IFREG))
|
||||
errx(1, "%s: %s %s", fname,
|
||||
"in-place editing only",
|
||||
"works for regular files");
|
||||
if (*inplace != '\0') {
|
||||
strlcpy(oldfname, fname,
|
||||
sizeof(oldfname));
|
||||
len = strlcat(oldfname, inplace,
|
||||
sizeof(oldfname));
|
||||
if (len > sizeof(oldfname))
|
||||
errx(1, "%s: name too long", fname);
|
||||
}
|
||||
char d_name[PATH_MAX], f_name[PATH_MAX];
|
||||
(void)strlcpy(d_name, fname, sizeof(d_name));
|
||||
(void)strlcpy(f_name, fname, sizeof(f_name));
|
||||
len = (size_t)snprintf(tmpfname, sizeof(tmpfname),
|
||||
"%s/.!%ld!%s", dirname(d_name), (long)getpid(),
|
||||
basename(f_name));
|
||||
if (len >= sizeof(tmpfname))
|
||||
errx(1, "%s: name too long", fname);
|
||||
unlink(tmpfname);
|
||||
if (outfile != NULL && outfile != stdout)
|
||||
fclose(outfile);
|
||||
if ((outfile = fopen(tmpfname, "w")) == NULL)
|
||||
err(1, "%s", fname);
|
||||
fchown(fileno(outfile), sb.st_uid, sb.st_gid);
|
||||
fchmod(fileno(outfile), sb.st_mode & ALLPERMS);
|
||||
outfname = tmpfname;
|
||||
if (!ispan) {
|
||||
linenum = 0;
|
||||
resetstate();
|
||||
}
|
||||
} else {
|
||||
outfile = stdout;
|
||||
outfname = "stdout";
|
||||
}
|
||||
if ((infile = fopen(fname, "r")) == NULL) {
|
||||
warn("%s", fname);
|
||||
rval = 1;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
/*
|
||||
* We are here only when infile is open and we still have something
|
||||
* to read from it.
|
||||
*
|
||||
* Use getline() so that we can handle essentially infinite input
|
||||
* data. The p and plen are static so each invocation gives
|
||||
* getline() the same buffer which is expanded as needed.
|
||||
*/
|
||||
ssize_t slen = getline(&p, &plen, infile);
|
||||
if (slen == -1)
|
||||
err(1, "%s", fname);
|
||||
if (slen != 0 && p[slen - 1] == '\n')
|
||||
slen--;
|
||||
cspace(sp, p, (size_t)slen, spflag);
|
||||
|
||||
linenum++;
|
||||
|
||||
return (1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Add a compilation unit to the linked list
|
||||
*/
|
||||
|
|
@ -230,3 +502,16 @@ add_file(char *s)
|
|||
fp->fname = s;
|
||||
fl_nextp = &fp->next;
|
||||
}
|
||||
|
||||
int
|
||||
lastline(void)
|
||||
{
|
||||
int ch;
|
||||
|
||||
if (files->next != NULL && (inplace == NULL || ispan))
|
||||
return (0);
|
||||
if ((ch = getc(infile)) == EOF)
|
||||
return (1);
|
||||
ungetc(ch, infile);
|
||||
return (0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: process.c,v 1.51 2015/03/01 01:07:46 asau Exp $ */
|
||||
/* $NetBSD: process.c,v 1.52 2015/03/12 12:40:41 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1992 Diomidis Spinellis.
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
#endif
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__RCSID("$NetBSD: process.c,v 1.51 2015/03/01 01:07:46 asau Exp $");
|
||||
__RCSID("$NetBSD: process.c,v 1.52 2015/03/12 12:40:41 christos Exp $");
|
||||
#ifdef __FBSDID
|
||||
__FBSDID("$FreeBSD: head/usr.bin/sed/process.c 192732 2009-05-25 06:45:33Z brian $");
|
||||
#endif
|
||||
|
|
@ -56,7 +56,6 @@ static const char sccsid[] = "@(#)process.c 8.6 (Berkeley) 4/20/94";
|
|||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <libgen.h>
|
||||
#include <limits.h>
|
||||
#include <regex.h>
|
||||
#include <stdio.h>
|
||||
|
|
@ -76,38 +75,15 @@ static SPACE HS, PS, SS, YS;
|
|||
#define hs HS.space
|
||||
#define hsl HS.len
|
||||
|
||||
static int mf_fgets(SPACE *, enum e_spflag);
|
||||
static int lastline(void);
|
||||
|
||||
static __inline int applies(struct s_command *);
|
||||
static void cfclose(struct s_command *, struct s_command *);
|
||||
static void cspace(SPACE *, const char *, size_t, enum e_spflag);
|
||||
static void do_tr(struct s_tr *);
|
||||
static void flush_appends(void);
|
||||
static void lputs(char *, size_t);
|
||||
static __inline int regexec_e(regex_t *, const char *, int, int, size_t);
|
||||
static void regsub(SPACE *, char *, char *);
|
||||
static void resetstate(void);
|
||||
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
|
||||
* in place.
|
||||
*/
|
||||
static const char *fname; /* File name. */
|
||||
static 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. */
|
||||
static u_long linenum;
|
||||
|
||||
static int rval; /* Exit status */
|
||||
|
||||
static struct s_appends *appends; /* Array of pointers to strings to append. */
|
||||
struct s_appends *appends; /* Array of pointers to strings to append. */
|
||||
static size_t appendx; /* Index into appends array. */
|
||||
size_t appendnum; /* Size of appends array. */
|
||||
|
||||
|
|
@ -116,11 +92,11 @@ static int sdone; /* If any substitutes since last line input. */
|
|||
/* Iov structure for 'w' commands. */
|
||||
static regex_t *defpreg;
|
||||
size_t maxnsub;
|
||||
static regmatch_t *match;
|
||||
regmatch_t *match;
|
||||
|
||||
#define OUT() do {fwrite(ps, 1, psl, outfile); fputc('\n', outfile);} while (0)
|
||||
|
||||
int
|
||||
void
|
||||
process(void)
|
||||
{
|
||||
struct s_command *cp;
|
||||
|
|
@ -128,10 +104,6 @@ process(void)
|
|||
size_t oldpsl = 0;
|
||||
char *p;
|
||||
|
||||
if (appendnum > 0)
|
||||
appends = xmalloc(sizeof(struct s_appends) * appendnum);
|
||||
match = xmalloc((maxnsub + 1) * sizeof(regmatch_t));
|
||||
|
||||
p = NULL;
|
||||
|
||||
for (linenum = 0; mf_fgets(&PS, REPLACE);) {
|
||||
|
|
@ -299,8 +271,6 @@ new: if (!nflag && !pd)
|
|||
OUT();
|
||||
flush_appends();
|
||||
} /* for all lines */
|
||||
cfclose(prog, NULL);
|
||||
return rval;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -377,7 +347,7 @@ applies(struct s_command *cp)
|
|||
/*
|
||||
* Reset the sed processor to its initial state.
|
||||
*/
|
||||
static void
|
||||
void
|
||||
resetstate(void)
|
||||
{
|
||||
struct s_command *cp;
|
||||
|
|
@ -776,7 +746,7 @@ regsub(SPACE *sp, char *string, char *src)
|
|||
* Concatenate space: append the source space to the destination space,
|
||||
* allocating new space as necessary.
|
||||
*/
|
||||
static void
|
||||
void
|
||||
cspace(SPACE *sp, const char *p, size_t len, enum e_spflag spflag)
|
||||
{
|
||||
size_t tlen;
|
||||
|
|
@ -799,7 +769,7 @@ cspace(SPACE *sp, const char *p, size_t len, enum e_spflag spflag)
|
|||
/*
|
||||
* Close all cached opened files and report any errors
|
||||
*/
|
||||
static void
|
||||
void
|
||||
cfclose(struct s_command *cp, struct s_command *end)
|
||||
{
|
||||
|
||||
|
|
@ -820,163 +790,3 @@ cfclose(struct s_command *cp, struct s_command *end)
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Like fgets, but go through the list of files chaining them together.
|
||||
* Set len to the length of the line.
|
||||
*/
|
||||
int
|
||||
mf_fgets(SPACE *sp, enum e_spflag spflag)
|
||||
{
|
||||
struct stat sb;
|
||||
size_t len;
|
||||
static char *p = NULL;
|
||||
static size_t plen = 0;
|
||||
int c;
|
||||
static int firstfile;
|
||||
|
||||
if (infile == NULL) {
|
||||
/* stdin? */
|
||||
if (files->fname == NULL) {
|
||||
if (inplace != NULL)
|
||||
errx(1, "-I or -i may not be used with stdin");
|
||||
infile = stdin;
|
||||
fname = "stdin";
|
||||
outfile = stdout;
|
||||
outfname = "stdout";
|
||||
}
|
||||
firstfile = 1;
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
if (infile != NULL && (c = getc(infile)) != EOF) {
|
||||
(void)ungetc(c, infile);
|
||||
break;
|
||||
}
|
||||
/* If we are here then either eof or no files are open yet */
|
||||
if (infile == stdin) {
|
||||
sp->len = 0;
|
||||
return (0);
|
||||
}
|
||||
if (infile != NULL) {
|
||||
fclose(infile);
|
||||
if (*oldfname != '\0') {
|
||||
/* if there was a backup file, remove it */
|
||||
unlink(oldfname);
|
||||
/*
|
||||
* Backup the original. Note that hard links
|
||||
* are not supported on all filesystems.
|
||||
*/
|
||||
if ((link(fname, oldfname) != 0) &&
|
||||
(rename(fname, oldfname) != 0)) {
|
||||
warn("rename()");
|
||||
if (*tmpfname)
|
||||
unlink(tmpfname);
|
||||
exit(1);
|
||||
}
|
||||
*oldfname = '\0';
|
||||
}
|
||||
if (*tmpfname != '\0') {
|
||||
if (outfile != NULL && outfile != stdout)
|
||||
if (fclose(outfile) != 0) {
|
||||
warn("fclose()");
|
||||
unlink(tmpfname);
|
||||
exit(1);
|
||||
}
|
||||
outfile = NULL;
|
||||
if (rename(tmpfname, fname) != 0) {
|
||||
/* this should not happen really! */
|
||||
warn("rename()");
|
||||
unlink(tmpfname);
|
||||
exit(1);
|
||||
}
|
||||
*tmpfname = '\0';
|
||||
}
|
||||
outfname = NULL;
|
||||
}
|
||||
if (firstfile == 0)
|
||||
files = files->next;
|
||||
else
|
||||
firstfile = 0;
|
||||
if (files == NULL) {
|
||||
sp->len = 0;
|
||||
return (0);
|
||||
}
|
||||
fname = files->fname;
|
||||
if (inplace != NULL) {
|
||||
if (lstat(fname, &sb) != 0)
|
||||
err(1, "%s", fname);
|
||||
if (!(sb.st_mode & S_IFREG))
|
||||
errx(1, "%s: %s %s", fname,
|
||||
"in-place editing only",
|
||||
"works for regular files");
|
||||
if (*inplace != '\0') {
|
||||
strlcpy(oldfname, fname,
|
||||
sizeof(oldfname));
|
||||
len = strlcat(oldfname, inplace,
|
||||
sizeof(oldfname));
|
||||
if (len > sizeof(oldfname))
|
||||
errx(1, "%s: name too long", fname);
|
||||
}
|
||||
char d_name[PATH_MAX], f_name[PATH_MAX];
|
||||
(void)strlcpy(d_name, fname, sizeof(d_name));
|
||||
(void)strlcpy(f_name, fname, sizeof(f_name));
|
||||
len = (size_t)snprintf(tmpfname, sizeof(tmpfname),
|
||||
"%s/.!%ld!%s", dirname(d_name), (long)getpid(),
|
||||
basename(f_name));
|
||||
if (len >= sizeof(tmpfname))
|
||||
errx(1, "%s: name too long", fname);
|
||||
unlink(tmpfname);
|
||||
if (outfile != NULL && outfile != stdout)
|
||||
fclose(outfile);
|
||||
if ((outfile = fopen(tmpfname, "w")) == NULL)
|
||||
err(1, "%s", fname);
|
||||
fchown(fileno(outfile), sb.st_uid, sb.st_gid);
|
||||
fchmod(fileno(outfile), sb.st_mode & ALLPERMS);
|
||||
outfname = tmpfname;
|
||||
if (!ispan) {
|
||||
linenum = 0;
|
||||
resetstate();
|
||||
}
|
||||
} else {
|
||||
outfile = stdout;
|
||||
outfname = "stdout";
|
||||
}
|
||||
if ((infile = fopen(fname, "r")) == NULL) {
|
||||
warn("%s", fname);
|
||||
rval = 1;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
/*
|
||||
* We are here only when infile is open and we still have something
|
||||
* to read from it.
|
||||
*
|
||||
* Use getline() so that we can handle essentially infinite input
|
||||
* data. The p and plen are static so each invocation gives
|
||||
* getline() the same buffer which is expanded as needed.
|
||||
*/
|
||||
ssize_t slen = getline(&p, &plen, infile);
|
||||
if (slen == -1)
|
||||
err(1, "%s", fname);
|
||||
if (slen != 0 && p[slen - 1] == '\n')
|
||||
slen--;
|
||||
cspace(sp, p, (size_t)slen, spflag);
|
||||
|
||||
linenum++;
|
||||
|
||||
return (1);
|
||||
}
|
||||
|
||||
static int
|
||||
lastline(void)
|
||||
{
|
||||
int ch;
|
||||
|
||||
if (files->next != NULL && (inplace == NULL || ispan))
|
||||
return (0);
|
||||
if ((ch = getc(infile)) == EOF)
|
||||
return (1);
|
||||
ungetc(ch, infile);
|
||||
return (0);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue