mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

Do not add an extra newline at the end if the last line of the input

Browse Source 
file contains no newline and the diff does not touch the last line.
Contributions from millert@.

ok millert@ tedu@
This commit is contained in:
otto 2003-08-10 21:28:48 +00:00
parent 590586fefc
commit 9f4ed7c2b1
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/patch/common.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: common.h,v 1.22 2003/08/01 20:30:48 otto Exp $ */
/* $OpenBSD: common.h,v 1.23 2003/08/10 21:28:48 otto Exp $ */
#include <stdbool.h>
@ -71,6 +71,7 @@ extern bool canonicalize;
/* TRUE if -C was specified on command line. */
extern bool check_only;
extern bool warn_on_invalid_line;
extern bool last_line_missing_eol;
#define CONTEXT_DIFF 1

8
usr.bin/patch/inp.c
View File

@ -1,7 +1,7 @@
/* $OpenBSD: inp.c,v 1.25 2003/08/08 07:53:19 otto Exp $ */
/* $OpenBSD: inp.c,v 1.26 2003/08/10 21:28:48 otto Exp $ */
#ifndef lint
static const char rcsid[] = "$OpenBSD: inp.c,v 1.25 2003/08/08 07:53:19 otto Exp $";
static const char rcsid[] = "$OpenBSD: inp.c,v 1.26 2003/08/10 21:28:48 otto Exp $";
#endif /* not lint */
#include <sys/types.h>
@ -252,6 +252,7 @@ plan_a(const char *filename)
}
/* if the last line contains no EOL, append one */
if (i_size > 0 && i_womp[i_size - 1] != '\n') {
last_line_missing_eol = true;
/* fix last line */
sz = s - i_ptr[iline];
p = malloc(sz + 1);
@ -268,7 +269,8 @@ plan_a(const char *filename)
i_ptr[iline] = p;
/* count the extra line and make it point to some valid mem */
i_ptr[++iline] = "";
}
} else
last_line_missing_eol = false;
input_lines = iline - 1;

39
usr.bin/patch/patch.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: patch.c,v 1.36 2003/08/10 18:39:43 otto Exp $ */
/* $OpenBSD: patch.c,v 1.37 2003/08/10 21:28:48 otto Exp $ */
/*
* patch - a program to apply diffs to original files
@ -27,7 +27,7 @@
*/
#ifndef lint
static const char rcsid[] = "$OpenBSD: patch.c,v 1.36 2003/08/10 18:39:43 otto Exp $";
static const char rcsid[] = "$OpenBSD: patch.c,v 1.37 2003/08/10 21:28:48 otto Exp $";
#endif /* not lint */
#include <sys/types.h>
@ -68,6 +68,7 @@ char *TMPPATNAME;
bool toutkeep = false;
bool trejkeep = false;
bool warn_on_invalid_line;
bool last_line_missing_eol;
#ifdef DEBUGGING
int debug = 0;
@ -93,9 +94,9 @@ static void abort_hunk(void);
static void apply_hunk(LINENUM);
static void init_output(const char *);
static void init_reject(const char *);
static void copy_till(LINENUM);
static void copy_till(LINENUM, bool);
static void spew_output(void);
static void dump_line(LINENUM);
static void dump_line(LINENUM, bool);
static bool patch_match(LINENUM, LINENUM, LINENUM);
static bool similar(const char *, const char *, int);
static __dead void usage(void);
@ -732,7 +733,7 @@ apply_hunk(LINENUM where)
while (old <= lastline) {
if (pch_char(old) == '-') {
copy_till(where + old - 1);
copy_till(where + old - 1, false);
if (do_defines) {
if (def_state == OUTSIDE) {
fputs(not_defined, ofp);
@ -748,7 +749,7 @@ apply_hunk(LINENUM where)
} else if (new > pat_end) {
break;
} else if (pch_char(new) == '+') {
copy_till(where + old - 1);
copy_till(where + old - 1, false);
if (do_defines) {
if (def_state == IN_IFNDEF) {
fputs(else_defined, ofp);
@ -770,7 +771,7 @@ apply_hunk(LINENUM where)
#endif
my_exit(2);
} else if (pch_char(new) == '!') {
copy_till(where + old - 1);
copy_till(where + old - 1, false);
if (do_defines) {
fputs(not_defined, ofp);
def_state = IN_IFNDEF;
@ -802,7 +803,7 @@ apply_hunk(LINENUM where)
}
}
if (new <= pat_end && pch_char(new) == '+') {
copy_till(where + old - 1);
copy_till(where + old - 1, false);
if (do_defines) {
if (def_state == OUTSIDE) {
fputs(if_defined, ofp);
@ -846,14 +847,20 @@ init_reject(const char *name)
/*
* Copy input file to output, up to wherever hunk is to be applied.
* If endoffile is true, treat the last line specially since it may
* lack a newline.
*/
static void
copy_till(LINENUM lastline)
copy_till(LINENUM lastline, bool endoffile)
{
if (last_frozen_line > lastline)
fatal("misordered hunks! output would be garbled\n");
while (last_frozen_line < lastline)
dump_line(++last_frozen_line);
while (last_frozen_line < lastline) {
if (++last_frozen_line == lastline && endoffile)
dump_line(last_frozen_line, !last_line_missing_eol);
else
dump_line(last_frozen_line, true);
}
}
/*
@ -867,7 +874,7 @@ spew_output(void)
say("il=%ld lfl=%ld\n", input_lines, last_frozen_line);
#endif
if (input_lines)
copy_till(input_lines); /* dump remainder of file */
copy_till(input_lines, true); /* dump remainder of file */
fclose(ofp);
ofp = NULL;
}
@ -876,7 +883,7 @@ spew_output(void)
* Copy one line from input to output.
*/
static void
dump_line(LINENUM line)
dump_line(LINENUM line, bool write_newline)
{
char *s;
@ -884,8 +891,10 @@ dump_line(LINENUM line)
if (s == NULL)
return;
/* Note: string is not NUL terminated. */
for (; putc(*s, ofp) != '\n'; s++)
;
for (; *s != '\n'; s++)
putc(*s, ofp);
if (write_newline)
putc('\n', ofp);
}
/*