#ifndef lint static char sccsid[] = "@(#)patch.c 5.8 (Berkeley) 5/18/86"; #endif not lint /* patch - a program to apply diffs to original files * * $Header: patch.c,v 1.3 85/03/26 15:07:43 lwall Exp $ * * Copyright 1984, 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 $ * 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 * */ #define DEBUGGING /* shut lint up about the following when return value ignored */ #define Signal (void)signal #define Unlink (void)unlink #define Lseek (void)lseek #define Fseek (void)fseek #define Fstat (void)fstat #define Pclose (void)pclose #define Close (void)close #define Fclose (void)fclose #define Fflush (void)fflush #define Sprintf (void)sprintf #define Mktemp (void)mktemp #define Strcpy (void)strcpy #define Strcat (void)strcat #include #include #include #include #include #include /* constants */ #define TRUE (1) #define FALSE (0) #define MAXHUNKSIZE 2000 #define MAXLINELEN 1024 #define BUFFERSIZE 1024 #define ORIGEXT ".orig" #define SCCSPREFIX "s." #define GET "get -e %s" #define RCSSUFFIX ",v" #define CHECKOUT "co -l %s" /* handy definitions */ #define Null(t) ((t)0) #define Nullch Null(char *) #define Nullfp Null(FILE *) #define Ctl(ch) (ch & 037) #define strNE(s1,s2) (strcmp(s1,s2)) #define strEQ(s1,s2) (!strcmp(s1,s2)) #define strnNE(s1,s2,l) (strncmp(s1,s2,l)) #define strnEQ(s1,s2,l) (!strncmp(s1,s2,l)) /* typedefs */ typedef char bool; typedef long LINENUM; /* must be signed */ typedef unsigned MEM; /* what to feed malloc */ /* globals */ int Argc; /* guess */ char **Argv; struct stat filestat; /* file statistics area */ char serrbuf[BUFSIZ]; /* buffer for stderr */ char buf[MAXLINELEN]; /* general purpose buffer */ FILE *pfp = Nullfp; /* patch file pointer */ FILE *ofp = Nullfp; /* output file pointer */ FILE *rejfp = Nullfp; /* reject file pointer */ LINENUM input_lines = 0; /* how long is input file in lines */ LINENUM last_frozen_line = 0; /* how many input lines have been */ /* irretractibly output */ #define MAXFILEC 2 int filec = 0; /* how many file arguments? */ char *filearg[MAXFILEC]; char *outname = Nullch; char rejname[128]; char *origext = Nullch; char TMPOUTNAME[] = "/tmp/patchoXXXXXX"; char TMPINNAME[] = "/tmp/patchiXXXXXX"; /* you might want /usr/tmp here */ char TMPREJNAME[] = "/tmp/patchrXXXXXX"; char TMPPATNAME[] = "/tmp/patchpXXXXXX"; LINENUM last_offset = 0; #ifdef DEBUGGING int debug = 0; #endif bool verbose = TRUE; bool reverse = FALSE; bool noreverse = FALSE; bool skip_this_patch = FALSE; bool usepath = FALSE; bool canonicalize = FALSE; #define CONTEXT_DIFF 1 #define NORMAL_DIFF 2 #define ED_DIFF 3 #define NEW_CONTEXT_DIFF 4 int diff_type = 0; int do_defines = 0; /* patch using ifdef, ifndef, etc. */ char if_defined[128]; /* #ifdef xyzzy */ char not_defined[128]; /* #ifndef xyzzy */ char else_defined[] = "#else\n"; /* #else */ char end_defined[128]; /* #endif xyzzy */ char *revision = Nullch; /* prerequisite revision, if any */ /* procedures */ LINENUM locate_hunk(); bool patch_match(); bool similar(); char *malloc(); char *savestr(); char *strcpy(); char *strcat(); char *sprintf(); /* usually */ int my_exit(); bool rev_in_string(); char *fetchname(); long atol(); long lseek(); char *mktemp(); /* patch type */ bool there_is_another_patch(); bool another_hunk(); char *pfetch(); int pch_line_len(); LINENUM pch_first(); LINENUM pch_ptrn_lines(); LINENUM pch_newfirst(); LINENUM pch_repl_lines(); LINENUM pch_end(); LINENUM pch_context(); LINENUM pch_hunk_beg(); char pch_char(); char *pfetch(); char *pgets(); /* input file type */ char *ifetch(); /* apply a context patch to a named file */ main(argc,argv) int argc; char **argv; { LINENUM where; int hunk = 0; int failed = 0; int i; setbuf(stderr,serrbuf); for (i = 0; i= 2) fatal("You may not change to a different patch file.\n"); } get_some_switches() { register char *s; rejname[0] = '\0'; 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) fatal("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 (chdir(Argv[1]) < 0) fatal("Can't cd to %s.\n",Argv[1]); Argc--,Argv++; break; case 'D': do_defines++; Sprintf(if_defined, "#ifdef %s\n", Argv[1]); Sprintf(not_defined, "#ifndef %s\n", Argv[1]); Sprintf(end_defined, "#endif %s\n", Argv[1]); Argc--,Argv++; break; case 'e': diff_type = ED_DIFF; break; case 'l': canonicalize = TRUE; break; case 'n': diff_type = NORMAL_DIFF; break; case 'o': outname = savestr(Argv[1]); Argc--,Argv++; break; case 'p': usepath = TRUE; /* do not strip path names */ break; case 'r': Strcpy(rejname,Argv[1]); Argc--,Argv++; break; case 'R': reverse = TRUE; break; case 'N': noreverse = TRUE; break; case 's': verbose = FALSE; break; #ifdef DEBUGGING case 'x': debug = atoi(s+1); break; #endif default: fatal("Unrecognized switch: %s\n",Argv[0]); } } } } LINENUM locate_hunk() { register LINENUM first_guess = pch_first() + last_offset; register LINENUM offset; LINENUM pat_lines = pch_ptrn_lines(); register LINENUM max_pos_offset = input_lines - first_guess - pat_lines + 1; register 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,(LINENUM)0)) return first_guess; for (offset = 1; ; offset++) { bool check_after = (offset <= max_pos_offset); bool check_before = (offset <= max_pos_offset); if (check_after && patch_match(first_guess,offset)) { #ifdef DEBUGGING if (debug & 1) printf("Offset changing from %d to %d\n",last_offset,offset); #endif last_offset = offset; return first_guess+offset; } else if (check_before && patch_match(first_guess,-offset)) { #ifdef DEBUGGING if (debug & 1) printf("Offset changing from %d to %d\n",last_offset,-offset); #endif last_offset = -offset; return first_guess-offset; } else if (!check_before && !check_after) return Null(LINENUM); } } /* we did not find the pattern, dump out the hunk so they can handle it */ abort_hunk() { register LINENUM i; register LINENUM pat_end = pch_end(); /* add in last_offset to guess the same as the previous successful hunk */ int oldfirst = pch_first() + last_offset; int newfirst = pch_newfirst() + last_offset; int oldlast = oldfirst + pch_ptrn_lines() - 1; int newlast = newfirst + pch_repl_lines() - 1; fprintf(rejfp,"***************\n"); for (i=0; i<=pat_end; i++) { switch (pch_char(i)) { case '*': if (diff_type == NEW_CONTEXT_DIFF) fprintf(rejfp,"*** %d,%d ****\n", oldfirst, oldlast); else fprintf(rejfp,"*** %d,%d\n", oldfirst, oldlast); break; case '=': fprintf(rejfp,"--- %d,%d -----\n", newfirst, newlast); break; case '\n': fprintf(rejfp,"%s", pfetch(i)); break; case ' ': case '-': case '+': case '!': fprintf(rejfp,"%c %s", pch_char(i), pfetch(i)); break; default: say("Fatal internal error in abort_hunk().\n"); abort(); } } } /* we found where to apply it (we hope), so do it */ apply_hunk(where) LINENUM where; { register LINENUM old = 1; register LINENUM lastline = pch_ptrn_lines(); register LINENUM new = lastline+1; register int def_state = 0; /* -1 = ifndef, 1 = ifdef */ where--; while (pch_char(new) == '=' || pch_char(new) == '\n') new++; while (old <= lastline) { if (pch_char(old) == '-') { copy_till(where + old - 1); if (do_defines) { if (def_state == 0) { fputs(not_defined, ofp); def_state = -1; } else if (def_state == 1) { fputs(else_defined, ofp); def_state = 2; } fputs(pfetch(old), ofp); } last_frozen_line++; old++; } else if (pch_char(new) == '+') { copy_till(where + old - 1); if (do_defines) { if (def_state == -1) { fputs(else_defined, ofp); def_state = 2; } else if (def_state == 0) { fputs(if_defined, ofp); def_state = 1; } } fputs(pfetch(new),ofp); new++; } else { if (pch_char(new) != pch_char(old)) { say("Out-of-sync patch, lines %d,%d\n", pch_hunk_beg() + old - 1, pch_hunk_beg() + new - 1); #ifdef DEBUGGING printf("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 (do_defines) { fputs(not_defined,ofp); def_state = -1; } while (pch_char(old) == '!') { if (do_defines) { fputs(pfetch(old),ofp); } last_frozen_line++; old++; } if (do_defines) { fputs(else_defined, ofp); def_state = 2; } while (pch_char(new) == '!') { fputs(pfetch(new),ofp); new++; } if (do_defines) { fputs(end_defined, ofp); def_state = 0; } } else { assert(pch_char(new) == ' '); old++; new++; } } } if (new <= pch_end() && pch_char(new) == '+') { copy_till(where + old - 1); if (do_defines) { if (def_state == 0) { fputs(if_defined, ofp); def_state = 1; } else if (def_state == -1) { fputs(else_defined, ofp); def_state = 2; } } while (new <= pch_end() && pch_char(new) == '+') { fputs(pfetch(new),ofp); new++; } } if (do_defines && def_state) { fputs(end_defined, ofp); } } do_ed_script() { FILE *pipefp, *popen(); bool this_line_is_command = FALSE; register char *t; long beginning_of_this_line; 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); break; } for (t=buf; isdigit(*t) || *t == ','; t++) ; this_line_is_command = (isdigit(*buf) && (*t == 'd' || *t == 'c' || *t == 'a') ); if (this_line_is_command) { fputs(buf,pipefp); if (*t != 'd') { while (pgets(buf,sizeof buf,pfp) != Nullch) { fputs(buf,pipefp); if (strEQ(buf,".\n")) break; } } } else { next_intuit_at(beginning_of_this_line); break; } } fprintf(pipefp,"w\n"); fprintf(pipefp,"q\n"); Fflush(pipefp); Pclose(pipefp); ignore_signals(); move_file(TMPOUTNAME,outname); set_signals(); } init_output(name) char *name; { ofp = fopen(name,"w"); if (ofp == Nullfp) fatal("patch: can't create %s.\n",name); } init_reject(name) char *name; { rejfp = fopen(name,"w"); if (rejfp == Nullfp) fatal("patch: can't create %s.\n",name); } move_file(from,to) char *from, *to; { char bakname[512]; register char *s; int fromfd; register int i; /* to stdout? */ if (strEQ(to,"-")) { #ifdef DEBUGGING if (debug & 4) say("Moving %s to stdout.\n",from); #endif fromfd = open(from,0); if (fromfd < 0) fatal("patch: internal error, can't reopen %s\n",from); while ((i=read(fromfd,buf,sizeof buf)) > 0) if (write(1,buf,i) != 1) fatal("patch: write failed\n"); Close(fromfd); return; } Strcpy(bakname,to); Strcat(bakname,origext?origext:ORIGEXT); if (stat(to,&filestat) >= 0) { /* output file exists */ dev_t to_device = filestat.st_dev; ino_t to_inode = filestat.st_ino; char *simplename = bakname; for (s=bakname; *s; s++) { if (*s == '/') simplename = s+1; } /* find a backup name that is not the same file */ while (stat(bakname,&filestat) >= 0 && to_device == filestat.st_dev && to_inode == filestat.st_ino) { for (s=simplename; *s && !islower(*s); s++) ; if (*s) *s = toupper(*s); else Strcpy(simplename, simplename+1); } while (unlink(bakname) >= 0) ; /* while() is for benefit of Eunice */ #ifdef DEBUGGING if (debug & 4) say("Moving %s to %s.\n",to,bakname); #endif if (link(to,bakname) < 0) { say("patch: can't backup %s, output is in %s\n", to,from); return; } while (unlink(to) >= 0) ; } #ifdef DEBUGGING if (debug & 4) say("Moving %s to %s.\n",from,to); #endif if (link(from,to) < 0) { /* different file system? */ int tofd; tofd = creat(to,0666); if (tofd < 0) { say("patch: can't create %s, output is in %s.\n", to, from); return; } fromfd = open(from,0); if (fromfd < 0) fatal("patch: internal error, can't reopen %s\n",from); while ((i=read(fromfd,buf,sizeof buf)) > 0) if (write(tofd,buf,i) != i) fatal("patch: write failed\n"); Close(fromfd); Close(tofd); } Unlink(from); } copy_file(from,to) char *from, *to; { int tofd; int fromfd; register int i; tofd = creat(to,0666); if (tofd < 0) fatal("patch: can't create %s.\n", to); fromfd = open(from,0); if (fromfd < 0) fatal("patch: internal error, can't reopen %s\n",from); while ((i=read(fromfd,buf,sizeof buf)) > 0) if (write(tofd,buf,i) != i) fatal("patch: write (%s) failed\n", to); Close(fromfd); Close(tofd); } copy_till(lastline) register LINENUM lastline; { if (last_frozen_line > lastline) say("patch: misordered hunks! output will be garbled.\n"); while (last_frozen_line < lastline) { dump_line(++last_frozen_line); } } spew_output() { copy_till(input_lines); /* dump remainder of file */ Fclose(ofp); ofp = Nullfp; } dump_line(line) LINENUM line; { register char *s; for (s=ifetch(line,0); putc(*s,ofp) != '\n'; s++) ; } /* does the patch pattern match at line base+offset? */ bool patch_match(base,offset) LINENUM base; LINENUM offset; { register LINENUM pline; register LINENUM iline; register LINENUM pat_lines = pch_ptrn_lines(); for (pline = 1, iline=base+offset; 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; } /* match two lines with canonicalized white space */ bool similar(a,b,len) register char *a, *b; register 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 */ } /* input file with indexable lines abstract type */ bool using_plan_a = TRUE; static long i_size; /* size of the input file */ static char *i_womp; /* plan a buffer for entire file */ static char **i_ptr; /* pointers to lines in i_womp */ static int tifd = -1; /* plan b virtual string array */ static char *tibuf[2]; /* plan b buffers */ static LINENUM tiline[2] = {-1,-1}; /* 1st line in each buffer */ static LINENUM lines_per_buf; /* how many lines per buffer */ static int tireclen; /* length of records in tmp file */ re_input() { if (using_plan_a) { i_size = 0; /*NOSTRICT*/ if (i_ptr != Null(char**)) free((char *)i_ptr); if (i_womp != Nullch) free(i_womp); i_womp = Nullch; i_ptr = Null(char **); } else { using_plan_a = TRUE; /* maybe the next one is smaller */ Close(tifd); tifd = -1; free(tibuf[0]); free(tibuf[1]); tibuf[0] = tibuf[1] = Nullch; tiline[0] = tiline[1] = -1; tireclen = 0; } } scan_input(filename) char *filename; { bool plan_a(); if (!plan_a(filename)) plan_b(filename); } /* try keeping everything in memory */ bool plan_a(filename) char *filename; { int ifd; register char *s; register LINENUM iline; if (stat(filename,&filestat) < 0) { Sprintf(buf,"RCS/%s%s",filename,RCSSUFFIX); if (stat(buf,&filestat) >= 0 || stat(buf+4,&filestat) >= 0) { Sprintf(buf,CHECKOUT,filename); if (verbose) say("Can't find %s--attempting to check it out from RCS.\n", filename); if (system(buf) || stat(filename,&filestat)) fatal("Can't check out %s.\n",filename); } else { Sprintf(buf,"SCCS/%s%s",SCCSPREFIX,filename); if (stat(buf,&filestat) >= 0 || stat(buf+5,&filestat) >= 0) { Sprintf(buf,GET,filename); if (verbose) say("Can't find %s--attempting to get it from SCCS.\n", filename); if (system(buf) || stat(filename,&filestat)) fatal("Can't get %s.\n",filename); } else fatal("Can't find %s.\n",filename); } } if ((filestat.st_mode & S_IFMT) & ~S_IFREG) fatal("%s is not a normal file--can't patch.\n",filename); i_size = filestat.st_size; /*NOSTRICT*/ i_womp = malloc((MEM)(i_size+2)); if (i_womp == Nullch) return FALSE; if ((ifd = open(filename,0)) < 0) fatal("Can't open file %s\n",filename); /*NOSTRICT*/ if (read(ifd,i_womp,(int)i_size) != i_size) { Close(ifd); free(i_womp); return FALSE; } Close(ifd); if (i_womp[i_size-1] != '\n') i_womp[i_size++] = '\n'; i_womp[i_size] = '\0'; /* count the lines in the buffer so we know how many pointers we need */ iline = 0; for (s=i_womp; *s; s++) { if (*s == '\n') iline++; } /*NOSTRICT*/ i_ptr = (char **)malloc((MEM)((iline + 2) * sizeof(char *))); if (i_ptr == Null(char **)) { /* shucks, it was a near thing */ free((char *)i_womp); return FALSE; } /* now scan the buffer and build pointer array */ iline = 1; i_ptr[iline] = i_womp; for (s=i_womp; *s; s++) { if (*s == '\n') i_ptr[++iline] = s+1; /* these are NOT null terminated */ } input_lines = iline - 1; /* now check for revision, if any */ if (revision != Nullch) { if (!rev_in_string(i_womp)) { ask("This file doesn't appear to be the %s version--patch anyway? [n] ", revision); if (*buf != 'y') fatal("Aborted.\n"); } else if (verbose) say("Good. This file appears to be the %s version.\n", revision); } return TRUE; /* plan a will work */ } /* keep (virtually) nothing in memory */ plan_b(filename) char *filename; { FILE *ifp; register int i = 0; register int maxlen = 1; bool found_revision = (revision == Nullch); using_plan_a = FALSE; if ((ifp = fopen(filename,"r")) == Nullfp) fatal("Can't open file %s\n",filename); if ((tifd = creat(TMPINNAME,0666)) < 0) fatal("Can't open file %s\n",TMPINNAME); while (fgets(buf,sizeof buf, ifp) != Nullch) { if (revision != Nullch && !found_revision && rev_in_string(buf)) found_revision = TRUE; if ((i = strlen(buf)) > maxlen) maxlen = i; /* find longest line */ } if (revision != Nullch) { if (!found_revision) { ask("This file doesn't appear to be the %s version--patch anyway? [n] ", revision); if (*buf != 'y') fatal("Aborted.\n"); } else if (verbose) say("Good. This file appears to be the %s version.\n", revision); } Fseek(ifp,0L,0); /* rewind file */ lines_per_buf = BUFFERSIZE / maxlen; tireclen = maxlen; tibuf[0] = malloc((MEM)(BUFFERSIZE + 1)); tibuf[1] = malloc((MEM)(BUFFERSIZE + 1)); if (tibuf[1] == Nullch) fatal("Can't seem to get enough memory.\n"); for (i=1; ; i++) { if (! (i % lines_per_buf)) /* new block */ if (write(tifd,tibuf[0],BUFFERSIZE) < BUFFERSIZE) fatal("patch: can't write temp file.\n"); if (fgets(tibuf[0] + maxlen * (i%lines_per_buf), maxlen + 1, ifp) == Nullch) { input_lines = i - 1; if (i % lines_per_buf) if (write(tifd,tibuf[0],BUFFERSIZE) < BUFFERSIZE) fatal("patch: can't write temp file.\n"); break; } } Fclose(ifp); Close(tifd); if ((tifd = open(TMPINNAME,0)) < 0) { fatal("Can't reopen file %s\n",TMPINNAME); } } /* fetch a line from the input file, \n terminated, not necessarily \0 */ char * ifetch(line,whichbuf) register LINENUM line; int whichbuf; /* ignored when file in memory */ { if (line < 1 || line > input_lines) return ""; if (using_plan_a) return i_ptr[line]; else { LINENUM offline = line % lines_per_buf; LINENUM baseline = line - offline; if (tiline[0] == baseline) whichbuf = 0; else if (tiline[1] == baseline) whichbuf = 1; else { tiline[whichbuf] = baseline; Lseek(tifd,(long)baseline / lines_per_buf * BUFFERSIZE,0); if (read(tifd,tibuf[whichbuf],BUFFERSIZE) < 0) fatal("Error reading tmp file %s.\n",TMPINNAME); } return tibuf[whichbuf] + (tireclen*offline); } } /* patch 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[MAXHUNKSIZE]; /* the text of the hunk */ static char p_char[MAXHUNKSIZE]; /* +, -, and ! */ static int p_len[MAXHUNKSIZE]; /* length of each line */ static int p_indent; /* indent to patch */ static long p_base; /* where to intuit this time */ static long p_start; /* where intuit found a patch */ re_patch() { p_first = (LINENUM)0; p_newfirst = (LINENUM)0; p_ptrn_lines = (LINENUM)0; p_repl_lines = (LINENUM)0; p_end = (LINENUM)-1; p_max = (LINENUM)0; p_indent = 0; } open_patch_file(filename) char *filename; { if (filename == Nullch || !*filename || strEQ(filename,"-")) { pfp = fopen(TMPPATNAME,"w"); if (pfp == Nullfp) fatal("patch: can't create %s.\n",TMPPATNAME); while (fgets(buf,sizeof buf,stdin) != NULL) fputs(buf,pfp); Fclose(pfp); filename = TMPPATNAME; } pfp = fopen(filename,"r"); if (pfp == Nullfp) fatal("patch file %s not found\n",filename); Fstat(fileno(pfp), &filestat); p_filesize = filestat.st_size; next_intuit_at(0L); /* start at the beginning */ } bool there_is_another_patch() { bool no_input_file = (filearg[0] == Nullch); if (p_base != 0L && p_base >= p_filesize) { if (verbose) say("done\n"); return FALSE; } if (verbose) say("Hmm..."); diff_type = intuit_diff_type(); if (!diff_type) { if (p_base != 0L) { if (verbose) say(" Ignoring the trailing garbage.\ndone\n"); } else say(" I can't seem to find a patch in there anywhere.\n"); return FALSE; } if (verbose) say(" %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) say("(Patch is indented %d space%s.)\n",p_indent,p_indent==1?"":"s"); skip_to(p_start); if (no_input_file) { while (filearg[0] == Nullch) { ask("File to patch: "); filearg[0] = fetchname(buf); } if (verbose) { say("Patching file %s...\n",filearg[0]); } } return TRUE; } intuit_diff_type() { long this_line = 0; long previous_line; long first_command_line = -1; bool last_line_was_command = FALSE; bool this_line_is_command = FALSE; bool last_line_was_stars = FALSE; bool this_line_is_stars = FALSE; register int indent; register char *s, *t; char *oldname = Nullch; char *newname = Nullch; bool no_filearg = (filearg[0] == Nullch); Fseek(pfp,p_base,0); for (;;) { previous_line = this_line; last_line_was_command = this_line_is_command; last_line_was_stars = this_line_is_stars; this_line = ftell(pfp); indent = 0; if (fgets(buf,sizeof buf,pfp) == Nullch) { if (first_command_line >= 0L) { /* nothing but deletes!? */ p_start = first_command_line; return ED_DIFF; } else { p_start = this_line; return 0; } } for (s = buf; *s == ' ' || *s == '\t'; s++) { if (*s == '\t') indent += 8 - (indent % 8); else indent++; } for (t=s; isdigit(*t) || *t == ','; t++) ; this_line_is_command = (isdigit(*s) && (*t == 'd' || *t == 'c' || *t == 'a') ); if (first_command_line < 0L && this_line_is_command) { first_command_line = this_line; p_indent = indent; /* assume this for now */ } if (strnEQ(s,"*** ",4)) oldname = fetchname(s+4); else if (strnEQ(s,"--- ",4)) { newname = fetchname(s+4); if (no_filearg) { if (oldname && newname) { if (strlen(oldname) < strlen(newname)) filearg[0] = oldname; else filearg[0] = newname; } else if (oldname) filearg[0] = oldname; else if (newname) filearg[0] = newname; } } else if (strnEQ(s,"Index:",6)) { if (no_filearg) filearg[0] = fetchname(s+6); /* this filearg might get limboed */ } 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; return ED_DIFF; } this_line_is_stars = strnEQ(s,"********",8); if ((!diff_type || diff_type == CONTEXT_DIFF) && last_line_was_stars && strnEQ(s,"*** ",4)) { /* 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; return (*(s-1) == '*' ? NEW_CONTEXT_DIFF : CONTEXT_DIFF); } if ((!diff_type || diff_type == NORMAL_DIFF) && last_line_was_command && (strnEQ(s,"< ",2) || strnEQ(s,"> ",2)) ) { p_start = previous_line; p_indent = indent; return NORMAL_DIFF; } } } char * fetchname(at) char *at; { char *s = savestr(at); char *name; register char *t; char tmpbuf[200]; for (t=s; isspace(*t); t++) ; name = t; for (; *t && !isspace(*t); t++) if (!usepath) if (*t == '/') name = t+1; *t = '\0'; name = savestr(name); Sprintf(tmpbuf,"RCS/%s",name); free(s); if (stat(name,&filestat) < 0) { Strcat(tmpbuf,RCSSUFFIX); if (stat(tmpbuf,&filestat) < 0 && stat(tmpbuf+4,&filestat) < 0) { Sprintf(tmpbuf,"SCCS/%s%s",SCCSPREFIX,name); if (stat(tmpbuf,&filestat) < 0 && stat(tmpbuf+5,&filestat) < 0) { free(name); name = Nullch; } } } return name; } next_intuit_at(file_pos) long file_pos; { p_base = file_pos; } skip_to(file_pos) long file_pos; { char *ret; assert(p_base <= file_pos); if (verbose && p_base < file_pos) { Fseek(pfp,p_base,0); say("The text leading up to this was:\n--------------------------\n"); while (ftell(pfp) < file_pos) { ret = fgets(buf,sizeof buf,pfp); assert(ret != Nullch); say("|%s",buf); } say("--------------------------\n"); } else Fseek(pfp,file_pos,0); } bool another_hunk() { register char *s; char *ret; register int context = 0; while (p_end >= 0) { free(p_line[p_end--]); } assert(p_end == -1); p_max = MAXHUNKSIZE; /* gets reduced when --- found */ if (diff_type == CONTEXT_DIFF) { long line_beginning = ftell(pfp); LINENUM repl_beginning = 0; ret = pgets(buf,sizeof buf, pfp); if (ret == Nullch || strnNE(buf,"********",8)) { next_intuit_at(line_beginning); return FALSE; } p_context = 100; while (p_end < p_max) { ret = pgets(buf,sizeof buf, pfp); if (ret == Nullch) { if (p_max - p_end < 4) Strcpy(buf," \n"); /* assume blank lines got chopped */ else fatal("Unexpected end of file in patch.\n"); } p_input_line++; if (strnEQ(buf,"********",8)) fatal("Unexpected end of hunk at line %d.\n", p_input_line); p_char[++p_end] = *buf; switch (*buf) { case '*': if (p_end != 0) fatal("Unexpected *** at line %d: %s", p_input_line, buf); context = 0; p_line[p_end] = savestr(buf); for (s=buf; *s && !isdigit(*s); s++) ; if (!isdigit(*s)) fatal("Malformed patch at line %d: %s", p_input_line, buf); p_first = (LINENUM) atol(s); while (isdigit(*s)) s++; for (; *s && !isdigit(*s); s++) ; if (!isdigit(*s)) p_ptrn_lines = 1; else p_ptrn_lines = ((LINENUM)atol(s)) - p_first + 1; break; case '-': if (buf[1] == '-') { if (p_end != p_ptrn_lines + 1 && p_end != p_ptrn_lines + 2) fatal("Unexpected --- at line %d: %s", p_input_line,buf); repl_beginning = p_end; context = 0; p_line[p_end] = savestr(buf); p_char[p_end] = '='; for (s=buf; *s && !isdigit(*s); s++) ; if (!isdigit(*s)) fatal("Malformed patch at line %d: %s", p_input_line, buf); p_newfirst = (LINENUM) atol(s); while (isdigit(*s)) s++; for (; *s && !isdigit(*s); s++) ; if (!isdigit(*s)) p_max = p_newfirst; else p_max = ((LINENUM)atol(s)); p_max += 1 + p_end - p_newfirst; if (p_max >= MAXHUNKSIZE) fatal("Hunk too large (%d lines) at line %d: %s", p_max - p_end, p_input_line, buf); break; } /* FALL THROUGH */ case '+': case '!': if (context > 0) { if (context < p_context) p_context = context; context = -100; } p_line[p_end] = savestr(buf+2); break; case '\t': case '\n': /* assume the 2 spaces got eaten */ p_line[p_end] = savestr(buf); if (p_end != p_ptrn_lines + 1) { context++; p_char[p_end] = ' '; } break; case ' ': context++; p_line[p_end] = savestr(buf+2); break; default: fatal("Malformed patch at line %d: %s",p_input_line,buf); } /* 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; } if (p_end >=0 && !p_ptrn_lines) fatal("No --- found in patch at line %d\n", pch_hunk_beg()); p_repl_lines = p_end - repl_beginning; p_char[p_end+1] = '^'; /* add a stopper for apply_hunk */ } else if (diff_type == NEW_CONTEXT_DIFF) { long line_beginning = ftell(pfp); LINENUM repl_beginning = 0; LINENUM fillcnt = 0; LINENUM fillsrc; LINENUM filldst; ret = pgets(buf,sizeof buf, pfp); if (ret == Nullch || strnNE(buf,"********",8)) { next_intuit_at(line_beginning); return FALSE; } p_context = 0; while (p_end < p_max) { ret = pgets(buf,sizeof buf, pfp); if (ret == Nullch) { if (p_max - p_end < 4) Strcpy(buf," \n"); /* assume blank lines got chopped */ else fatal("Unexpected end of file in patch.\n"); } p_input_line++; p_char[++p_end] = *buf; switch (*buf) { case '*': /* another hunk */ if (strnEQ(buf,"********",8)) fatal("Unexpected end of hunk at line %d.\n", p_input_line); if (p_end != 0) fatal("Unexpected *** at line %d: %s", p_input_line, buf); context = 0; p_line[p_end] = savestr(buf); for (s=buf; *s && !isdigit(*s); s++) ; if (!isdigit(*s)) fatal("Malformed patch at line %d: %s", p_input_line, buf); p_first = (LINENUM) atol(s); while (isdigit(*s)) s++; for (; *s && !isdigit(*s); s++) ; if (!isdigit(*s)) p_ptrn_lines = 1; else p_ptrn_lines = ((LINENUM)atol(s)) - p_first + 1; break; case '-': if (buf[1] == '-') { if (p_end != p_ptrn_lines + 1) { 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 fatal("Unexpected --- at line %d: %s", p_input_line,buf); } repl_beginning = p_end; p_line[p_end] = savestr(buf); p_char[p_end] = '='; for (s=buf; *s && !isdigit(*s); s++) ; if (!isdigit(*s)) fatal("Malformed patch at line %d: %s", p_input_line, buf); p_newfirst = (LINENUM) atol(s); while (isdigit(*s)) s++; for (; *s && !isdigit(*s); s++) ; if (!isdigit(*s)) p_max = p_newfirst; else p_max = ((LINENUM)atol(s)); p_max += 1 + p_end - p_newfirst; if (p_max >= MAXHUNKSIZE) fatal("Hunk too large (%d lines) at line %d: %s", p_max - p_end, p_input_line, buf); if (p_max - p_end == context) { /* redundant 'new' context lines were omitted */ /* set up to fill them in from the the old file's */ /* context */ fillsrc = 1; filldst = p_end + 1; fillcnt = p_max - repl_beginning; p_end = p_max; } break; } /* FALL THROUGH */ case '+': case '!': if (context > 0 && p_context == 0) { p_context = context; } p_line[p_end] = savestr(buf+2); break; case '\t': case '\n': /* assume the 2 spaces got eaten */ p_line[p_end] = savestr(buf); context++; p_char[p_end] = ' '; break; case ' ': context++; p_line[p_end] = savestr(buf+2); break; default: fatal("Malformed patch at line %d: %s",p_input_line,buf); } /* 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; } if (p_end >=0 && !p_ptrn_lines) fatal("No --- found in patch at line %d\n", pch_hunk_beg()); /* if there were omitted context lines, fill them in */ if (fillcnt) { while (fillcnt-- > 0) { while (p_char[fillsrc] != ' ') fillsrc++; if (p_line[fillsrc]) p_line[filldst] = savestr (p_line[fillsrc]); else p_line[filldst] = p_line[fillsrc]; p_char[filldst] = p_char[fillsrc]; p_len[filldst] = p_len[fillsrc]; fillsrc++; filldst++; } assert(filldst==p_end+1 || filldst==repl_beginning); } p_repl_lines = p_end - repl_beginning; p_char[p_end+1] = '^'; /* add a stopper for apply_hunk */ } else { /* normal diff--fake it up */ char hunk_type; register int i; LINENUM min, max; 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); 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 */ min = (LINENUM)atol(++s); for (; isdigit(*s); s++) ; if (*s == ',') max = (LINENUM)atol(++s); else max = min; if (hunk_type == 'd') min++; p_end = p_ptrn_lines + 1 + max - min + 1; p_newfirst = min; p_repl_lines = max - min + 1; Sprintf(buf,"*** %d,%d\n", p_first, p_first + p_ptrn_lines - 1); p_line[0] = savestr(buf); p_char[0] = '*'; for (i=1; i<=p_ptrn_lines; i++) { ret = pgets(buf,sizeof buf, pfp); p_input_line++; if (ret == Nullch) fatal("Unexpected end of file in patch at line %d.\n", p_input_line); if (*buf != '<') fatal("< expected at line %d of patch.\n", p_input_line); p_line[i] = savestr(buf+2); if (p_line[i]) p_len[i] = strlen(p_line[i]); else p_len[i] = 0; p_char[i] = '-'; } if (hunk_type == 'c') { ret = pgets(buf,sizeof buf, pfp); p_input_line++; if (ret == Nullch) fatal("Unexpected end of file in patch at line %d.\n", p_input_line); if (*buf != '-') fatal("--- expected at line %d of patch.\n", p_input_line); } Sprintf(buf,"--- %d,%d\n",min,max); p_line[i] = savestr(buf); p_char[i] = '='; for (i++; i<=p_end; i++) { ret = pgets(buf,sizeof buf, pfp); p_input_line++; if (ret == Nullch) fatal("Unexpected end of file in patch at line %d.\n", p_input_line); if (*buf != '>') fatal("> expected at line %d of patch.\n", p_input_line); p_line[i] = savestr(buf+2); /* set up p_len for strncmp() so we don't have to */ /* assume null termination */ if (p_line[i]) p_len[i] = strlen(p_line[i]); else p_len[i] = 0; p_char[i] = '+'; } } if (reverse) /* backwards patch? */ pch_swap(); #ifdef DEBUGGING if (debug & 2) { int i; char special; for (i=0; i <= p_end; i++) { if (i == p_ptrn_lines) special = '^'; else special = ' '; printf("%3d %c %c %s",i,p_char[i],special,p_line[i]); } } #endif return TRUE; } char * pgets(bf,sz,fp) char *bf; int sz; FILE *fp; { char *ret = fgets(bf,sz,fp); register char *s; register 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; } pch_swap() { char *tp_line[MAXHUNKSIZE]; /* the text of the hunk */ char tp_char[MAXHUNKSIZE]; /* +, -, and ! */ int tp_len[MAXHUNKSIZE]; /* length of each line */ register LINENUM i, n; bool blankline = FALSE; register char *s; i = p_first; p_first = p_newfirst; p_newfirst = i; /* make a scratch copy */ for (i=0; i<=p_end; i++) { tp_line[i] = p_line[i]; tp_char[i] = p_char[i]; tp_len[i] = p_len[i]; } /* 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++; } 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; } LINENUM pch_first() { return p_first; } LINENUM pch_ptrn_lines() { return p_ptrn_lines; } LINENUM pch_newfirst() { return p_newfirst; } LINENUM pch_repl_lines() { return p_repl_lines; } LINENUM pch_end() { return p_end; } LINENUM pch_context() { return p_context; } pch_line_len(line) LINENUM line; { return p_len[line]; } char pch_char(line) LINENUM line; { return p_char[line]; } char * pfetch(line) LINENUM line; { return p_line[line]; } LINENUM pch_hunk_beg() { return p_input_line - p_end - 1; } char * savestr(s) register char *s; { register char *rv, *t; t = s; while (*t++); rv = malloc((MEM) (t - s)); if (rv == NULL) fatal ("patch: out of memory (savestr)\n"); t = rv; while (*t++ = *s++); return rv; } my_exit(status) int status; { Unlink(TMPINNAME); Unlink(TMPOUTNAME); Unlink(TMPREJNAME); Unlink(TMPPATNAME); exit(status); } #ifdef lint /*VARARGS ARGSUSED*/ say(pat) char *pat; { ; } /*VARARGS ARGSUSED*/ fatal(pat) char *pat; { ; } /*VARARGS ARGSUSED*/ ask(pat) char *pat; { ; } #else lint say(pat,arg1,arg2,arg3) char *pat; int arg1,arg2,arg3; { fprintf(stderr,pat,arg1,arg2,arg3); Fflush(stderr); } fatal(pat,arg1,arg2,arg3) char *pat; int arg1,arg2,arg3; { say(pat,arg1,arg2,arg3); my_exit(1); } ask(pat,arg1,arg2,arg3) char *pat; int arg1,arg2,arg3; { int ttyfd = open("/dev/tty",2); int r; say(pat,arg1,arg2,arg3); if (ttyfd >= 0) { r = read(ttyfd, buf, sizeof buf); Close(ttyfd); } else r = read(2, buf, sizeof buf); if (r <= 0) buf[0] = 0; } #endif lint bool rev_in_string(string) char *string; { register char *s; register int patlen; if (revision == Nullch) return TRUE; patlen = strlen(revision); for (s = string; *s; s++) { if (isspace(*s) && strnEQ(s+1,revision,patlen) && isspace(s[patlen+1] )) { return TRUE; } } return FALSE; } set_signals() { /*NOSTRICT*/ if (signal(SIGHUP, SIG_IGN) != SIG_IGN) Signal(SIGHUP, my_exit); /*NOSTRICT*/ if (signal(SIGINT, SIG_IGN) != SIG_IGN) Signal(SIGINT, my_exit); } ignore_signals() { /*NOSTRICT*/ Signal(SIGHUP, SIG_IGN); /*NOSTRICT*/ Signal(SIGINT, SIG_IGN); }