Change parts of the source code to make it closer to style(9), mainly

changing indentation and some comments.  Main goal is not perfect style,
but just to reduce differences with NetBSD.  The object code is exactly
the same after this change as before it (except for assert() statements
which have moved).

Reviewed by:	/sbin/md5 on i386
Obtained from:	NetBSD

1 files changed, 480 insertions, 457 deletions

diff --git a/gnu/usr.bin/patch/pch.c b/gnu/usr.bin/patch/pch.c
index 52790b91c5ad..7dee1a64ed0e 100644
--- a/gnu/usr.bin/patch/pch.c
+++ b/gnu/usr.bin/patch/pch.c
@@ -68,75 +68,80 @@ static LINENUM p_bfake = -1;		/* beg of faked up lines */
 void
 re_patch(void)
 {
-    p_first = Nulline;
-    p_newfirst = Nulline;
-    p_ptrn_lines = Nulline;
-    p_repl_lines = Nulline;
-    p_end = (LINENUM)-1;
-    p_max = Nulline;
-    p_indent = 0;
+	p_first = Nulline;
+	p_newfirst = Nulline;
+	p_ptrn_lines = Nulline;
+	p_repl_lines = Nulline;
+	p_end = (LINENUM)-1;
+	p_max = Nulline;
+	p_indent = 0;
 }
 
-/* Open the patch file at the beginning of time. */
-
+/*
+ * Open the patch file at the beginning of time.
+ */
 void
 open_patch_file(char *filename)
 {
-    if (filename == Nullch || !*filename || strEQ(filename, "-")) {
-	pfp = fopen(TMPPATNAME, "w");
+	if (filename == Nullch || !*filename || strEQ(filename, "-")) {
+		pfp = fopen(TMPPATNAME, "w");
+		if (pfp == Nullfp)
+			pfatal2("can't create %s", TMPPATNAME);
+		while (fgets(buf, sizeof buf, stdin) != Nullch)
+			fputs(buf, pfp);
+		Fclose(pfp);
+		filename = TMPPATNAME;
+	}
+	pfp = fopen(filename, "r");
 	if (pfp == Nullfp)
-	    pfatal2("can't create %s", TMPPATNAME);
-	while (fgets(buf, sizeof buf, stdin) != Nullch)
-	    fputs(buf, pfp);
-	Fclose(pfp);
-	filename = TMPPATNAME;
-    }
-    pfp = fopen(filename, "r");
-    if (pfp == Nullfp)
-	pfatal2("patch file %s not found", filename);
-    Fstat(fileno(pfp), &filestat);
-    p_filesize = filestat.st_size;
-    next_intuit_at(0L,1L);			/* start at the beginning */
-    set_hunkmax();
+	    pfatal2("patch file %s not found", filename);
+	Fstat(fileno(pfp), &filestat);
+	p_filesize = filestat.st_size;
+	next_intuit_at(0L,1L);			/* start at the beginning */
+	set_hunkmax();
 }
 
-/* Make sure our dynamically realloced tables are malloced to begin with. */
-
+/*
+ * Make sure our dynamically realloced tables are malloced to begin with.
+ */
 void
 set_hunkmax(void)
 {
 #ifndef lint
-    if (p_line == Null(char**))
-	p_line = (char**) malloc((MEM)hunkmax * sizeof(char *));
-    if (p_len == Null(short*))
-	p_len  = (short*) malloc((MEM)hunkmax * sizeof(short));
+	if (p_line == Null(char**))
+		p_line = (char**) malloc((MEM)hunkmax * sizeof(char *));
+	if (p_len == Null(short*))
+		p_len  = (short*) malloc((MEM)hunkmax * sizeof(short));
 #endif
-    if (p_Char == Nullch)
-	p_Char = (char*)  malloc((MEM)hunkmax * sizeof(char));
+	if (p_Char == Nullch)
+		p_Char = (char*)  malloc((MEM)hunkmax * sizeof(char));
 }
 
-/* Enlarge the arrays containing the current hunk of patch. */
-
+/*
+ * Enlarge the arrays containing the current hunk of patch.
+ */
 void
 grow_hunkmax(void)
 {
-    hunkmax *= 2;
-    /*
-     * Note that on most systems, only the p_line array ever gets fresh memory
-     * since p_len can move into p_line's old space, and p_Char can move into
-     * p_len's old space.  Not on PDP-11's however.  But it doesn't matter.
-     */
-    assert(p_line != Null(char**) && p_len != Null(short*) && p_Char != Nullch);
+	hunkmax *= 2;
+	/*
+	 * Note that on most systems, only the p_line array ever gets
+	 * fresh memory since p_len can move into p_line's old space,
+	 * and p_Char can move into p_len's old space.  Not on PDP-11's
+	 * however.  But it doesn't matter.
+	 */
+	assert(p_line != Null(char**) && p_len != Null(short*) &&
+	    p_Char != Nullch);
 #ifndef lint
-    p_line = (char**) realloc((char*)p_line, (MEM)hunkmax * sizeof(char *));
-    p_len  = (short*) realloc((char*)p_len,  (MEM)hunkmax * sizeof(short));
-    p_Char = (char*)  realloc((char*)p_Char, (MEM)hunkmax * sizeof(char));
+	p_line = (char**) realloc((char*)p_line, (MEM)hunkmax * sizeof(char *));
+	p_len  = (short*) realloc((char*)p_len,  (MEM)hunkmax * sizeof(short));
+	p_Char = (char*)  realloc((char*)p_Char, (MEM)hunkmax * sizeof(char));
 #endif
-    if (p_line != Null(char**) && p_len != Null(short*) && p_Char != Nullch)
-	return;
-    if (!using_plan_a)
-	fatal1("out of memory\n");
-    out_of_mem = TRUE;		/* whatever is null will be allocated again */
+	if (p_line != Null(char**) && p_len != Null(short*) && p_Char != Nullch)
+		return;
+	if (!using_plan_a)
+		fatal1("out of memory\n");
+	out_of_mem = TRUE;	/* whatever is null will be allocated again */
 				/* from within plan_a(), of all places */
 }
 
