Page MenuHomeFreeBSD
Files F144405827

D16798.id47450.diff
No OneTemporary
Actions

D16798.id47450.diff
View Options

Index: head/usr.bin/sed/extern.h
===================================================================
--- head/usr.bin/sed/extern.h
+++ head/usr.bin/sed/extern.h
@@ -46,6 +46,8 @@
extern const char *fname, *outfname;
extern FILE *infile, *outfile;
extern int rflags; /* regex flags to use */
+extern const char *inplace;
+extern int quit;
void cfclose(struct s_command *, struct s_command *);
void compile(void);
Index: head/usr.bin/sed/main.c
===================================================================
--- head/usr.bin/sed/main.c
+++ head/usr.bin/sed/main.c
@@ -102,6 +102,7 @@
int aflag, eflag, nflag;
int rflags = 0;
+int quit = 0;
static int rval; /* Exit status */
static int ispan; /* Whether inplace editing spans across files */
@@ -115,7 +116,7 @@
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. */
+const char *inplace; /* Inplace edit file extension. */
u_long linenum;
static void add_compunit(enum e_cut, char *);
@@ -338,7 +339,7 @@
}
for (;;) {
- if (infile != NULL && (c = getc(infile)) != EOF) {
+ if (infile != NULL && (c = getc(infile)) != EOF && !quit) {
(void)ungetc(c, infile);
break;
}
Index: head/usr.bin/sed/process.c
===================================================================
--- head/usr.bin/sed/process.c
+++ head/usr.bin/sed/process.c
@@ -210,10 +210,14 @@
}
break;
case 'q':
- if (!nflag && !pd)
- OUT();
- flush_appends();
- exit(0);
+ if (inplace == NULL) {
+ if (!nflag && !pd)
+ OUT();
+ flush_appends();
+ exit(0);
+ }
+ quit = 1;
+ break;
case 'r':
if (appendx >= appendnum)
if ((appends = realloc(appends,
Index: head/usr.bin/sed/tests/sed2_test.sh
===================================================================
--- head/usr.bin/sed/tests/sed2_test.sh
+++ head/usr.bin/sed/tests/sed2_test.sh
@@ -38,6 +38,7 @@
atf_check ln a b
atf_check sed -i '' -e 's,foo,bar,g' b
atf_check -o 'inline:bar\n' -s exit:0 cat b
+ atf_check -s not-exit:0 stat -q '.!'*
}
atf_test_case inplace_symlink_src
@@ -50,10 +51,27 @@
echo foo > a
atf_check ln -s a b
atf_check -e not-empty -s not-exit:0 sed -i '' -e 's,foo,bar,g' b
+ atf_check -s not-exit:0 stat -q '.!'*
}
+atf_test_case inplace_command_q
+inplace_command_q_head()
+{
+ atf_set "descr" "Verify -i works correctly with the 'q' command"
+}
+inplace_command_q_body()
+{
+ printf '1\n2\n3\n' > a
+ atf_check -o 'inline:1\n2\n' sed '2q' a
+ atf_check sed -i.bak '2q' a
+ atf_check -o 'inline:1\n2\n' cat a
+ atf_check -o 'inline:1\n2\n3\n' cat a.bak
+ atf_check -s not-exit:0 stat -q '.!'*
+}
+
atf_init_test_cases()
{
+ atf_add_test_case inplace_command_q
atf_add_test_case inplace_hardlink_src
atf_add_test_case inplace_symlink_src
}

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 6:45 AM (5 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28549951
Default Alt Text
D16798.id47450.diff (2 KB)

Event Timeline