Path: utzoo!mnetor!uunet!husc6!think!ames!umd5!purdue!i.cc.purdue.edu!j.cc.purdue.edu!ain From: ain@j.cc.purdue.edu (Patrick White) Newsgroups: comp.sources.amiga Subject: patch (part 2 of 2) Message-ID: <6619@j.cc.purdue.edu> Date: 7 Mar 88 01:35:20 GMT Organization: PUCC Land, USA Lines: 2041 Keywords: patch, source, part 2 of 2, untested. Approved: ain@j.cc.purdue.edu (Pat White) Program Name: patch (2 fo 2) Submitted By: Johan Widen Summary: patch for the Amiga. Poster Boy: Pat White (ain@j.cc.purdue.edu) untested. NOTES: I didn't try compiling this. -- Pat White (co-moderator comp.sources/binaries.amiga) UUCP: j.cc.purdue.edu!ain BITNET: PATWHITE@PURCCVM PHONE: (317) 743-8421 U.S. Mail: 320 Brown St. apt. 406, West Lafayette, IN 47906 ======================================== # This is a shell archive. # Remove everything above and including the cut line. # Then run the rest of the file through sh. #----cut here-----cut here-----cut here-----cut here----# #!/bin/sh # shar: Shell Archiver # Run the following text with /bin/sh to create: # patch.c # pch.c # version.c # version.h # This archive created: Sun Mar 6 02:44:02 1988 # By: Patrick White (PUCC Land, USA) echo shar: extracting patch.c '(18746 characters)' cat << \SHAR_EOF > patch.c char rcsid[] = "$Header: patch.c,v 2.0.1.4 87/02/16 14:00:04 lwall Exp $"; /* patch - a program to apply diffs to original files * * Copyright 1986, Larry Wall * * This program may be copied as long as you don't try to make any * money off of it, or pretend that you wrote it. * * $Log: patch.c,v $ * Revision 2.0.1.4 87/02/16 14:00:04 lwall * Short replacement caused spurious "Out of sync" message. * * Revision 2.0.1.3 87/01/30 22:45:50 lwall * Improved diagnostic on sync error. * Moved do_ed_script() to pch.c. * * Revision 2.0.1.2 86/11/21 09:39:15 lwall * Fuzz factor caused offset of installed lines. * * Revision 2.0.1.1 86/10/29 13:10:22 lwall * Backwards search could terminate prematurely. * * Revision 2.0 86/09/17 15:37:32 lwall * Baseline for netwide release. * * Revision 1.5 86/08/01 20:53:24 lwall * Changed some %d's to %ld's. * Linted. * * Revision 1.4 86/08/01 19:17:29 lwall * Fixes for machines that can't vararg. * Added fuzz factor. * Generalized -p. * General cleanup. * * 85/08/15 van%ucbmonet@berkeley * Changes for 4.3bsd diff -c. * * Revision 1.3 85/03/26 15:07:43 lwall * Frozen. * * Revision 1.2.1.9 85/03/12 17:03:35 lwall * Changed pfp->_file to fileno(pfp). * * Revision 1.2.1.8 85/03/12 16:30:43 lwall * Check i_ptr and i_womp to make sure they aren't null before freeing. * Also allow ed output to be suppressed. * * Revision 1.2.1.7 85/03/12 15:56:13 lwall * Added -p option from jromine@uci-750a. * * Revision 1.2.1.6 85/03/12 12:12:51 lwall * Now checks for normalness of file to patch. * * Revision 1.2.1.5 85/03/12 11:52:12 lwall * Added -D (#ifdef) option from joe@fluke. * * Revision 1.2.1.4 84/12/06 11:14:15 lwall * Made smarter about SCCS subdirectories. * * Revision 1.2.1.3 84/12/05 11:18:43 lwall * Added -l switch to do loose string comparison. * * Revision 1.2.1.2 84/12/04 09:47:13 lwall * Failed hunk count not reset on multiple patch file. * * Revision 1.2.1.1 84/12/04 09:42:37 lwall * Branch for sdcrdcf changes. * * Revision 1.2 84/11/29 13:29:51 lwall * Linted. Identifiers uniqified. Fixed i_ptr malloc() bug. Fixed * multiple calls to mktemp(). Will now work on machines that can only * read 32767 chars. Added -R option for diffs with new and old swapped. * Various cosmetic changes. * * Revision 1.1 84/11/09 17:03:58 lwall * Initial revision * */ #include "INTERN.h" #include "common.h" #include "EXTERN.h" #include "version.h" #include "util.h" #include "pch.h" #include "inp.h" /* procedures */ void reinitialize_almost_everything(); void get_some_switches(); LINENUM locate_hunk(); void abort_hunk(); void apply_hunk(); void init_output(); void init_reject(); void copy_till(); void spew_output(); void dump_line(); bool patch_match(); bool similar(); void re_input(); void my_exit(); /* Apply a set of diffs as appropriate. */ main(argc,argv) int argc; char **argv; { LINENUM where; LINENUM newwhere; LINENUM fuzz; LINENUM mymaxfuzz; int hunk = 0; int failed = 0; int i; setbuf(stderr, serrbuf); for (i = 0; i= 2) fatal1("You may not change to a different patch file.\n"); } /* Process switches and filenames up to next '+' or end of list. */ void get_some_switches() { Reg1 char *s; rejname[0] = '\0'; Argc_last = Argc; Argv_last = Argv; if (!Argc) return; for (Argc--,Argv++; Argc; Argc--,Argv++) { s = Argv[0]; if (strEQ(s, "+")) { return; /* + will be skipped by for loop */ } if (*s != '-' || !s[1]) { if (filec == MAXFILEC) fatal1("Too many file arguments.\n"); filearg[filec++] = savestr(s); } else { switch (*++s) { case 'b': origext = savestr(Argv[1]); Argc--,Argv++; break; case 'c': diff_type = CONTEXT_DIFF; break; case 'd': if (!*++s) { Argc--,Argv++; s = Argv[0]; } if (chdir(s) < 0) fatal2("Can't cd to %s.\n", s); break; case 'D': do_defines = TRUE; if (!*++s) { Argc--,Argv++; s = Argv[0]; } Sprintf(if_defined, "#ifdef %s\n", s); Sprintf(not_defined, "#ifndef %s\n", s); Sprintf(end_defined, "#endif /* %s */\n", s); break; case 'e': diff_type = ED_DIFF; break; case 'f': force = TRUE; break; case 'F': if (*++s == '=') s++; maxfuzz = atoi(s); break; case 'l': canonicalize = TRUE; break; case 'n': diff_type = NORMAL_DIFF; break; case 'N': noreverse = TRUE; break; case 'o': outname = savestr(Argv[1]); Argc--,Argv++; break; case 'p': if (*++s == '=') s++; strippath = atoi(s); break; case 'r': Strcpy(rejname, Argv[1]); Argc--,Argv++; break; case 'R': reverse = TRUE; break; case 's': verbose = FALSE; break; case 'S': skip_rest_of_patch = TRUE; break; case 'v': version(); break; #ifdef DEBUGGING case 'x': debug = atoi(s+1); break; #endif default: fatal2("Unrecognized switch: %s\n", Argv[0]); } } } } /* Attempt to find the right place to apply this hunk of patch. */ LINENUM locate_hunk(fuzz) LINENUM fuzz; { Reg1 LINENUM first_guess = pch_first() + last_offset; Reg2 LINENUM offset; LINENUM pat_lines = pch_ptrn_lines(); Reg3 LINENUM max_pos_offset = input_lines - first_guess - pat_lines + 1; Reg4 LINENUM max_neg_offset = first_guess - last_frozen_line - 1 + pch_context(); if (!pat_lines) /* null range matches always */ return first_guess; if (max_neg_offset >= first_guess) /* do not try lines < 0 */ max_neg_offset = first_guess - 1; if (first_guess <= input_lines && patch_match(first_guess, Nulline, fuzz)) return first_guess; for (offset = 1; ; offset++) { Reg5 bool check_after = (offset <= max_pos_offset); Reg6 bool check_before = (offset <= max_neg_offset); if (check_after && patch_match(first_guess, offset, fuzz)) { #ifdef DEBUGGING if (debug & 1) say3("Offset changing from %ld to %ld\n", last_offset, offset); #endif last_offset = offset; return first_guess+offset; } else if (check_before && patch_match(first_guess, -offset, fuzz)) { #ifdef DEBUGGING if (debug & 1) say3("Offset changing from %ld to %ld\n", last_offset, -offset); #endif last_offset = -offset; return first_guess-offset; } else if (!check_before && !check_after) return Nulline; } } /* We did not find the pattern, dump out the hunk so they can handle it. */ void abort_hunk() { Reg1 LINENUM i; Reg2 LINENUM pat_end = pch_end(); /* add in last_offset to guess the same as the previous successful hunk */ LINENUM oldfirst = pch_first() + last_offset; LINENUM newfirst = pch_newfirst() + last_offset; LINENUM oldlast = oldfirst + pch_ptrn_lines() - 1; LINENUM newlast = newfirst + pch_repl_lines() - 1; char *stars = (diff_type == NEW_CONTEXT_DIFF ? " ****" : ""); char *minuses = (diff_type == NEW_CONTEXT_DIFF ? " ----" : " -----"); fprintf(rejfp, "***************\n"); for (i=0; i<=pat_end; i++) { switch (pch_char(i)) { case '*': if (oldlast < oldfirst) fprintf(rejfp, "*** 0%s\n", stars); else if (oldlast == oldfirst) fprintf(rejfp, "*** %ld%s\n", oldfirst, stars); else fprintf(rejfp, "*** %ld,%ld%s\n", oldfirst, oldlast, stars); break; case '=': if (newlast < newfirst) fprintf(rejfp, "--- 0%s\n", minuses); else if (newlast == newfirst) fprintf(rejfp, "--- %ld%s\n", newfirst, minuses); else fprintf(rejfp, "--- %ld,%ld%s\n", newfirst, newlast, minuses); break; case '\n': fprintf(rejfp, "%s", pfetch(i)); break; case ' ': case '-': case '+': case '!': fprintf(rejfp, "%c %s", pch_char(i), pfetch(i)); break; default: say1("Fatal internal error in abort_hunk().\n"); abort(); } } } /* We found where to apply it (we hope), so do it. */ void apply_hunk(where) LINENUM where; { Reg1 LINENUM old = 1; Reg2 LINENUM lastline = pch_ptrn_lines(); Reg3 LINENUM new = lastline+1; #define OUTSIDE 0 #define IN_IFNDEF 1 #define IN_IFDEF 2 #define IN_ELSE 3 Reg4 int def_state = OUTSIDE; Reg5 bool R_do_defines = do_defines; Reg6 LINENUM pat_end = pch_end(); where--; while (pch_char(new) == '=' || pch_char(new) == '\n') new++; while (old <= lastline) { if (pch_char(old) == '-') { copy_till(where + old - 1); if (R_do_defines) { if (def_state == OUTSIDE) { fputs(not_defined, ofp); def_state = IN_IFNDEF; } else if (def_state == IN_IFDEF) { fputs(else_defined, ofp); def_state = IN_ELSE; } fputs(pfetch(old), ofp); } last_frozen_line++; old++; } else if (new > pat_end) break; else if (pch_char(new) == '+') { copy_till(where + old - 1); if (R_do_defines) { if (def_state == IN_IFNDEF) { fputs(else_defined, ofp); def_state = IN_ELSE; } else if (def_state == OUTSIDE) { fputs(if_defined, ofp); def_state = IN_IFDEF; } } fputs(pfetch(new), ofp); new++; } else { if (pch_char(new) != pch_char(old)) { say3( "Out-of-sync patch, lines %ld,%ld--mangled text or line numbers, maybe?\n", pch_hunk_beg() + old, pch_hunk_beg() + new); #ifdef DEBUGGING say3("oldchar = '%c', newchar = '%c'\n", pch_char(old), pch_char(new)); #endif my_exit(1); } if (pch_char(new) == '!') { copy_till(where + old - 1); if (R_do_defines) { fputs(not_defined, ofp); def_state = IN_IFNDEF; } while (pch_char(old) == '!') { if (R_do_defines) { fputs(pfetch(old), ofp); } last_frozen_line++; old++; } if (R_do_defines) { fputs(else_defined, ofp); def_state = IN_ELSE; } while (pch_char(new) == '!') { fputs(pfetch(new), ofp); new++; } if (R_do_defines) { fputs(end_defined, ofp); def_state = OUTSIDE; } } else { assert(pch_char(new) == ' '); old++; new++; } } } if (new <= pat_end && pch_char(new) == '+') { copy_till(where + old - 1); if (R_do_defines) { if (def_state == OUTSIDE) { fputs(if_defined, ofp); def_state = IN_IFDEF; } else if (def_state == IN_IFNDEF) { fputs(else_defined, ofp); def_state = IN_ELSE; } } while (new <= pat_end && pch_char(new) == '+') { fputs(pfetch(new), ofp); new++; } } if (R_do_defines && def_state != OUTSIDE) { fputs(end_defined, ofp); } } /* Open the new file. */ void init_output(name) char *name; { ofp = fopen(name, "w"); if (ofp == Nullfp) fatal2("patch: can't create %s.\n", name); } /* Open a file to put hunks we can't locate. */ void init_reject(name) char *name; { rejfp = fopen(name, "w"); if (rejfp == Nullfp) fatal2("patch: can't create %s.\n", name); } /* Copy input file to output, up to wherever hunk is to be applied. */ void copy_till(lastline) Reg1 LINENUM lastline; { Reg2 LINENUM R_last_frozen_line = last_frozen_line; if (R_last_frozen_line > lastline) say1("patch: misordered hunks! output will be garbled.\n"); while (R_last_frozen_line < lastline) { dump_line(++R_last_frozen_line); } last_frozen_line = R_last_frozen_line; } /* Finish copying the input file to the output file. */ void spew_output() { #ifdef DEBUGGING if (debug & 256) say3("il=%ld lfl=%ld\n",input_lines,last_frozen_line); #endif if (input_lines) copy_till(input_lines); /* dump remainder of file */ Fclose(ofp); ofp = Nullfp; } /* Copy one line from input to output. */ void dump_line(line) LINENUM line; { Reg1 char *s; Reg2 char R_newline = '\n'; /* Note: string is not null terminated. */ for (s=ifetch(line, 0); putc(*s, ofp) != R_newline; s++) ; } /* Does the patch pattern match at line base+offset? */ bool patch_match(base, offset, fuzz) LINENUM base; LINENUM offset; LINENUM fuzz; { Reg1 LINENUM pline = 1 + fuzz; Reg2 LINENUM iline; Reg3 LINENUM pat_lines = pch_ptrn_lines() - fuzz; for (iline=base+offset+fuzz; pline <= pat_lines; pline++,iline++) { if (canonicalize) { if (!similar(ifetch(iline, (offset >= 0)), pfetch(pline), pch_line_len(pline) )) return FALSE; } else if (strnNE(ifetch(iline, (offset >= 0)), pfetch(pline), pch_line_len(pline) )) return FALSE; } return TRUE; } /* Do two lines match with canonicalized white space? */ bool similar(a,b,len) Reg1 char *a; Reg2 char *b; Reg3 int len; { while (len) { if (isspace(*b)) { /* whitespace (or \n) to match? */ if (!isspace(*a)) /* no corresponding whitespace? */ return FALSE; while (len && isspace(*b) && *b != '\n') b++,len--; /* skip pattern whitespace */ while (isspace(*a) && *a != '\n') a++; /* skip target whitespace */ if (*a == '\n' || *b == '\n') return (*a == *b); /* should end in sync */ } else if (*a++ != *b++) /* match non-whitespace chars */ return FALSE; else len--; /* probably not necessary */ } return TRUE; /* actually, this is not reached */ /* since there is always a \n */ } /* Exit with cleanup. */ void my_exit(status) int status; { Unlink(TMPINNAME); if (!toutkeep) { Unlink(TMPOUTNAME); } if (!trejkeep) { Unlink(TMPREJNAME); } if(pfp) { fclose(pfp); } Unlink(TMPPATNAME); cleanMachSpecific(); exit(status); } SHAR_EOF if test 18746 -ne "`wc -c patch.c`" then echo shar: error transmitting patch.c '(should have been 18746 characters)' fi echo shar: extracting pch.c '(28573 characters)' cat << \SHAR_EOF > pch.c /* $Header: pch.c,v 2.0.1.6 87/06/04 16:18:13 lwall Exp $ * * $Log: pch.c,v $ * Revision 2.0.1.6 87/06/04 16:18:13 lwall * pch_swap didn't swap p_bfake and p_efake. * * Revision 2.0.1.5 87/01/30 22:47:42 lwall * Improved responses to mangled patches. * * Revision 2.0.1.4 87/01/05 16:59:53 lwall * New-style context diffs caused double call to free(). * * Revision 2.0.1.3 86/11/14 10:08:33 lwall * Fixed problem where a long pattern wouldn't grow the hunk. * Also restored p_input_line when backtracking so error messages are right. * * Revision 2.0.1.2 86/11/03 17:49:52 lwall * New-style delete triggers spurious assertion error. * * Revision 2.0.1.1 86/10/29 15:52:08 lwall * Could falsely report new-style context diff. * * Revision 2.0 86/09/17 15:39:37 lwall * Baseline for netwide release. * */ #include "EXTERN.h" #include "common.h" #include "util.h" #include "INTERN.h" #include "pch.h" /* Patch (diff listing) abstract type. */ static long p_filesize; /* size of the patch file */ static LINENUM p_first; /* 1st line number */ static LINENUM p_newfirst; /* 1st line number of replacement */ static LINENUM p_ptrn_lines; /* # lines in pattern */ static LINENUM p_repl_lines; /* # lines in replacement text */ static LINENUM p_end = -1; /* last line in hunk */ static LINENUM p_max; /* max allowed value of p_end */ static LINENUM p_context = 3; /* # of context lines */ static LINENUM p_input_line = 0; /* current line # from patch file */ static char **p_line = Null(char**); /* the text of the hunk */ static short *p_len = Null(short*); /* length of each line */ static char *p_char = Nullch; /* +, -, and ! */ static int hunkmax = INITHUNKMAX; /* size of above arrays to begin with */ static int p_indent; /* indent to patch */ static LINENUM p_base; /* where to intuit this time */ static LINENUM p_bline; /* line # of p_base */ static LINENUM p_start; /* where intuit found a patch */ static LINENUM p_sline; /* and the line number for it */ static LINENUM p_hunk_beg; /* line number of current hunk */ static LINENUM p_efake = -1; /* end of faked up lines--don't free */ static LINENUM p_bfake = -1; /* beg of faked up lines */ /* Prepare to look for the next patch in the patch file. */ void re_patch() { 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. */ void open_patch_file(filename) char *filename; { if (filename == Nullch || !*filename || strEQ(filename, "-")) { pfp = fopen(TMPPATNAME, "w"); if (pfp == Nullfp) fatal2("patch: can't create %s.\n", TMPPATNAME); while (fgets(buf, sizeof buf, stdin) != Nullch) fputs(buf, pfp); Fclose(pfp); filename = TMPPATNAME; } pfp = fopen(filename, "r"); if (pfp == Nullfp) fatal2("patch file %s not found\n", filename); #ifdef AMIGA if(dfindOne(&filestat, filename, 0)) fatal2("dfindOne on file %s failed\n", filename); p_filesize = filestat.fib_Size; #else Fstat(fileno(pfp), &filestat); p_filesize = filestat.st_size; #endif next_intuit_at(0L,1L); /* start at the beginning */ set_hunkmax(); } /* Make sure our dynamically realloced tables are malloced to begin with. */ void set_hunkmax() { #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)); #endif if (p_char == Nullch) p_char = (char*) malloc((MEM)hunkmax * sizeof(char)); } /* Enlarge the arrays containing the current hunk of patch. */ void grow_hunkmax() { 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)); #endif if (p_line != Null(char**) && p_len != Null(short*) && p_char != Nullch) return; if (!using_plan_a) fatal1("patch: out of memory (grow_hunkmax)\n"); out_of_mem = TRUE; /* whatever is null will be allocated again */ /* from within plan_a(), of all places */ } /* True if the remainder of the patch file contains a diff of some sort. */ bool there_is_another_patch() { 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 == 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) { say1("No file to patch. Skipping...\n"); filearg[0] = savestr(bestguess); return TRUE; } #ifdef AMIGA fileRequest("File to patch"); #else ask1("File to patch: "); #endif if (*buf != '\n') { if (bestguess) free(bestguess); bestguess = savestr(buf); filearg[0] = fetchname(buf, 0, FALSE); } if (filearg[0] == Nullch) { #ifdef AMIGA ask1("No file found--skip this patch?"); #else ask1("No file found--skip this patch? [n] "); #endif 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; } /* Determine what kind of diff is in the remaining part of the patch file. */ int intuit_diff_type() { 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); 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++) { if (*s == '\t') indent += 8 - (indent % 8); else indent++; } for (t=s; isdigit(*t) || *t == ','; t++) ; this_is_a_command = (isdigit(*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, "Index:", 6)) indtmp = savestr(s+6); else if (strnEQ(s, "Prereq:", 7)) { for (t=s+7; isspace(*t); t++) ; revision = savestr(t); for (t=revision; *t && !isspace(*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; } 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; } } 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 (oldname && newname) { if (strlen(oldname) < strlen(newname)) filearg[0] = savestr(oldname); else filearg[0] = savestr(newname); } else if (oldname) filearg[0] = savestr(oldname); else if (newname) filearg[0] = savestr(newname); else if (indname) filearg[0] = savestr(indname); } 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; } /* Remember where this patch ends so we know where to start up again. */ void next_intuit_at(file_pos,file_line) long file_pos; long file_line; { p_base = file_pos; p_bline = file_line; } /* Basically a verbose fseek() to the actual diff listing. */ void skip_to(file_pos,file_line) long file_pos; long file_line; { 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); } say1("--------------------------\n"); } else Fseek(pfp, file_pos, 0); p_input_line = file_line - 1; } /* True if there is more of the current diff listing to process. */ bool another_hunk() { Reg1 char *s; Reg8 char *ret; Reg2 int context = 0; while (p_end >= 0) { if (p_end == p_efake) p_end = p_bfake; /* don't free twice */ else free(p_line[p_end]); p_end--; } assert(p_end == -1); p_efake = -1; p_max = hunkmax; /* gets reduced when --- found */ if (diff_type == CONTEXT_DIFF || diff_type == NEW_CONTEXT_DIFF) { long line_beginning = ftell(pfp); /* file pos of the current line */ LINENUM repl_beginning = 0; /* index of --- line */ Reg4 LINENUM fillcnt = 0; /* #lines of missing ptrn or repl */ Reg5 LINENUM fillsrc; /* index of first line to copy */ Reg6 LINENUM filldst; /* index of first missing line */ bool ptrn_spaces_eaten = FALSE; /* ptrn was slightly misformed */ Reg9 bool repl_could_be_missing = TRUE; /* no + or ! lines in this hunk */ bool repl_missing = FALSE; /* we are now backtracking */ long repl_backtrack_position = 0; /* file pos of first repl line */ LINENUM repl_patch_line; /* input line number for same */ Reg7 LINENUM ptrn_copiable = 0; /* # of copiable lines in ptrn */ ret = pgets(buf, sizeof buf, pfp); p_input_line++; if (ret == Nullch || strnNE(buf, "********", 8)) { next_intuit_at(line_beginning,p_input_line); return FALSE; } p_context = 100; p_hunk_beg = p_input_line + 1; while (p_end < p_max) { line_beginning = ftell(pfp); ret = pgets(buf, sizeof buf, pfp); p_input_line++; if (ret == Nullch) { if (p_max - p_end < 4) Strcpy(buf, " \n"); /* assume blank lines got chopped */ else { if (repl_beginning && repl_could_be_missing) { repl_missing = TRUE; goto hunk_done; } fatal1("Unexpected end of file in patch.\n"); } } p_end++; assert(p_end < hunkmax); p_char[p_end] = *buf; p_line[p_end] = Nullch; switch (*buf) { case '*': if (strnEQ(buf, "********", 8)) { if (repl_beginning && repl_could_be_missing) { repl_missing = TRUE; goto hunk_done; } else fatal2("Unexpected end of hunk at line %ld.\n", p_input_line); } if (p_end != 0) { if (repl_beginning && repl_could_be_missing) { repl_missing = TRUE; goto hunk_done; } fatal3("Unexpected *** at line %ld: %s", p_input_line, buf); } context = 0; p_line[p_end] = savestr(buf); if (out_of_mem) { p_end--; return FALSE; } for (s=buf; *s && !isdigit(*s); s++) ; if (!*s) goto malformed; p_first = (LINENUM) atol(s); while (isdigit(*s)) s++; if (*s == ',') { for (; *s && !isdigit(*s); s++) ; if (!*s) goto malformed; p_ptrn_lines = ((LINENUM)atol(s)) - p_first + 1; } else if (p_first) p_ptrn_lines = 1; else { p_ptrn_lines = 0; p_first = 1; } p_max = p_ptrn_lines + 6; /* we need this much at least */ while (p_max >= hunkmax) grow_hunkmax(); p_max = hunkmax; break; case '-': if (buf[1] == '-') { if (repl_beginning || (p_end != p_ptrn_lines + 1 + (p_char[p_end-1] == '\n'))) { if (p_end == 1) { /* `old' lines were omitted - set up to fill */ /* them in from 'new' context lines. */ p_end = p_ptrn_lines + 1; fillsrc = p_end + 1; filldst = 1; fillcnt = p_ptrn_lines; } else { if (repl_beginning) { if (repl_could_be_missing){ repl_missing = TRUE; goto hunk_done; } fatal3("Duplicate \"---\" at line %ld--check line numbers at line %ld.\n", p_input_line, p_hunk_beg + repl_beginning); } else { fatal4("%s \"---\" at line %ld--check line numbers at line %ld.\n", (p_end <= p_ptrn_lines ? "Premature" : "Overdue" ), p_input_line, p_hunk_beg); } } } repl_beginning = p_end; repl_backtrack_position = ftell(pfp); repl_patch_line = p_input_line; p_line[p_end] = savestr(buf); if (out_of_mem) { p_end--; return FALSE; } p_char[p_end] = '='; for (s=buf; *s && !isdigit(*s); s++) ; if (!*s) goto malformed; p_newfirst = (LINENUM) atol(s); while (isdigit(*s)) s++; if (*s == ',') { for (; *s && !isdigit(*s); s++) ; if (!*s) goto malformed; p_repl_lines = ((LINENUM)atol(s)) - p_newfirst + 1; } else if (p_newfirst) p_repl_lines = 1; else { p_repl_lines = 0; p_newfirst = 1; } p_max = p_repl_lines + p_end; if (p_max > MAXHUNKSIZE) fatal4("Hunk too large (%ld lines) at line %ld: %s", p_max, p_input_line, buf); while (p_max >= hunkmax) grow_hunkmax(); if (p_repl_lines != ptrn_copiable) repl_could_be_missing = FALSE; break; } goto change_line; case '+': case '!': repl_could_be_missing = FALSE; change_line: if (!isspace(buf[1]) && buf[1] != '>' && buf[1] != '<' && repl_beginning && repl_could_be_missing) { repl_missing = TRUE; goto hunk_done; } if (context > 0) { if (context < p_context) p_context = context; context = -1000; } p_line[p_end] = savestr(buf+2); if (out_of_mem) { p_end--; return FALSE; } break; case '\t': case '\n': /* assume the 2 spaces got eaten */ if (repl_beginning && repl_could_be_missing && (!ptrn_spaces_eaten || diff_type == NEW_CONTEXT_DIFF) ) { repl_missing = TRUE; goto hunk_done; } p_line[p_end] = savestr(buf); if (out_of_mem) { p_end--; return FALSE; } if (p_end != p_ptrn_lines + 1) { ptrn_spaces_eaten |= (repl_beginning != 0); context++; if (!repl_beginning) ptrn_copiable++; p_char[p_end] = ' '; } break; case ' ': if (!isspace(buf[1]) && repl_beginning && repl_could_be_missing) { repl_missing = TRUE; goto hunk_done; } context++; if (!repl_beginning) ptrn_copiable++; p_line[p_end] = savestr(buf+2); if (out_of_mem) { p_end--; return FALSE; } break; default: if (repl_beginning && repl_could_be_missing) { repl_missing = TRUE; goto hunk_done; } goto malformed; } /* set up p_len for strncmp() so we don't have to */ /* assume null termination */ if (p_line[p_end]) p_len[p_end] = strlen(p_line[p_end]); else p_len[p_end] = 0; } hunk_done: if (p_end >=0 && !repl_beginning) fatal2("No --- found in patch at line %ld\n", pch_hunk_beg()); if (repl_missing) { /* reset state back to just after --- */ p_input_line = repl_patch_line; for (p_end--; p_end > repl_beginning; p_end--) free(p_line[p_end]); Fseek(pfp, repl_backtrack_position, 0); /* redundant 'new' context lines were omitted - set */ /* up to fill them in from the old file context */ fillsrc = 1; filldst = repl_beginning+1; fillcnt = p_repl_lines; p_end = p_max; } if (diff_type == CONTEXT_DIFF && (fillcnt || (p_first > 1 && ptrn_copiable > 2*p_context)) ) { if (verbose) say1( "(Fascinating--this is really a new-style context diff but without the "); say1( "telltale\nextra asterisks on the *** line that usually indicate the new"); say1("style...)\n"); diff_type = NEW_CONTEXT_DIFF; } /* if there were omitted context lines, fill them in now */ if (fillcnt) { p_bfake = filldst; /* remember where not to free() */ p_efake = filldst + fillcnt - 1; while (fillcnt-- > 0) { while (fillsrc <= p_end && p_char[fillsrc] != ' ') fillsrc++; if (fillsrc > p_end) fatal2("Replacement text or line numbers mangled in hunk at line %ld\n", p_hunk_beg); p_line[filldst] = p_line[fillsrc]; p_char[filldst] = p_char[fillsrc]; p_len[filldst] = p_len[fillsrc]; fillsrc++; filldst++; } while (fillsrc <= p_end && fillsrc != repl_beginning && p_char[fillsrc] != ' ') fillsrc++; #ifdef DEBUGGING if (debug & 64) printf("fillsrc %ld, filldst %ld, rb %ld, e+1 %ld\n", fillsrc,filldst,repl_beginning,p_end+1); #endif assert(fillsrc==p_end+1 || fillsrc==repl_beginning); assert(filldst==p_end+1 || filldst==repl_beginning); } } else { /* normal diff--fake it up */ char hunk_type; Reg3 int i; LINENUM lMin, lMax; long line_beginning = ftell(pfp); p_context = 0; ret = pgets(buf, sizeof buf, pfp); p_input_line++; if (ret == Nullch || !isdigit(*buf)) { next_intuit_at(line_beginning,p_input_line); return FALSE; } p_first = (LINENUM)atol(buf); for (s=buf; isdigit(*s); s++) ; if (*s == ',') { p_ptrn_lines = (LINENUM)atol(++s) - p_first + 1; while (isdigit(*s)) s++; } else p_ptrn_lines = (*s != 'a'); hunk_type = *s; if (hunk_type == 'a') p_first++; /* do append rather than insert */ lMin = (LINENUM)atol(++s); for (; isdigit(*s); s++) ; if (*s == ',') lMax = (LINENUM)atol(++s); else lMax = lMin; if (hunk_type == 'd') lMin++; p_end = p_ptrn_lines + 1 + lMax - lMin + 1; if (p_end > MAXHUNKSIZE) fatal4("Hunk too large (%ld lines) at line %ld: %s", p_end, p_input_line, buf); while (p_end >= hunkmax) grow_hunkmax(); p_newfirst = lMin; p_repl_lines = lMax - lMin + 1; Sprintf(buf, "*** %ld,%ld\n", p_first, p_first + p_ptrn_lines - 1); p_line[0] = savestr(buf); if (out_of_mem) { p_end = -1; return FALSE; } p_char[0] = '*'; for (i=1; i<=p_ptrn_lines; i++) { ret = pgets(buf, sizeof buf, pfp); p_input_line++; if (ret == Nullch) fatal2("Unexpected end of file in patch at line %ld.\n", p_input_line); if (*buf != '<') fatal2("< expected at line %ld of patch.\n", p_input_line); p_line[i] = savestr(buf+2); if (out_of_mem) { p_end = i-1; return FALSE; } p_len[i] = strlen(p_line[i]); p_char[i] = '-'; } if (hunk_type == 'c') { ret = pgets(buf, sizeof buf, pfp); p_input_line++; if (ret == Nullch) fatal2("Unexpected end of file in patch at line %ld.\n", p_input_line); if (*buf != '-') fatal2("--- expected at line %ld of patch.\n", p_input_line); } Sprintf(buf, "--- %ld,%ld\n", lMin, lMax); p_line[i] = savestr(buf); if (out_of_mem) { p_end = i-1; return FALSE; } p_char[i] = '='; for (i++; i<=p_end; i++) { ret = pgets(buf, sizeof buf, pfp); p_input_line++; if (ret == Nullch) fatal2("Unexpected end of file in patch at line %ld.\n", p_input_line); if (*buf != '>') fatal2("> expected at line %ld of patch.\n", p_input_line); p_line[i] = savestr(buf+2); if (out_of_mem) { p_end = i-1; return FALSE; } p_len[i] = strlen(p_line[i]); p_char[i] = '+'; } } if (reverse) /* backwards patch? */ if (!pch_swap()) say1("Not enough memory to swap next hunk!\n"); #ifdef DEBUGGING if (debug & 2) { int i; char special; for (i=0; i <= p_end; i++) { if (i == p_ptrn_lines) special = '^'; else special = ' '; fprintf(stderr, "%3d %c %c %s", i, p_char[i], special, p_line[i]); Fflush(stderr); } } #endif if (p_end+1 < hunkmax) /* paranoia reigns supreme... */ p_char[p_end+1] = '^'; /* add a stopper for apply_hunk */ return TRUE; malformed: fatal3("Malformed patch at line %ld: %s", p_input_line, buf); /* about as informative as "Syntax error" in C */ return FALSE; /* for lint */ } /* Input a line from the patch file, worrying about indentation. */ char * pgets(bf,sz,fp) char *bf; int sz; FILE *fp; { 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++) { if (*s == '\t') indent += 8 - (indent % 7); else indent++; } if (buf != s) Strcpy(buf, s); } return ret; } /* Reverse the old and new portions of the current hunk. */ bool pch_swap() { 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; /* 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) { #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; #endif 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 */ 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 */ n = p_end - i + 1; if (p_efake > i) n = -n; 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 */ 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); #endif if (tp_char == Nullch) free((char*)tp_char); return TRUE; } /* Return the specified line position in the old file of the old context. */ LINENUM pch_first() { return p_first; } /* Return the number of lines of old context. */ LINENUM pch_ptrn_lines() { return p_ptrn_lines; } /* Return the probable line position in the new file of the first line. */ LINENUM pch_newfirst() { return p_newfirst; } /* Return the number of lines in the replacement text including context. */ LINENUM pch_repl_lines() { return p_repl_lines; } /* Return the number of lines in the whole hunk. */ LINENUM pch_end() { return p_end; } /* Return the number of context lines before the first changed line. */ LINENUM pch_context() { return p_context; } /* Return the length of a particular patch line. */ short pch_line_len(line) LINENUM line; { return p_len[line]; } /* Return the control character (+, -, *, !, etc) for a patch line. */ char pch_char(line) LINENUM line; { return p_char[line]; } /* Return a pointer to a particular patch line. */ char * pfetch(line) LINENUM line; { return p_line[line]; } /* Return where in the patch file this hunk began, for error messages. */ LINENUM pch_hunk_beg() { return p_hunk_beg; } #ifndef AMIGA /* Apply an ed script by feeding ed itself. */ void do_ed_script() { Reg1 char *t; Reg2 long beginning_of_this_line; Reg3 bool this_line_is_command = FALSE; Reg4 FILE *pipefp; FILE *popen(); 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; } p_input_line++; for (t=buf; isdigit(*t) || *t == ','; t++) ; this_line_is_command = (isdigit(*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; } } 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(); } #endif SHAR_EOF if test 28573 -ne "`wc -c pch.c`" then echo shar: error transmitting pch.c '(should have been 28573 characters)' fi echo shar: extracting version.c '(489 characters)' cat << \SHAR_EOF > version.c /* $Header: version.c,v 2.0 86/09/17 15:40:11 lwall Exp $ * * $Log: version.c,v $ * Revision 2.0 86/09/17 15:40:11 lwall * Baseline for netwide release. * */ #include "EXTERN.h" #include "common.h" #include "util.h" #include "INTERN.h" #include "patchlevel.h" #include "version.h" /* Print out the version number and die. */ void version() { extern char rcsid[]; #ifdef lint rcsid[0] = rcsid[0]; #else fatal3("%s\nPatch level: %d\n", rcsid, PATCHLEVEL); #endif } SHAR_EOF if test 489 -ne "`wc -c version.c`" then echo shar: error transmitting version.c '(should have been 489 characters)' fi echo shar: extracting version.h '(185 characters)' cat << \SHAR_EOF > version.h /* $Header: version.h,v 2.0 86/09/17 15:40:14 lwall Exp $ * * $Log: version.h,v $ * Revision 2.0 86/09/17 15:40:14 lwall * Baseline for netwide release. * */ void version(); SHAR_EOF if test 185 -ne "`wc -c version.h`" then echo shar: error transmitting version.h '(should have been 185 characters)' fi # End of shell archive exit 0