@@ -146,62 +151,64 @@ grow_hunkmax(void)
 bool
 there_is_another_patch(void)
 {
-    if (p_base != 0L && p_base >= p_filesize) {
-	if (verbose)
-	    say1("done\n");
-	return FALSE;
-    }
-    if (verbose)
-	say1("Hmm...");
-    diff_type = intuit_diff_type();
-    if (!diff_type) {
-	if (p_base != 0L) {
-	    if (verbose)
-		say1("  Ignoring the trailing garbage.\ndone\n");
-	}
-	else
-	    say1("  I can't seem to find a patch in there anywhere.\n");
-	return FALSE;
-    }
-    if (verbose)
-	say3("  %sooks like %s to me...\n",
-	    (p_base == 0L ? "L" : "The next patch l"),
-	    diff_type == UNI_DIFF ? "a unified diff" :
-	    diff_type == CONTEXT_DIFF ? "a context diff" :
-	    diff_type == NEW_CONTEXT_DIFF ? "a new-style context diff" :
-	    diff_type == NORMAL_DIFF ? "a normal diff" :
-	    "an ed script" );
-    if (p_indent && verbose)
-	say3("(Patch is indented %d space%s.)\n", p_indent, p_indent==1?"":"s");
-    skip_to(p_start,p_sline);
-    while (filearg[0] == Nullch) {
-	if (force || batch || skip_rest_of_patch) {
-	    say1("No file to patch.  Skipping...\n");
-	    filearg[0] = savestr(bestguess);
-	    skip_rest_of_patch = TRUE;
-	    return TRUE;
+	if (p_base != 0L && p_base >= p_filesize) {
+		if (verbose)
+			say1("done\n");
+		return FALSE;
 	}
-	(void) ask1("File to patch: ");
-	if (*buf != '\n') {
-	    if (bestguess)
-		free(bestguess);
-	    bestguess = savestr(buf);
-	    filearg[0] = fetchname(buf, 0, FALSE);
+	if (verbose)
+		say1("Hmm...");
+	diff_type = intuit_diff_type();
+	if (!diff_type) {
+		if (p_base != 0L) {
+			if (verbose)
+				say1("  Ignoring the trailing garbage.\ndone\n");
+		}
+		else
+			say1("  I can't seem to find a patch in there anywhere.\n");
+		return FALSE;
 	}
-	if (filearg[0] == Nullch) {
-	    if (ask1("No file found--skip this patch? [n] ")) {
-	    	if (*buf != 'y') {
-		    continue;
-	    	}
-	    }
-	    if (verbose)
-		say1("Skipping patch...\n");
-	    filearg[0] = fetchname(bestguess, 0, TRUE);
-	    skip_rest_of_patch = TRUE;
-	    return TRUE;
+	if (verbose)
+		say3("  %sooks like %s to me...\n",
+		    (p_base == 0L ? "L" : "The next patch l"),
+		    diff_type == UNI_DIFF ? "a unified diff" :
+		    diff_type == CONTEXT_DIFF ? "a context diff" :
+		    diff_type == NEW_CONTEXT_DIFF ?
+		    "a new-style context diff" :
+		    diff_type == NORMAL_DIFF ? "a normal diff" :
+		    "an ed script" );
+	if (p_indent && verbose)
+		say3("(Patch is indented %d space%s.)\n",
+		    p_indent, p_indent==1?"":"s");
+	skip_to(p_start,p_sline);
+	while (filearg[0] == Nullch) {
+		if (force || batch || skip_rest_of_patch) {
+			say1("No file to patch.  Skipping...\n");
+			filearg[0] = savestr(bestguess);
+			skip_rest_of_patch = TRUE;
+			return TRUE;
+		}
+		(void) ask1("File to patch: ");
+		if (*buf != '\n') {
+			if (bestguess)
+				free(bestguess);
+			bestguess = savestr(buf);
+			filearg[0] = fetchname(buf, 0, FALSE);
+		}
+		if (filearg[0] == Nullch) {
+			if (ask1("No file found--skip this patch? [n] ")) {
+				if (*buf != 'y') {
+					continue;
+				}
+			}
+			if (verbose)
+				say1("Skipping patch...\n");
+			filearg[0] = fetchname(bestguess, 0, TRUE);
+			skip_rest_of_patch = TRUE;
+			return TRUE;
+		}
 	}
-    }
-    return TRUE;
+	return TRUE;
 }
 
 /*
@@ -210,186 +217,198 @@ there_is_another_patch(void)
 int
 intuit_diff_type(void)
 {
-    Reg4 long this_line = 0;
-    Reg5 long previous_line;
-    Reg6 long first_command_line = -1;
-    long fcl_line;
-    Reg7 bool last_line_was_command = FALSE;
-    Reg8 bool this_is_a_command = FALSE;
-    Reg9 bool stars_last_line = FALSE;
-    Reg10 bool stars_this_line = FALSE;
-    Reg3 int indent;
-    Reg1 char *s;
-    Reg2 char *t;
-    char *indtmp = Nullch;
-    char *oldtmp = Nullch;
-    char *newtmp = Nullch;
-    char *indname = Nullch;
-    char *oldname = Nullch;
-    char *newname = Nullch;
-    Reg11 int retval;
-    bool no_filearg = (filearg[0] == Nullch);
-    extern int index_first;
+	Reg4 long this_line = 0;
+	Reg5 long previous_line;
+	Reg6 long first_command_line = -1;
+	long fcl_line;
+	Reg7 bool last_line_was_command = FALSE;
+	Reg8 bool this_is_a_command = FALSE;
+	Reg9 bool stars_last_line = FALSE;
+	Reg10 bool stars_this_line = FALSE;
+	Reg3 int indent;
+	Reg1 char *s;
+	Reg2 char *t;
+	char *indtmp = Nullch;
+	char *oldtmp = Nullch;
+	char *newtmp = Nullch;
+	char *indname = Nullch;
+	char *oldname = Nullch;
+	char *newname = Nullch;
+	Reg11 int retval;
+	bool no_filearg = (filearg[0] == Nullch);
+	extern int index_first;
 
-    ok_to_create_file = FALSE;
-    Fseek(pfp, p_base, 0);
-    p_input_line = p_bline - 1;
-    for (;;) {
-	previous_line = this_line;
-	last_line_was_command = this_is_a_command;
-	stars_last_line = stars_this_line;
-	this_line = ftell(pfp);
-	indent = 0;
-	p_input_line++;
-	if (fgets(buf, sizeof buf, pfp) == Nullch) {
-	    if (first_command_line >= 0L) {
-					/* nothing but deletes!? */
-		p_start = first_command_line;
-		p_sline = fcl_line;
-		retval = ED_DIFF;
-		goto scan_exit;
-	    }
-	    else {
-		p_start = this_line;
-		p_sline = p_input_line;
-		retval = 0;
-		goto scan_exit;
-	    }
-	}
-	for (s = buf; *s == ' ' || *s == '\t' || *s == 'X'; s++) {
-	    if (*s == '\t')
-		indent += 8 - (indent % 8);
-	    else
-		indent++;
-	}
-	for (t=s; isdigit((unsigned char)*t) || *t == ','; t++) ;
-	this_is_a_command = (isdigit((unsigned char)*s) &&
-	  (*t == 'd' || *t == 'c' || *t == 'a') );
-	if (first_command_line < 0L && this_is_a_command) {
-	    first_command_line = this_line;
-	    fcl_line = p_input_line;
-	    p_indent = indent;		/* assume this for now */
-	}
-	if (!stars_last_line && strnEQ(s, "*** ", 4))
-	    oldtmp = savestr(s+4);
-	else if (strnEQ(s, "--- ", 4))
-	    newtmp = savestr(s+4);
-	else if (strnEQ(s, "+++ ", 4))
-	    oldtmp = savestr(s+4);	/* pretend it is the old name */
-	else if (strnEQ(s, "Index:", 6))
-	    indtmp = savestr(s+6);
-	else if (strnEQ(s, "Prereq:", 7)) {
-	    for (t=s+7; isspace((unsigned char)*t); t++) ;
-	    revision = savestr(t);
-	    for (t=revision; *t && !isspace((unsigned char)*t); t++) ;
-	    *t = '\0';
-	    if (!*revision) {
-		free(revision);
-		revision = Nullch;
-	    }
-	}
-	if ((!diff_type || diff_type == ED_DIFF) &&
-	  first_command_line >= 0L &&
-	  strEQ(s, ".\n") ) {
-	    p_indent = indent;
-	    p_start = first_command_line;
-	    p_sline = fcl_line;
-	    retval = ED_DIFF;
-	    goto scan_exit;
+	ok_to_create_file = FALSE;
+	Fseek(pfp, p_base, 0);
+	p_input_line = p_bline - 1;
+	for (;;) {
+		previous_line = this_line;
+		last_line_was_command = this_is_a_command;
+		stars_last_line = stars_this_line;
+		this_line = ftell(pfp);
+		indent = 0;
+		p_input_line++;
+		if (fgets(buf, sizeof buf, pfp) == Nullch) {
+			if (first_command_line >= 0L) {
+				/* nothing but deletes!? */
+				p_start = first_command_line;
+				p_sline = fcl_line;
+				retval = ED_DIFF;
+				goto scan_exit;
+			}
+			else {
+				p_start = this_line;
+				p_sline = p_input_line;
+				retval = 0;
+				goto scan_exit;
+			}
+		}
+		for (s = buf; *s == ' ' || *s == '\t' || *s == 'X'; s++) {
+			if (*s == '\t')
+				indent += 8 - (indent % 8);
+			else
+				indent++;
+		}
+		for (t=s; isdigit((unsigned char)*t) || *t == ','; t++)
+			;
+		this_is_a_command = (isdigit((unsigned char)*s) &&
+		    (*t == 'd' || *t == 'c' || *t == 'a') );
+		if (first_command_line < 0L && this_is_a_command) {
+			first_command_line = this_line;
+			fcl_line = p_input_line;
+			p_indent = indent;	/* assume this for now */
+		}
+		if (!stars_last_line && strnEQ(s, "*** ", 4))
+			oldtmp = savestr(s+4);
+		else if (strnEQ(s, "--- ", 4))
+			newtmp = savestr(s+4);
+		else if (strnEQ(s, "+++ ", 4))
+			oldtmp = savestr(s+4);	/* pretend it is the old name */
+		else if (strnEQ(s, "Index:", 6))
+			indtmp = savestr(s+6);
+		else if (strnEQ(s, "Prereq:", 7)) {
+			for (t = s + 7; isspace((unsigned char)*t); t++)
+				;
+			revision = savestr(t);
+			for (t = revision; *t && !isspace((unsigned char)*t);
+			    t++)
+				;
+			*t = '\0';
+			if (!*revision) {
+				free(revision);
+				revision = Nullch;
+			}
+		}
+		if ((!diff_type || diff_type == ED_DIFF) &&
+		    first_command_line >= 0L &&
+		    strEQ(s, ".\n") ) {
+			p_indent = indent;
+			p_start = first_command_line;
+			p_sline = fcl_line;
+			retval = ED_DIFF;
+			goto scan_exit;
+		}
+		if ((!diff_type || diff_type == UNI_DIFF) &&
+		    strnEQ(s, "@@ -", 4)) {
+			if (!atol(s+3))
+				ok_to_create_file = TRUE;
+			p_indent = indent;
+			p_start = this_line;
+			p_sline = p_input_line;
+			retval = UNI_DIFF;
+			goto scan_exit;
+		}
+		stars_this_line = strnEQ(s, "********", 8);
+		if ((!diff_type || diff_type == CONTEXT_DIFF) &&
+		    stars_last_line &&
+		    strnEQ(s, "*** ", 4)) {
+			if (!atol(s+4))
+				ok_to_create_file = TRUE;
+			/*
+			 * If this is a new context diff the character just
+			 * before the newline is a '*'.
+			 */
+			while (*s != '\n')
+				s++;
+			p_indent = indent;
+			p_start = previous_line;
+			p_sline = p_input_line - 1;
+			retval = (*(s-1) == '*' ?
+			    NEW_CONTEXT_DIFF : CONTEXT_DIFF);
+			goto scan_exit;
+		}
+		if ((!diff_type || diff_type == NORMAL_DIFF) &&
+		    last_line_was_command &&
+		    (strnEQ(s, "< ", 2) || strnEQ(s, "> ", 2)) ) {
+			p_start = previous_line;
+			p_sline = p_input_line - 1;
+			p_indent = indent;
+			retval = NORMAL_DIFF;
+			goto scan_exit;
+		}
 	}
-	if ((!diff_type || diff_type == UNI_DIFF) && strnEQ(s, "@@ -", 4)) {
-	    if (!atol(s+3))
-		ok_to_create_file = TRUE;
-	    p_indent = indent;
-	    p_start = this_line;
-	    p_sline = p_input_line;
-	    retval = UNI_DIFF;
-	    goto scan_exit;
+ scan_exit:
+	if (no_filearg) {
+		if (indtmp != Nullch)
+			indname = fetchname(indtmp, strippath,
+			    ok_to_create_file);
+		if (oldtmp != Nullch)
+			oldname = fetchname(oldtmp, strippath,
+			    ok_to_create_file);
+		if (newtmp != Nullch)
+			newname = fetchname(newtmp, strippath,
+			    ok_to_create_file);
+		if (index_first && indname)
+			filearg[0] = savestr(indname);
+		else if (oldname && newname) {
+			if (strlen(oldname) < strlen(newname))
+				filearg[0] = savestr(oldname);
+			else
+				filearg[0] = savestr(newname);
+		} else if (indname)
+			filearg[0] = savestr(indname);
+		else if (oldname)
+			filearg[0] = savestr(oldname);
+		else if (newname)
+			filearg[0] = savestr(newname);
 	}
-	stars_this_line = strnEQ(s, "********", 8);
-	if ((!diff_type || diff_type == CONTEXT_DIFF) && stars_last_line &&
-		 strnEQ(s, "*** ", 4)) {
-	    if (!atol(s+4))
-		ok_to_create_file = TRUE;
-	    /* if this is a new context diff the character just before */
-	    /* the newline is a '*'. */
-	    while (*s != '\n')
-		s++;
-	    p_indent = indent;
-	    p_start = previous_line;
-	    p_sline = p_input_line - 1;
-	    retval = (*(s-1) == '*' ? NEW_CONTEXT_DIFF : CONTEXT_DIFF);
-	    goto scan_exit;
+	if (bestguess) {
+		free(bestguess);
+		bestguess = Nullch;
 	}
-	if ((!diff_type || diff_type == NORMAL_DIFF) &&
-	  last_line_was_command &&
-	  (strnEQ(s, "< ", 2) || strnEQ(s, "> ", 2)) ) {
-	    p_start = previous_line;
-	    p_sline = p_input_line - 1;
-	    p_indent = indent;
-	    retval = NORMAL_DIFF;
-	    goto scan_exit;
+	if (filearg[0] != Nullch)
+		bestguess = savestr(filearg[0]);
+	else if (indtmp != Nullch)
+		bestguess = fetchname(indtmp, strippath, TRUE);
+	else {
+		if (oldtmp != Nullch)
+			oldname = fetchname(oldtmp, strippath, TRUE);
+		if (newtmp != Nullch)
+			newname = fetchname(newtmp, strippath, TRUE);
+		if (oldname && newname) {
+			if (strlen(oldname) < strlen(newname))
+				bestguess = savestr(oldname);
+			else
+				bestguess = savestr(newname);
+		}
+		else if (oldname)
+			bestguess = savestr(oldname);
+		else if (newname)
+			bestguess = savestr(newname);
 	}
-    }
-  scan_exit:
-    if (no_filearg) {
 	if (indtmp != Nullch)
-	    indname = fetchname(indtmp, strippath, ok_to_create_file);
+		free(indtmp);
 	if (oldtmp != Nullch)
-	    oldname = fetchname(oldtmp, strippath, ok_to_create_file);
+		free(oldtmp);
 	if (newtmp != Nullch)
-	    newname = fetchname(newtmp, strippath, ok_to_create_file);
-	if (index_first && indname)
-	    filearg[0] = savestr(indname);
-	else if (oldname && newname) {
-	    if (strlen(oldname) < strlen(newname))
-		filearg[0] = savestr(oldname);
-	    else
-		filearg[0] = savestr(newname);
-	} else if (indname)
-	    filearg[0] = savestr(indname);
-	else if (oldname)
-	    filearg[0] = savestr(oldname);
-	else if (newname)
-	    filearg[0] = savestr(newname);
-    }
-    if (bestguess) {
-	free(bestguess);
-	bestguess = Nullch;
-    }
-    if (filearg[0] != Nullch)
-	bestguess = savestr(filearg[0]);
-    else if (indtmp != Nullch)
-	bestguess = fetchname(indtmp, strippath, TRUE);
-    else {
-	if (oldtmp != Nullch)
-	    oldname = fetchname(oldtmp, strippath, TRUE);
-	if (newtmp != Nullch)
-	    newname = fetchname(newtmp, strippath, TRUE);
-	if (oldname && newname) {
-	    if (strlen(oldname) < strlen(newname))
-		bestguess = savestr(oldname);
-	    else
-		bestguess = savestr(newname);
-	}
-	else if (oldname)
-	    bestguess = savestr(oldname);
-	else if (newname)
-	    bestguess = savestr(newname);
-    }
-    if (indtmp != Nullch)
-	free(indtmp);
-    if (oldtmp != Nullch)
-	free(oldtmp);
-    if (newtmp != Nullch)
-	free(newtmp);
-    if (indname != Nullch)
-	free(indname);
-    if (oldname != Nullch)
-	free(oldname);
-    if (newname != Nullch)
-	free(newname);
-    return retval;
+		free(newtmp);
+	if (indname != Nullch)
+		free(indname);
+	if (oldname != Nullch)
+		free(oldname);
+	if (newname != Nullch)
+		free(newname);
+	return retval;
 }
 
 /*
@@ -398,8 +417,8 @@ intuit_diff_type(void)
 void
 next_intuit_at(long file_pos, long file_line)
 {
-    p_base = file_pos;
-    p_bline = file_line;
+	p_base = file_pos;
+	p_bline = file_line;
 }
 
 /*
@@ -408,29 +427,31 @@ next_intuit_at(long file_pos, long file_line)
 void
 skip_to(long file_pos, long file_line)
 {
-    char *ret;
+	char *ret;
 
-    assert(p_base <= file_pos);
-    if (verbose && p_base < file_pos) {
-	Fseek(pfp, p_base, 0);
-	say1("The text leading up to this was:\n--------------------------\n");
-	while (ftell(pfp) < file_pos) {
-	    ret = fgets(buf, sizeof buf, pfp);
-	    assert(ret != Nullch);
-	    say2("|%s", buf);
+	assert(p_base <= file_pos);
+	if (verbose && p_base < file_pos) {
+		Fseek(pfp, p_base, 0);
+		say1("The text leading up to this was:\n--------------------------\n");
+		while (ftell(pfp) < file_pos) {
+			ret = fgets(buf, sizeof buf, pfp);
+			assert(ret != Nullch);
+			say2("|%s", buf);
+		}
+		say1("--------------------------\n");
 	}
-	say1("--------------------------\n");
-    }
-    else
-	Fseek(pfp, file_pos, 0);
-    p_input_line = file_line - 1;
+	else
+		Fseek(pfp, file_pos, 0);
+	p_input_line = file_line - 1;
 }
 
-/* Make this a function for better debugging.  */
+/*
+ * Make this a function for better debugging.
+ */
 static void
 malformed(void)
 {
-    fatal3("malformed patch at line %ld: %s", p_input_line, buf);
+	fatal3("malformed patch at line %ld: %s", p_input_line, buf);
 		/* about as informative as "Syntax error" in C */
 }
 
@@ -458,8 +479,9 @@ remove_special_line(void)
 	return FALSE;
 }
 
-/* True if there is more of the current diff listing to process. */
-
+/*
+ * True if there is more of the current diff listing to process.
+ */
 bool
 another_hunk(void)
 {
@@ -915,7 +937,7 @@ another_hunk(void)
 		break;
 	    case '=':
 		ch = ' ';
-		/* FALL THROUGH */
+		/* FALLTHROUGH */
 	    case ' ':
 		if (fillsrc > p_ptrn_lines) {
 		    free(s);
@@ -935,7 +957,7 @@ another_hunk(void)
 		    p_end = fillsrc-1;
 		    return FALSE;
 		}
-		/* FALL THROUGH */
+		/* FALLTHROUGH */
 	    case '+':
 		if (filldst > p_end) {
 		    free(s);
@@ -1101,129 +1123,129 @@ another_hunk(void)
 char *
 pgets(char *bf, int sz, FILE *fp)
 {
-    char *ret = fgets(bf, sz, fp);
-    Reg1 char *s;
-    Reg2 int indent = 0;
+	char *ret = fgets(bf, sz, fp);
+	Reg1 char *s;
+	Reg2 int indent = 0;
 
-    if (p_indent && ret != Nullch) {
-	for (s=buf;
-	  indent < p_indent && (*s == ' ' || *s == '\t' || *s == 'X'); s++) {
-	    if (*s == '\t')
-		indent += 8 - (indent % 7);
-	    else
-		indent++;
+	if (p_indent && ret != Nullch) {
+		for (s=buf;
+		    indent < p_indent && (*s == ' ' || *s == '\t' || *s == 'X');
+		    s++) {
+			if (*s == '\t')
+				indent += 8 - (indent % 7);
+			else
+				indent++;
+		}
+		if (buf != s)
+			Strcpy(buf, s);
 	}
-	if (buf != s)
-	    Strcpy(buf, s);
-    }
-    return ret;
+	return ret;
 }
 
-
 /*
  * Reverse the old and new portions of the current hunk.
  */
 bool
 pch_swap(void)
 {
-    char **tp_line;		/* the text of the hunk */
-    short *tp_len;		/* length of each line */
-    char *tp_char;		/* +, -, and ! */
-    Reg1 LINENUM i;
-    Reg2 LINENUM n;
-    bool blankline = FALSE;
-    Reg3 char *s;
+	char **tp_line;		/* the text of the hunk */
+	short *tp_len;		/* length of each line */
+	char *tp_char;		/* +, -, and ! */
+	Reg1 LINENUM i;
+	Reg2 LINENUM n;
+	bool blankline = FALSE;
+	Reg3 char *s;
 
-    i = p_first;
-    p_first = p_newfirst;
-    p_newfirst = i;
+	i = p_first;
+	p_first = p_newfirst;
+	p_newfirst = i;
 
-    /* make a scratch copy */
+	/* make a scratch copy */
 
-    tp_line = p_line;
-    tp_len = p_len;
-    tp_char = p_Char;
-    p_line = Null(char**);	/* force set_hunkmax to allocate again */
-    p_len = Null(short*);
-    p_Char = Nullch;
-    set_hunkmax();
-    if (p_line == Null(char**) || p_len == Null(short*) || p_Char == Nullch) {
+	tp_line = p_line;
+	tp_len = p_len;
+	tp_char = p_Char;
+	p_line = Null(char**);	/* force set_hunkmax to allocate again */
+	p_len = Null(short*);
+	p_Char = Nullch;
+	set_hunkmax();
+	if (p_line == Null(char**) || p_len == Null(short*) || p_Char == Nullch) {
 #ifndef lint
-	if (p_line == Null(char**))
-	    free((char*)p_line);
-	p_line = tp_line;
-	if (p_len == Null(short*))
-	    free((char*)p_len);
-	p_len = tp_len;
+		if (p_line == Null(char**))
+			free((char*)p_line);
+		p_line = tp_line;
+		if (p_len == Null(short*))
+			free((char*)p_len);
+		p_len = tp_len;
 #endif
-	if (p_Char == Nullch)
-	    free((char*)p_Char);
-	p_Char = tp_char;
-	return FALSE;		/* not enough memory to swap hunk! */
-    }
+		if (p_Char == Nullch)
+			free((char*)p_Char);
+		p_Char = tp_char;
+		return FALSE;		/* not enough memory to swap hunk! */
+	}
 
-    /* now turn the new into the old */
+	/* now turn the new into the old */
 
-    i = p_ptrn_lines + 1;
-    if (tp_char[i] == '\n') {		/* account for possible blank line */
-	blankline = TRUE;
-	i++;
-    }
-    if (p_efake >= 0) {			/* fix non-freeable ptr range */
-	if (p_efake <= i)
-	    n = p_end - i + 1;
-	else
-	    n = -i;
-	p_efake += n;
-	p_bfake += n;
-    }
-    for (n=0; i <= p_end; i++,n++) {
-	p_line[n] = tp_line[i];
-	p_Char[n] = tp_char[i];
-	if (p_Char[n] == '+')
-	    p_Char[n] = '-';
-	p_len[n] = tp_len[i];
-    }
-    if (blankline) {
 	i = p_ptrn_lines + 1;
-	p_line[n] = tp_line[i];
-	p_Char[n] = tp_char[i];
-	p_len[n] = tp_len[i];
-	n++;
-    }
-    assert(p_Char[0] == '=');
-    p_Char[0] = '*';
-    for (s=p_line[0]; *s; s++)
-	if (*s == '-')
-	    *s = '*';
+	if (tp_char[i] == '\n') {	/* account for possible blank line */
+		blankline = TRUE;
+		i++;
+	}
+	if (p_efake >= 0) {		/* fix non-freeable ptr range */
+		if (p_efake <= i)
+			n = p_end - i + 1;
+		else
+			n = -i;
+		p_efake += n;
+		p_bfake += n;
+	}
+	for (n=0; i <= p_end; i++,n++) {
+		p_line[n] = tp_line[i];
+		p_Char[n] = tp_char[i];
+		if (p_Char[n] == '+')
+			p_Char[n] = '-';
+		p_len[n] = tp_len[i];
+	}
+	if (blankline) {
+		i = p_ptrn_lines + 1;
+		p_line[n] = tp_line[i];
+		p_Char[n] = tp_char[i];
+		p_len[n] = tp_len[i];
+		n++;
+	}
+	assert(p_Char[0] == '=');
+	p_Char[0] = '*';
+	for (s=p_line[0]; *s; s++)
+		if (*s == '-')
+			*s = '*';
 
-    /* now turn the old into the new */
+	/* now turn the old into the new */
 
-    assert(tp_char[0] == '*');
-    tp_char[0] = '=';
-    for (s=tp_line[0]; *s; s++)
-	if (*s == '*')
-	    *s = '-';
-    for (i=0; n <= p_end; i++,n++) {
-	p_line[n] = tp_line[i];
-	p_Char[n] = tp_char[i];
-	if (p_Char[n] == '-')
-	    p_Char[n] = '+';
-	p_len[n] = tp_len[i];
-    }
-    assert(i == p_ptrn_lines + 1);
-    i = p_ptrn_lines;
-    p_ptrn_lines = p_repl_lines;
-    p_repl_lines = i;
+	assert(tp_char[0] == '*');
+	tp_char[0] = '=';
+	for (s=tp_line[0]; *s; s++)
+		if (*s == '*')
+			*s = '-';
+	for (i=0; n <= p_end; i++,n++) {
+		p_line[n] = tp_line[i];
+		p_Char[n] = tp_char[i];
+		if (p_Char[n] == '-')
+			p_Char[n] = '+';
+		p_len[n] = tp_len[i];
+	}
+	assert(i == p_ptrn_lines + 1);
+	i = p_ptrn_lines;
+	p_ptrn_lines = p_repl_lines;
+	p_repl_lines = i;
 #ifndef lint
-    if (tp_line == Null(char**))
-	free((char*)tp_line);
-    if (tp_len == Null(short*))
-	free((char*)tp_len);
+	if (tp_line == Null(char**))
+		free((char*)tp_line);
+	if (tp_len == Null(short*))
+		free((char*)tp_len);
 #endif
-    if (tp_char == Nullch)
-	free((char*)tp_char);
-    return TRUE;
+	if (tp_char == Nullch)
+		free((char*)tp_char);
+	return TRUE;
 }
 
 /*
@@ -1232,7 +1254,7 @@ pch_swap(void)
 LINENUM
 pch_first(void)
 {
-    return p_first;
+	return p_first;
 }
 
 /*
@@ -1241,7 +1263,7 @@ pch_first(void)
 LINENUM
 pch_ptrn_lines(void)
 {
-    return p_ptrn_lines;
+	return p_ptrn_lines;
 }
 
 /*
@@ -1250,7 +1272,7 @@ pch_ptrn_lines(void)
 LINENUM
 pch_newfirst(void)
 {
-    return p_newfirst;
+	return p_newfirst;
 }
 
 /*
@@ -1259,7 +1281,7 @@ pch_newfirst(void)
 LINENUM
 pch_repl_lines(void)
 {
-    return p_repl_lines;
+	return p_repl_lines;
 }
 
 /*
@@ -1268,7 +1290,7 @@ pch_repl_lines(void)
 LINENUM
 pch_end(void)
 {
-    return p_end;
+	return p_end;
 }
 
 /*
@@ -1277,7 +1299,7 @@ pch_end(void)
 LINENUM
 pch_context(void)
 {
-    return p_context;
+	return p_context;
 }
 
 /*
@@ -1286,7 +1308,7 @@ pch_context(void)
 short
 pch_line_len(LINENUM line)
 {
-    return p_len[line];
+	return p_len[line];
 }
 
 /*
@@ -1295,7 +1317,7 @@ pch_line_len(LINENUM line)
 char
 pch_char(LINENUM line)
 {
-    return p_Char[line];
+	return p_Char[line];
 }
 
 /*
@@ -1304,7 +1326,7 @@ pch_char(LINENUM line)
 char *
 pfetch(LINENUM line)
 {
-    return p_line[line];
+	return p_line[line];
 }
 
 /*
@@ -1313,7 +1335,7 @@ pfetch(LINENUM line)
 LINENUM
 pch_hunk_beg(void)
 {
-    return p_hunk_beg;
+	return p_hunk_beg;
 }
 
 /*
@@ -1322,60 +1344,61 @@ pch_hunk_beg(void)
 void
 do_ed_script(void)
 {
-    Reg1 char *t;
-    Reg2 long beginning_of_this_line;
-    Reg3 bool this_line_is_command = FALSE;
-    Reg4 FILE *pipefp;
+	Reg1 char *t;
+	Reg2 long beginning_of_this_line;
+	Reg3 bool this_line_is_command = FALSE;
+	Reg4 FILE *pipefp;
 
-    if (!skip_rest_of_patch) {
-	Unlink(TMPOUTNAME);
-	copy_file(filearg[0], TMPOUTNAME);
-	if (verbose)
-	    Sprintf(buf, "/bin/ed %s", TMPOUTNAME);
-	else
-	    Sprintf(buf, "/bin/ed - %s", TMPOUTNAME);
-	pipefp = popen(buf, "w");
-    }
-    for (;;) {
-	beginning_of_this_line = ftell(pfp);
-	if (pgets(buf, sizeof buf, pfp) == Nullch) {
-	    next_intuit_at(beginning_of_this_line,p_input_line);
-	    break;
+	if (!skip_rest_of_patch) {
+		Unlink(TMPOUTNAME);
+		copy_file(filearg[0], TMPOUTNAME);
+		if (verbose)
+			Sprintf(buf, "/bin/ed %s", TMPOUTNAME);
+		else
+			Sprintf(buf, "/bin/ed - %s", TMPOUTNAME);
+		pipefp = popen(buf, "w");
 	}
-	p_input_line++;
-	for (t=buf; isdigit((unsigned char)*t) || *t == ','; t++) ;
-	this_line_is_command = (isdigit((unsigned char)*buf) &&
-	  (*t == 'd' || *t == 'c' || *t == 'a') );
-	if (this_line_is_command) {
-	    if (!skip_rest_of_patch)
-		fputs(buf, pipefp);
-	    if (*t != 'd') {
-		while (pgets(buf, sizeof buf, pfp) != Nullch) {
-		    p_input_line++;
-		    if (!skip_rest_of_patch)
-			fputs(buf, pipefp);
-		    if (strEQ(buf, ".\n"))
+	for (;;) {
+		beginning_of_this_line = ftell(pfp);
+		if (pgets(buf, sizeof buf, pfp) == Nullch) {
+			next_intuit_at(beginning_of_this_line, p_input_line);
+			break;
+		}
+		p_input_line++;
+		for (t=buf; isdigit((unsigned char)*t) || *t == ','; t++)
+			;
+		this_line_is_command = (isdigit((unsigned char)*buf) &&
+		    (*t == 'd' || *t == 'c' || *t == 'a') );
+		if (this_line_is_command) {
+			if (!skip_rest_of_patch)
+				fputs(buf, pipefp);
+			if (*t != 'd') {
+				while (pgets(buf, sizeof buf, pfp) != Nullch) {
+					p_input_line++;
+					if (!skip_rest_of_patch)
+						fputs(buf, pipefp);
+					if (strEQ(buf, ".\n"))
+						break;
+				}
+			}
+		}
+		else {
+			next_intuit_at(beginning_of_this_line,p_input_line);
 			break;
 		}
-	    }
 	}
-	else {
-	    next_intuit_at(beginning_of_this_line,p_input_line);
-	    break;
+	if (skip_rest_of_patch)
+		return;
+	fprintf(pipefp, "w\n");
+	fprintf(pipefp, "q\n");
+	Fflush(pipefp);
+	Pclose(pipefp);
+	ignore_signals();
+	if (move_file(TMPOUTNAME, outname) < 0) {
+		toutkeep = TRUE;
+		chmod(TMPOUTNAME, filemode);
 	}
-    }
-    if (skip_rest_of_patch)
-	return;
-    fprintf(pipefp, "w\n");
-    fprintf(pipefp, "q\n");
-    Fflush(pipefp);
-    Pclose(pipefp);
-    ignore_signals();
-    if (move_file(TMPOUTNAME, outname) < 0) {
-	toutkeep = TRUE;
-	chmod(TMPOUTNAME, filemode);
-    }
-    else
-	chmod(outname, filemode);
-    set_signals(1);
+	else
+		chmod(outname, filemode);
+	set_signals(1);
 }