#!/bin/sh # shar: Shell Archiver # Run the following text with /bin/sh to create: # patch # This archive created: Tue Jul 16 23:10:19 1991 echo shar: creating directory patch mkdir patch chdir patch echo shar: extracting Configure '(30911 characters)' cat << \SHAR_EOF > Configure #! /bin/sh # # If these # comments don't work, trim them. Don't worry about any other # shell scripts, Configure will trim # comments from them for you. # # (If you are trying to port this package to a machine without sh, I would # suggest you cut out the prototypical config.h from the end of Configure # and edit it to reflect your system. Some packages may include samples # of config.h for certain machines, so you might look for one of those.) # # $Header: Configure,v 2.0.1.1 88/06/03 15:00:13 lwall Locked $ # # Yes, you may rip this off to use in other distribution packages. # (Note: this Configure script was generated automatically. Rather than # working with this copy of Configure, you may wish to get metaconfig.) : sanity checks PATH='.:/bin:/usr/bin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc' export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$) if test ! -t 0; then echo "Say 'sh Configure', not 'sh /dev/null 2>&1 && \ echo "(I see you are using the Korn shell. Some ksh's blow up on Configure," && \ echo "especially on exotic machines. If yours does, try the Bourne shell instead.)" if test ! -d ../UU; then if test ! -d UU; then mkdir UU fi cd UU fi case "$1" in -d) shift; fastread='yes';; esac d_eunice='' eunicefix='' define='' loclist='' expr='' sed='' echo='' cat='' rm='' mv='' cp='' tail='' tr='' mkdir='' sort='' uniq='' grep='' trylist='' test='' inews='' egrep='' more='' pg='' Mcc='' vi='' mailx='' mail='' cpp='' Log='' Header='' bin='' cc='' contains='' cppstdin='' cppminus='' d_charsprf='' d_flexfnam='' d_index='' d_voidsig='' libc='' mansrc='' manext='' models='' split='' small='' medium='' large='' huge='' ccflags='' ldflags='' n='' c='' package='' registers='' reg1='' reg2='' reg3='' reg4='' reg5='' reg6='' reg7='' reg8='' reg9='' reg10='' reg11='' reg12='' reg13='' reg14='' reg15='' reg16='' spitshell='' shsharp='' sharpbang='' startsh='' voidflags='' defvoidused='' CONFIG='' : set package name package=patch echo " " echo "Beginning of configuration questions for $package kit." : Eunice requires " " instead of "", can you believe it echo " " define='define' undef='/*undef' libpth='/usr/lib /usr/local/lib /lib' smallmach='pdp11 i8086 z8000 i80286 iAPX286' rmlist='kit[1-9]isdone kit[1-9][0-9]isdone' trap 'echo " "; rm -f $rmlist; exit 1' 1 2 3 : We must find out about Eunice early eunicefix=':' if test -f /etc/unixtovms; then eunicefix=/etc/unixtovms fi if test -f /etc/unixtovms.exe; then eunicefix=/etc/unixtovms.exe fi attrlist="mc68000 sun gcos unix ibm gimpel interdata tss os mert pyr" attrlist="$attrlist vax pdp11 i8086 z8000 u3b2 u3b5 u3b20 u3b200" attrlist="$attrlist ns32000 ns16000 iAPX286 mc300 mc500 mc700 sparc" attrlist="$attrlist nsc32000 sinix xenix venix posix ansi M_XENIX" attrlist="$attrlist $mc68k __STDC__" pth="/usr/ucb /bin /usr/bin /usr/local /usr/local/bin /usr/lbin /etc /usr/lib /lib" d_newshome="../../NeWS" defvoidused=7 : some greps do not return status, grrr. echo "grimblepritz" >grimble if grep blurfldyick grimble >/dev/null 2>&1 ; then contains=contains elif grep grimblepritz grimble >/dev/null 2>&1 ; then contains=grep else contains=contains fi rm -f grimble : the following should work in any shell case "$contains" in contains*) echo " " echo "AGH! Grep doesn't return a status. Attempting remedial action." cat >contains <<'EOSS' grep "$1" "$2" >.greptmp && cat .greptmp && test -s .greptmp EOSS chmod +x contains esac : first determine how to suppress newline on echo command echo "Checking echo to see how to suppress newlines..." (echo "hi there\c" ; echo " ") >.echotmp if $contains c .echotmp >/dev/null 2>&1 ; then echo "...using -n." n='-n' c='' else cat <<'EOM' ...using \c EOM n='' c='\c' fi echo $n "Type carriage return to continue. Your cursor should be here-->$c" read ans rm -f .echotmp : now set up to do reads with possible shell escape and default assignment cat <myread case "\$fastread" in yes) ans=''; echo " " ;; *) ans='!';; esac while expr "X\$ans" : "X!" >/dev/null; do read ans case "\$ans" in !) sh echo " " echo $n "\$rp $c" ;; !*) set \`expr "X\$ans" : "X!\(.*\)\$"\` sh -c "\$*" echo " " echo $n "\$rp $c" ;; esac done rp='Your answer:' case "\$ans" in '') ans="\$dflt";; esac EOSC : general instructions cat <loc $startsh case \$# in 0) exit 1;; esac thing=\$1 shift dflt=\$1 shift for dir in \$*; do case "\$thing" in .) if test -d \$dir/\$thing; then echo \$dir exit 0 fi ;; *) if test -f \$dir/\$thing; then echo \$dir/\$thing exit 0 elif test -f \$dir/\$thing.exe; then : on Eunice apparently echo \$dir/\$thing exit 0 fi ;; esac done echo \$dflt exit 1 EOSC chmod +x loc $eunicefix loc loclist=" expr sed echo cat rm tr grep " trylist=" test Mcc cpp " for file in $loclist; do xxx=`loc $file $file $pth` eval $file=$xxx eval _$file=$xxx case "$xxx" in /*) echo $file is in $xxx. ;; *) echo "I don't know where $file is. I hope it's in everyone's PATH." ;; esac done echo " " echo "Don't worry if any of the following aren't found..." ans=offhand for file in $trylist; do xxx=`loc $file $file $pth` eval $file=$xxx eval _$file=$xxx case "$xxx" in /*) echo $file is in $xxx. ;; *) echo "I don't see $file out there, $ans." ans=either ;; esac done case "$egrep" in egrep) echo "Substituting grep for egrep." egrep=$grep ;; esac case "$test" in test) echo "Hopefully test is built into your sh." ;; /bin/test) echo " " dflt=n rp="Is your "'"'"test"'"'" built into sh? [$dflt] (OK to guess)" echo $n "$rp $c" . myread case "$ans" in y*) test=test ;; esac ;; *) test=test ;; esac case "$echo" in echo) echo "Hopefully echo is built into your sh." ;; /bin/echo) echo " " echo "Checking compatibility between /bin/echo and builtin echo (if any)..." $echo $n "hi there$c" >foo1 echo $n "hi there$c" >foo2 if cmp foo1 foo2 >/dev/null 2>&1; then echo "They are compatible. In fact, they may be identical." else case "$n" in '-n') n='' c='\c' ans='\c' ;; *) n='-n' c='' ans='-n' ;; esac cat </dev/null | sed -n -e 's/^.* T _//p' -e 's/^.* T //p' > libc.list if $contains '^printf$' libc.list >/dev/null 2>&1; then echo "done" else nm $libc 2>/dev/null | sed -n -e 's/^.* D _//p' -e 's/^.* D //p' > libc.list if $contains '^printf$' libc.list >/dev/null 2>&1; then echo "done" else echo " " echo "nm didn't seem to work right." echo "Trying ar instead..." if ar t $libc | sed -e 's/\.o$//' > libc.list; then echo "Ok." else echo "That didn't work either. Giving up." exit 1 fi fi fi rmlist="$rmlist libc.list" : make some quick guesses about what we are up against echo " " $echo $n "Hmm... $c" if $contains SIGTSTP /usr/include/signal.h >/dev/null 2>&1 ; then echo "Looks kind of like a BSD system, but we'll see..." echo exit 0 >bsd echo exit 1 >usg echo exit 1 >v7 elif $contains '^fcntl$' libc.list >/dev/null 2>&1 ; then echo "Looks kind of like a USG system, but we'll see..." echo exit 1 >bsd echo exit 0 >usg echo exit 1 >v7 else echo "Looks kind of like a version 7 system, but we'll see..." echo exit 1 >bsd echo exit 1 >usg echo exit 0 >v7 fi if $contains '^vmssystem$' libc.list >/dev/null 2>&1 ; then cat <<'EOI' There is, however, a strange, musty smell in the air that reminds me of something...hmm...yes...I've got it...there's a VMS nearby, or I'm a Blit. EOI echo "exit 0" >eunice eunicefix=unixtovms d_eunice="$define" : it so happens the Eunice I know will not run shell scripts in Unix format else echo " " echo "Congratulations. You aren't running Eunice." eunicefix=':' d_eunice="$undef" echo "exit 1" >eunice fi if test -f /xenix; then echo "Actually, this looks more like a XENIX system..." echo "exit 0" >xenix else echo " " echo "It's not Xenix..." echo "exit 1" >xenix fi chmod +x xenix $eunicefix xenix if test -f /venix; then echo "Actually, this looks more like a VENIX system..." echo "exit 0" >venix else echo " " if xenix; then : null else echo "Nor is it Venix..." fi echo "exit 1" >venix fi chmod +x bsd usg v7 eunice venix $eunicefix bsd usg v7 eunice venix rmlist="$rmlist bsd usg v7 eunice venix xenix" : see if sh knows # comments echo " " echo "Checking your sh to see if it knows about # comments..." if sh -c '#' >/dev/null 2>&1 ; then echo "Your sh handles # comments correctly." shsharp=true spitshell=cat echo " " echo "Okay, let's see if #! works on this system..." echo "#!/bin/echo hi" > try $eunicefix try chmod +x try try > today if $contains hi today >/dev/null 2>&1; then echo "It does." sharpbang='#!' else echo "#! /bin/echo hi" > try $eunicefix try chmod +x try try > today if test -s today; then echo "It does." sharpbang='#! ' else echo "It doesn't." sharpbang=': use ' fi fi else echo "Your sh doesn't grok # comments--I will strip them later on." shsharp=false echo "exec grep -v '^#'" >spitshell chmod +x spitshell $eunicefix spitshell spitshell=`pwd`/spitshell echo "I presume that if # doesn't work, #! won't work either!" sharpbang=': use ' fi : figure out how to guarantee sh startup echo " " echo "Checking out how to guarantee sh startup..." startsh=$sharpbang'/bin/sh' echo "Let's see if '$startsh' works..." cat >try <.ucbsprf.c <<'EOF' main() { char buf[10]; exit((unsigned long)sprintf(buf,"%s","foo") > 10L); } EOF if cc .ucbsprf.c -o .ucbsprf >/dev/null 2>&1 && .ucbsprf; then echo "Your sprintf() returns (int)." d_charsprf="$undef" else echo "Your sprintf() returns (char*)." d_charsprf="$define" fi /bin/rm -f .ucbsprf.c .ucbsprf : see if we can have long filenames echo " " rm -f 123456789abcde if (echo hi >123456789abcdef) 2>/dev/null; then : not version 8 if test -f 123456789abcde; then echo 'You cannot have filenames longer than 14 characters. Sigh.' d_flexfnam="$undef" else echo 'You can have filenames longer than 14 characters.' d_flexfnam="$define" fi else : version 8 probably echo "You can't have filenames longer than 14 chars. V8 can't even think about them!" d_flexfnam="$undef" fi : index or strcpy echo " " case "$d_index" in n) dflt=n;; *) dflt=y;; esac if $contains '^index$' libc.list >/dev/null 2>&1 ; then if $contains '^strchr$' libc.list >/dev/null 2>&1 ; then echo "Your system has both index() and strchr(). Shall I use" rp="index() rather than strchr()? [$dflt]" $echo $n "$rp $c" . myread case "$ans" in n*) d_index="$define" ;; *) d_index="$undef" ;; esac else d_index="$undef" echo "index() found." fi else if $contains '^strchr$' libc.list >/dev/null 2>&1 ; then d_index="$define" echo "strchr() found." else echo "No index() or strchr() found!" d_index="$undef" fi fi : see if signal is declared as pointer to function returning int or void echo " " if $contains 'void.*signal' /usr/include/signal.h >/dev/null 2>&1 ; then echo "You have void (*signal())() instead of int." d_voidsig="$define" else echo "You have int (*signal())() instead of void." d_voidsig="$undef" fi : check for void type echo " " $cat <try.c <<'EOCP' #if TRY & 1 void main() { #else main() { #endif extern void *moo(); void *(*goo)(); #if TRY & 2 void (*foo[10])(); #endif #if TRY & 4 if(*goo == moo) { exit(0); } #endif exit(0); } EOCP if cc -S -DTRY=7 try.c >.out 2>&1 ; then voidflags=7 echo "It appears to support void fully." if $contains warning .out >/dev/null 2>&1; then echo "However, you might get some warnings that look like this:" $cat .out fi else echo "Hmm, you compiler has some difficulty with void. Checking further..." if cc -S -DTRY=1 try.c >/dev/null 2>&1 ; then echo "It supports 1..." if cc -S -DTRY=3 try.c >/dev/null 2>&1 ; then voidflags=3 echo "And it supports 2 but not 4." else echo "It doesn't support 2..." if cc -S -DTRY=3 try.c >/dev/null 2>&1 ; then voidflags=5 echo "But it supports 4." else voidflags=1 echo "And it doesn't support 4." fi fi else echo "There is no support at all for void." voidflags=0 fi fi esac dflt="$voidflags"; rp="Your void support flags add up to what? [$dflt]" $echo $n "$rp $c" . myread voidflags="$ans" $rm -f try.* .out : see how we invoke the C preprocessor echo " " echo "Now, how can we feed standard input to your C preprocessor..." cat <<'EOT' >testcpp.c #define ABC abc #define XYZ xyz ABC.XYZ EOT echo 'Maybe "'$cpp'" will work...' $cpp testcpp.out 2>&1 if $contains 'abc.xyz' testcpp.out >/dev/null 2>&1 ; then echo "Yup, it does." cppstdin="$cpp" cppminus=''; else echo 'Nope, maybe "'$cpp' -" will work...' $cpp - testcpp.out 2>&1 if $contains 'abc.xyz' testcpp.out >/dev/null 2>&1 ; then echo "Yup, it does." cppstdin="$cpp" cppminus='-'; else echo 'No such luck...maybe "cc -E" will work...' cc -E testcpp.out 2>&1 if $contains 'abc.xyz' testcpp.out >/dev/null 2>&1 ; then echo "It works!" cppstdin='cc -E' cppminus=''; else echo 'Nixed again...maybe "cc -E -" will work...' cc -E - testcpp.out 2>&1 if $contains 'abc.xyz' testcpp.out >/dev/null 2>&1 ; then echo "Hooray, it works! I was beginning to wonder." cppstdin='cc -E' cppminus='-'; else echo 'Nope...maybe "cc -P" will work...' cc -P testcpp.out 2>&1 if $contains 'abc.xyz' testcpp.out >/dev/null 2>&1 ; then echo "Yup, that does." cppstdin='cc -P' cppminus=''; else echo 'Nope...maybe "cc -P -" will work...' cc -P - testcpp.out 2>&1 if $contains 'abc.xyz' testcpp.out >/dev/null 2>&1 ; then echo "Yup, that does." cppstdin='cc -P' cppminus='-'; else echo 'Hmm...perhaps you already told me...' case "$cppstdin" in '') ;; *) $cppstdin $cppminus testcpp.out 2>&1;; esac if $contains 'abc.xyz' testcpp.out >/dev/null 2>&1 ; then echo "Hooray, you did! I was beginning to wonder." else echo 'Uh-uh. Time to get fancy...' echo 'Trying (cat >/tmp/$$.c; cc -E /tmp/$$.c; rm /tmp/$$.c)' cppstdin='(cat >/tmp/$$.c; cc -E /tmp/$$.c; rm /tmp/$$.c)' cppminus=''; $cppstdin testcpp.out 2>&1 if $contains 'abc.xyz' testcpp.out >/dev/null 2>&1 ; then echo "Eureka!." else dflt=blurfl $echo $n "No dice. I can't find a C preprocessor. Name one: $c" rp='Name a C preprocessor:' . myread cppstdin="$ans" $cppstdin testcpp.out 2>&1 if $contains 'abc.xyz' testcpp.out >/dev/null 2>&1 ; then echo "OK, that will do." else echo "Sorry, I can't get that to work. Go find one." exit 1 fi fi fi fi fi fi fi fi fi rm -f testcpp.c testcpp.out : get C preprocessor symbols handy echo " " echo $attrlist | $tr '[ - ]' '[\012-\012]' >Cppsym.know $cat <Cppsym $startsh case "\$1" in -l) list=true shift ;; esac unknown='' case "\$list\$#" in 1|2) for sym do if $contains "^\$1$" Cppsym.true >/dev/null 2>&1; then exit 0 elif $contains "^\$1$" Cppsym.know >/dev/null 2>&1; then : else unknown="\$unknown \$sym" fi done set X \$unknown shift ;; esac case \$# in 0) exit 1;; esac echo \$* | $tr '[ - ]' '[\012-\012]' | $sed -e 's/\(.*\)/\\ #ifdef \1\\ exit 0; _ _ _ _\1\\ \1\\ #endif\\ /' >/tmp/Cppsym\$\$ echo exit 1 >>/tmp/Cppsym\$\$ $cppstdin $cppminus /tmp/Cppsym2\$\$ case "\$list" in true) awk 'NF > 5 {print substr(\$6,2,100)}' Cppsym.true cat Cppsym.true rmlist="$rmlist Cppsym Cppsym.know Cppsym.true" : see how many register declarations we want to use case "$registers" in '') if Cppsym vax; then dflt=6 elif Cppsym sun mc68000; then dflt=10 elif Cppsym pyr; then dflt=14 elif Cppsym ns32000 ns16000; then dflt=5 elif Cppsym $smallmach; then dflt=3 else : if you have any other numbers for me, send them in dflt=6 fi ;; *) dflt=$registers ;; esac cat <.foo . .foo awk "BEGIN { for (i=1; i<=$registers; i++) printf \"reg%d=register\n\", i}" \ .foo . .foo rm -f .foo : preserve RCS keywords in files with variable substitution, grrr Log='$Log' Header='$Header' : set up shell script to do ~ expansion cat >filexp <&2 exit 1 fi case "\$1" in */*) echo \$dir/\`$expr x\$1 : '..[^/]*/\(.*\)'\` ;; *) echo \$dir ;; esac fi ;; *) echo \$1 ;; esac EOSS chmod +x filexp $eunicefix filexp : determine where public executables go case "$bin" in '') dflt=`loc . /bin /usr/local/bin /usr/lbin /usr/local /usr/bin` ;; *) dflt="$bin" ;; esac cont=true while $test "$cont" ; do echo " " rp="Where do you want to put the public executables? [$dflt]" $echo $n "$rp $c" . myread bin="$ans" bin=`filexp $bin` if test -d $bin; then cont='' else dflt=n rp="Directory $bin doesn't exist. Use that name anyway? [$dflt]" $echo $n "$rp $c" . myread dflt='' case "$ans" in y*) cont='';; esac fi done : determine where manual pages go case "$mansrc" in '') dflt=`loc . /usr/man/man1 /usr/man/mann /usr/man/local/man1 /usr/man/u_man/man1 /usr/man/man1` ;; *) dflt="$mansrc" ;; esac cont=true while $test "$cont" ; do echo " " rp="Where do the manual pages (source) go? [$dflt]" $echo $n "$rp $c" . myread mansrc=`filexp "$ans"` if test -d $mansrc; then cont='' else dflt=n rp="Directory $mansrc doesn't exist. Use that name anyway? [$dflt]" $echo $n "$rp $c" . myread dflt='' case "$ans" in y*) cont='';; esac fi done case "$mansrc" in *l) manext=l ;; *n) manext=n ;; *C) manext=C ;; *) manext=1 ;; esac : see what memory models we can support case "$models" in '') if Cppsym pdp11; then dflt='unsplit split' else ans=`loc . X /lib/small /lib/large /usr/lib/small /usr/lib/large /lib/medium /usr/lib/medium /lib/huge` case "$ans" in X) dflt='none';; *) if $test -d /lib/small || $test -d /usr/lib/small; then dflt='small' else dflt='' fi if $test -d /lib/medium || $test -d /usr/lib/medium; then dflt="$dflt medium" fi if $test -d /lib/large || $test -d /usr/lib/large; then dflt="$dflt large" fi if $test -d /lib/huge || $test -d /usr/lib/huge; then dflt="$dflt huge" fi esac fi ;; *) dflt="$models" ;; esac $cat </dev/null 2>&1 || \ $contains '-i' $mansrc/cc.1 >/dev/null 2>&1; then dflt='-i' else dflt='none' fi ;; *) dflt="$split";; esac rp="What flag indicates separate I and D space? [$dflt]" $echo $n "$rp $c" . myread case "$ans" in none) ans='';; esac split="$ans" unsplit='' ;; *large*|*small*|*medium*|*huge*) case "$model" in *large*) case "$large" in '') dflt='-Ml';; *) dflt="$large";; esac rp="What flag indicates large model? [$dflt]" $echo $n "$rp $c" . myread case "$ans" in none) ans=''; esac large="$ans" ;; *) large='';; esac case "$model" in *huge*) case "$huge" in '') dflt='-Mh';; *) dflt="$huge";; esac rp="What flag indicates huge model? [$dflt]" $echo $n "$rp $c" . myread case "$ans" in none) ans=''; esac huge="$ans" ;; *) huge="$large";; esac case "$model" in *medium*) case "$medium" in '') dflt='-Mm';; *) dflt="$medium";; esac rp="What flag indicates medium model? [$dflt]" $echo $n "$rp $c" . myread case "$ans" in none) ans=''; esac medium="$ans" ;; *) medium="$large";; esac case "$model" in *small*) case "$small" in '') dflt='none';; *) dflt="$small";; esac rp="What flag indicates small model? [$dflt]" $echo $n "$rp $c" . myread case "$ans" in none) ans=''; esac small="$ans" ;; *) small='';; esac ;; *) echo "Unrecognized memory models--you may have to edit Makefile.SH" ;; esac case "$ccflags" in '') dflt='none';; *) dflt="$ccflags";; esac echo " " rp="Any additional cc flags? [$dflt]" $echo $n "$rp $c" . myread case "$ans" in none) ans=''; esac ccflags="$ans" case "$ldflags" in '') if venix; then dflt='-i -z' else dflt='none' fi ;; *) dflt="$ldflags";; esac echo " " rp="Any additional ld flags? [$dflt]" $echo $n "$rp $c" . myread case "$ans" in none) ans=''; esac ldflags="$ans" : see if we need a special compiler echo " " if usg; then case "$cc" in '') case "$Mcc" in /*) dflt='Mcc' ;; *) case "$large" in -M*) dflt='cc' ;; *) if $contains '\-M' $mansrc/cc.1 >/dev/null 2>&1 ; then dflt='cc -M' else dflt='cc' fi ;; esac ;; esac ;; *) dflt="$cc";; esac $cat <<'EOM' On some systems the default C compiler will not resolve multiple global references that happen to have the same name. On some such systems the "Mcc" command may be used to force these to be resolved. On other systems a "cc -M" command is required. (Note that the -M flag on other systems indicates a memory model to use!) What command will force resolution on EOM $echo $n "this system? [$dflt] $c" rp="Command to resolve multiple refs? [$dflt]" . myread cc="$ans" else echo "Not a USG system--assuming cc can resolve multiple definitions." cc=cc fi echo " " echo "End of configuration questions." echo " " : create config.sh file echo " " if test -d ../UU; then cd .. fi echo "Creating config.sh..." $spitshell <config.sh $startsh # config.sh # This file was produced by running the Configure script. d_eunice='$d_eunice' eunicefix='$eunicefix' define='$define' loclist='$loclist' expr='$expr' sed='$sed' echo='$echo' cat='$cat' rm='$rm' mv='$mv' cp='$cp' tail='$tail' tr='$tr' mkdir='$mkdir' sort='$sort' uniq='$uniq' grep='$grep' trylist='$trylist' test='$test' inews='$inews' egrep='$egrep' more='$more' pg='$pg' Mcc='$Mcc' vi='$vi' mailx='$mailx' mail='$mail' cpp='$cpp' Log='$Log' Header='$Header' bin='$bin' cc='$cc' contains='$contains' cppstdin='$cppstdin' cppminus='$cppminus' d_charsprf='$d_charsprf' d_flexfnam='$d_flexfnam' d_index='$d_index' d_voidsig='$d_voidsig' libc='$libc' mansrc='$mansrc' manext='$manext' models='$models' split='$split' small='$small' medium='$medium' large='$large' huge='$huge' ccflags='$ccflags' ldflags='$ldflags' n='$n' c='$c' package='$package' registers='$registers' reg1='$reg1' reg2='$reg2' reg3='$reg3' reg4='$reg4' reg5='$reg5' reg6='$reg6' reg7='$reg7' reg8='$reg8' reg9='$reg9' reg10='$reg10' reg11='$reg11' reg12='$reg12' reg13='$reg13' reg14='$reg14' reg15='$reg15' reg16='$reg16' spitshell='$spitshell' shsharp='$shsharp' sharpbang='$sharpbang' startsh='$startsh' voidflags='$voidflags' defvoidused='$defvoidused' CONFIG=true EOT CONFIG=true echo " " dflt='' fastread='' echo "If you didn't make any mistakes, then just type a carriage return here." rp="If you need to edit config.sh, do it as a shell escape here:" $echo $n "$rp $c" . UU/myread case "$ans" in '') ;; *) : in case they cannot read eval $ans;; esac . ./config.sh echo " " echo "Doing variable substitutions on .SH files..." set x `awk '{print $1}' /dev/null 2>&1; then dflt=n $cat < makedepend.out &" It can take a while, so you might not want to run it right now. EOM rp="Run make depend now? [$dflt]" $echo $n "$rp $c" . UU/myread case "$ans" in y*) make depend echo "Now you must run a make." ;; *) echo "You must run 'make depend' then 'make'." ;; esac elif test -f Makefile; then echo " " echo "Now you must run a make." else echo "Done." fi $rm -f kit*isdone cd UU && $rm -f $rmlist : end of Configure SHAR_EOF if test 30911 -ne "`wc -c Configure`" then echo shar: error transmitting Configure '(should have been 30911 characters)' fi echo shar: extracting EXTERN.h '(241 characters)' cat << \SHAR_EOF > EXTERN.h /* $Header: EXTERN.h,v 2.0 86/09/17 15:35:37 lwall Exp $ * * $Log: EXTERN.h,v $ * Revision 2.0 86/09/17 15:35:37 lwall * Baseline for netwide release. * */ #undef EXT #define EXT extern #undef INIT #define INIT(x) #undef DOINIT SHAR_EOF if test 241 -ne "`wc -c EXTERN.h`" then echo shar: error transmitting EXTERN.h '(should have been 241 characters)' fi echo shar: extracting INTERN.h '(239 characters)' cat << \SHAR_EOF > INTERN.h /* $Header: INTERN.h,v 2.0 86/09/17 15:35:58 lwall Exp $ * * $Log: INTERN.h,v $ * Revision 2.0 86/09/17 15:35:58 lwall * Baseline for netwide release. * */ #undef EXT #define EXT #undef INIT #define INIT(x) = x #define DOINIT SHAR_EOF if test 239 -ne "`wc -c INTERN.h`" then echo shar: error transmitting INTERN.h '(should have been 239 characters)' fi echo shar: extracting MANIFEST '(926 characters)' cat << \SHAR_EOF > MANIFEST File Name Kit Number -------------- ---------- Configure 1 EXTERN.h 1 INTERN.h 1 MANIFEST 1 MANIFEST 2 Makefile 1 Makefile.SH 1 README 1 all 1 common.h 1 config.h.SH 3 Produces config.h. config.H 1 config.h 1 config.sh 1 filexp 1 inp.c 1 inp.h 1 myread 1 patch.c 2 patch.man 2 patchlevel.h 1 pch.c 2 pch.h 1 util.c 1 util.h 1 version.c 1 version.h 1 SHAR_EOF if test 926 -ne "`wc -c MANIFEST`" then echo shar: error transmitting MANIFEST '(should have been 926 characters)' fi echo shar: extracting Makefile '(2093 characters)' cat << \SHAR_EOF > Makefile # $Header: Makefile.SH,v 2.0.1.2 88/06/22 20:43:40 lwall Locked $ # # $Log: Makefile.SH,v $ # Revision 2.0.1.2 88/06/22 20:43:40 lwall # patch12: config.h now depends on config.h.SH # # Revision 2.0.1.1 88/06/03 15:00:48 lwall # patch10: upgraded to match some new metaconfig stuff # # Revision 2.0 86/09/17 15:36:15 lwall # Baseline for netwide release. # # Revision 1.2 86/09/08 14:07:42 lwall # Split up patch.c. # # Revision 1.1 86/08/01 20:18:35 lwall # Initial revision # CC = cc bin = /usr/local/bin mansrc = /usr/man/manl manext = l CFLAGS = -O LDFLAGS = SMALL = LARGE = public = patch private = manpages = patch.man util = Makefile c = patch.c pch.c inp.c version.c util.c obj = patch.o pch.o inp.o util.o version.o lintflags = -phbvxac addedbyconf = Makefile.old bsd config.h config.sh eunice loc pdp11 usg v7 # grrr SHELL = /bin/sh .c.o: $(CC) -c $(CFLAGS) $(LARGE) $*.c all: $(public) $(private) $(util) touch all patch: $(obj) $(CC) $(LDFLAGS) $(obj) $(libs) -o patch config.h: config.h.SH sh config.h.SH # won't work with csh install: patch export PATH || exit 1 - mv $(bin)/patch $(bin)/patch.old - if test `pwd` != $(bin); then cp $(public) $(bin); fi cd $(bin); chmod 755 $(public) - if test `pwd` != $(mansrc); then \ for page in $(manpages); do \ rm -f $(mansrc)/../cat$(manext)/`basename $$page .man`.$(manext); \ cp $$page $(mansrc)/`basename $$page .man`.$(manext); \ done; \ fi clean: rm -f *.o *.orig core realclean: rm -f patch *.o *.orig core $(addedbyconf) # The following lint has practically everything turned on. Unfortunately, # you have to wade through a lot of mumbo jumbo that can't be suppressed. # If the source file has a /*NOSTRICT*/ somewhere, ignore the lint message # for that spot. lint: lint $(lintflags) $(defs) $(c) > patch.fuzz patch.o: config.h common.h patch.c inp.h pch.h util.h version.h pch.o: config.h common.h pch.c pch.h util.h inp.o: config.h common.h inp.c inp.h util.h util.o: config.h common.h util.c util.h version.o: config.h common.h version.c version.h patchlevel.h util.h SHAR_EOF if test 2093 -ne "`wc -c Makefile`" then echo shar: error transmitting Makefile '(should have been 2093 characters)' fi echo shar: extracting Makefile.SH '(2318 characters)' cat << \SHAR_EOF > Makefile.SH case $CONFIG in '') . config.sh ;; esac echo "Extracting Makefile (with variable substitutions)" cat >Makefile <>Makefile <<'!NO!SUBS!' public = patch private = manpages = patch.man util = Makefile c = patch.c pch.c inp.c version.c util.c obj = patch.o pch.o inp.o util.o version.o lintflags = -phbvxac addedbyconf = Makefile.old bsd config.h config.sh eunice loc pdp11 usg v7 # grrr SHELL = /bin/sh .c.o: $(CC) -c $(CFLAGS) $(LARGE) $*.c all: $(public) $(private) $(util) touch all patch: $(obj) $(CC) $(LDFLAGS) $(obj) $(libs) -o patch config.h: config.h.SH sh config.h.SH # won't work with csh install: patch export PATH || exit 1 - mv $(bin)/patch $(bin)/patch.old - if test `pwd` != $(bin); then cp $(public) $(bin); fi cd $(bin); chmod 755 $(public) - if test `pwd` != $(mansrc); then \ for page in $(manpages); do \ rm -f $(mansrc)/../cat$(manext)/`basename $$page .man`.$(manext); \ cp $$page $(mansrc)/`basename $$page .man`.$(manext); \ done; \ fi clean: rm -f *.o *.orig core realclean: rm -f patch *.o *.orig core $(addedbyconf) # The following lint has practically everything turned on. Unfortunately, # you have to wade through a lot of mumbo jumbo that can't be suppressed. # If the source file has a /*NOSTRICT*/ somewhere, ignore the lint message # for that spot. lint: lint $(lintflags) $(defs) $(c) > patch.fuzz patch.o: config.h common.h patch.c inp.h pch.h util.h version.h pch.o: config.h common.h pch.c pch.h util.h inp.o: config.h common.h inp.c inp.h util.h util.o: config.h common.h util.c util.h version.o: config.h common.h version.c version.h patchlevel.h util.h !NO!SUBS! $eunicefix Makefile SHAR_EOF if test 2318 -ne "`wc -c Makefile.SH`" then echo shar: error transmitting Makefile.SH '(should have been 2318 characters)' fi echo shar: extracting README '(2974 characters)' cat << \SHAR_EOF > README Patch Kit, Version 2.0 Copyright (c) 1988, Larry Wall You may copy the patch kit in whole or in part as long as you don't try to make money off it, or pretend that you wrote it. -------------------------------------------------------------------------- Please read all the directions below before you proceed any further, and then follow them carefully. Failure to do so may void your warranty. :-) After you have unpacked your kit, you should have all the files listed in MANIFEST. Installation 1) Run Configure. This will figure out various things about your system. Some things Configure will figure out for itself, other things it will ask you about. It will then proceed to make config.h, config.sh, and Makefile. You might possibly have to trim # comments from the front of Configure if your sh doesn't handle them, but all other # comments will be taken care of. If you don't have sh, you'll have to rip the prototype of config.h out of Configure and generate the defines by hand. 2) Glance through config.h to make sure system dependencies are correct. Most of them should have been taken care of by running the Configure script. If you have any additional changes to make to the C definitions, they can be done in the Makefile, or in config.h. Bear in mind that they may get undone next time you run Configure. 3) make This will attempt to make patch in the current directory. 4) make install This will put patch into a public directory (normally /usr/local/bin). It will also try to put the man pages in a reasonable place. It will not nroff the man page, however. 5) Read the manual entry before running patch. 6) IMPORTANT! Help save the world! Communicate any problems and suggested patches to me, lwall@jpl-devvax.Jpl.Nasa.Gov (Larry Wall), so we can keep the world in sync. If you have a problem, there's someone else out there who either has had or will have the same problem. If possible, send in patches such that the patch program will apply them. Context diffs are the best, then normal diffs. Don't send ed scripts-- I've probably changed my copy since the version you have. Watch for patch patches in net.sources.bugs. Patches will generally be in a form usable by the patch program. If you are just now bringing up patch and aren't sure how many patches there are, write to me and I'll send any you don't have. Your current patch level is shown in patchlevel.h. NEW FEATURES IN THIS RELEASE (Correct) support for 4.3bsd-style context diffs. Files can be created from scratch. You can specify a fuzz-factor for context matching. You can force patch to ask no questions. You can specify how much of the leading pathname to strip off filenames. Uses a Configure script for greater portability. You are now asked if you want to apply a reversed patch. No limit (apart from memory) on the size of hunks. SHAR_EOF if test 2974 -ne "`wc -c README`" then echo shar: error transmitting README '(should have been 2974 characters)' fi echo shar: extracting all '(0 characters)' cat << \SHAR_EOF > all SHAR_EOF if test 0 -ne "`wc -c all`" then echo shar: error transmitting all '(should have been 0 characters)' fi echo shar: extracting common.h '(3962 characters)' cat << \SHAR_EOF > common.h /* $Header: common.h,v 2.0.1.2 88/06/22 20:44:53 lwall Locked $ * * $Log: common.h,v $ * Revision 2.0.1.2 88/06/22 20:44:53 lwall * patch12: sprintf was declared wrong * * Revision 2.0.1.1 88/06/03 15:01:56 lwall * patch10: support for shorter extensions. * * Revision 2.0 86/09/17 15:36:39 lwall * Baseline for netwide release. * */ #define DEBUGGING #include "config.h" /* 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 100000 /* is this enough lines? */ #define INITHUNKMAX 125 /* initial dynamic allocation size */ #define MAXLINELEN 1024 #define BUFFERSIZE 1024 #define SCCSPREFIX "s." #define GET "get -e %s" #define RCSSUFFIX ",v" #define CHECKOUT "co -l %s" #ifdef FLEXFILENAMES #define ORIGEXT ".orig" #define REJEXT ".rej" #else #define ORIGEXT "~" #define REJEXT "#" #endif /* handy definitions */ #define Null(t) ((t)0) #define Nullch Null(char *) #define Nullfp Null(FILE *) #define Nulline Null(LINENUM) #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 */ EXT int Argc; /* guess */ EXT char **Argv; EXT int Argc_last; /* for restarting plan_b */ EXT char **Argv_last; EXT struct stat filestat; /* file statistics area */ EXT int filemode INIT(0644); EXT char buf[MAXLINELEN]; /* general purpose buffer */ EXT FILE *ofp INIT(Nullfp); /* output file pointer */ EXT FILE *rejfp INIT(Nullfp); /* reject file pointer */ EXT bool using_plan_a INIT(TRUE); /* try to keep everything in memory */ EXT bool out_of_mem INIT(FALSE); /* ran out of memory in plan a */ #define MAXFILEC 2 EXT int filec INIT(0); /* how many file arguments? */ EXT char *filearg[MAXFILEC]; EXT bool ok_to_create_file INIT(FALSE); EXT char *bestguess INIT(Nullch); /* guess at correct filename */ EXT char *outname INIT(Nullch); EXT char rejname[128]; EXT char *origext INIT(Nullch); EXT char *origprae INIT(Nullch); EXT char TMPOUTNAME[] INIT("/tmp/patchoXXXXXX"); EXT char TMPINNAME[] INIT("/tmp/patchiXXXXXX"); /* might want /usr/tmp here */ EXT char TMPREJNAME[] INIT("/tmp/patchrXXXXXX"); EXT char TMPPATNAME[] INIT("/tmp/patchpXXXXXX"); EXT bool toutkeep INIT(FALSE); EXT bool trejkeep INIT(FALSE); EXT LINENUM last_offset INIT(0); #ifdef DEBUGGING EXT int debug INIT(0); #endif EXT LINENUM maxfuzz INIT(2); EXT bool force INIT(FALSE); EXT bool verbose INIT(TRUE); EXT bool reverse INIT(FALSE); EXT bool noreverse INIT(FALSE); EXT bool skip_rest_of_patch INIT(FALSE); EXT int strippath INIT(957); EXT bool canonicalize INIT(FALSE); #define CONTEXT_DIFF 1 #define NORMAL_DIFF 2 #define ED_DIFF 3 #define NEW_CONTEXT_DIFF 4 EXT int diff_type INIT(0); EXT bool do_defines INIT(FALSE); /* patch using ifdef, ifndef, etc. */ EXT char if_defined[128]; /* #ifdef xyzzy */ EXT char not_defined[128]; /* #ifndef xyzzy */ EXT char else_defined[] INIT("#else\n");/* #else */ EXT char end_defined[128]; /* #endif xyzzy */ EXT char *revision INIT(Nullch); /* prerequisite revision, if any */ char *malloc(); char *realloc(); char *strcpy(); char *strcat(); long atol(); long lseek(); char *mktemp(); #ifdef CHARSPRINTF char *sprintf(); #else int sprintf(); #endif SHAR_EOF if test 3962 -ne "`wc -c common.h`" then echo shar: error transmitting common.h '(should have been 3962 characters)' fi echo shar: extracting config.H '(657 characters)' cat << \SHAR_EOF > config.H /* config.h * This file was produced by running the Configure script. * Feel free to modify any of this as the need arises. */ #/*undef EUNICE /* no file linking? */ #/*undef VMS #/*undef index strchr /* cultural */ #/*undef rindex strrchr /* differences? */ #/*undef void int /* is void to be avoided? */ /* How many register declarations are paid attention to? */ #define Reg1 register #define Reg2 register #define Reg3 register #define Reg4 register #define Reg5 register #define Reg6 register #define Reg7 #define Reg8 #define Reg9 #define Reg10 #define Reg11 #define Reg12 #define Reg13 #define Reg14 #define Reg15 #define Reg16 SHAR_EOF if test 657 -ne "`wc -c config.H`" then echo shar: error transmitting config.H '(should have been 657 characters)' fi echo shar: extracting config.h.SH '(4619 characters)' cat << \SHAR_EOF > config.h.SH case $CONFIG in '') if test ! -f config.sh; then ln ../config.sh . || \ ln ../../config.sh . || \ ln ../../../config.sh . || \ (echo "Can't find config.sh."; exit 1) echo "Using config.sh from above..." fi . ./config.sh ;; esac echo "Extracting config.h (with variable substitutions)" cat <config.h /* config.h * This file was produced by running the config.h.SH script, which * gets its values from config.sh, which is generally produced by * running Configure. * * Feel free to modify any of this as the need arises. Note, however, * that running config.h.SH again will wipe out any changes you've made. * For a more permanent change edit config.sh and rerun config.h.SH. */ /* EUNICE: * This symbol, if defined, indicates that the program is being compiled * under the EUNICE package under VMS. The program will need to handle * things like files that don't go away the first time you unlink them, * due to version numbering. It will also need to compensate for lack * of a respectable link() command. */ /* VMS: * This symbol, if defined, indicates that the program is running under * VMS. It is currently only set in conjunction with the EUNICE symbol. */ #$d_eunice EUNICE /**/ #$d_eunice VMS /**/ /* CPPSTDIN: * This symbol contains the first part of the string which will invoke * the C preprocessor on the standard input and produce to standard * output. Typical value of "cc -E" or "/lib/cpp". */ /* CPPMINUS: * This symbol contains the second part of the string which will invoke * the C preprocessor on the standard input and produce to standard * output. This symbol will have the value "-" if CPPSTDIN needs a minus * to specify standard input, otherwise the value is "". */ #define CPPSTDIN "$cppstdin" #define CPPMINUS "$cppminus" /* CHARSPRINTF: * This symbol is defined if this system declares "char *sprintf()" in * stdio.h. The trend seems to be to declare it as "int sprintf()". It * is up to the package author to declare sprintf correctly based on the * symbol. */ #$d_charsprf CHARSPRINTF /**/ /* FLEXFILENAMES: * This symbol, if defined, indicates that the system supports filenames * longer than 14 characters. */ #$d_flexfnam FLEXFILENAMES /**/ /* index: * This preprocessor symbol is defined, along with rindex, if the system * uses the strchr and strrchr routines instead. */ /* rindex: * This preprocessor symbol is defined, along with index, if the system * uses the strchr and strrchr routines instead. */ #$d_index index strchr /* cultural */ #$d_index rindex strrchr /* differences? */ /* VOIDSIG: * This symbol is defined if this system declares "void (*signal())()" in * signal.h. The old way was to declare it as "int (*signal())()". It * is up to the package author to declare things correctly based on the * symbol. */ #$d_voidsig VOIDSIG /**/ /* Reg1: * This symbol, along with Reg2, Reg3, etc. is either the word "register" * or null, depending on whether the C compiler pays attention to this * many register declarations. The intent is that you don't have to * order your register declarations in the order of importance, so you * can freely declare register variables in sub-blocks of code and as * function parameters. Do not use Reg more than once per routine. */ #define Reg1 $reg1 /**/ #define Reg2 $reg2 /**/ #define Reg3 $reg3 /**/ #define Reg4 $reg4 /**/ #define Reg5 $reg5 /**/ #define Reg6 $reg6 /**/ #define Reg7 $reg7 /**/ #define Reg8 $reg8 /**/ #define Reg9 $reg9 /**/ #define Reg10 $reg10 /**/ #define Reg11 $reg11 /**/ #define Reg12 $reg12 /**/ #define Reg13 $reg13 /**/ #define Reg14 $reg14 /**/ #define Reg15 $reg15 /**/ #define Reg16 $reg16 /**/ /* VOIDFLAGS: * This symbol indicates how much support of the void type is given by this * compiler. What various bits mean: * * 1 = supports declaration of void * 2 = supports arrays of pointers to functions returning void * 4 = supports comparisons between pointers to void functions and * addresses of void functions * * The package designer should define VOIDUSED to indicate the requirements * of the package. This can be done either by #defining VOIDUSED before * including config.h, or by defining defvoidused in Myinit.U. If the * level of void support necessary is not present, defines void to int. */ #ifndef VOIDUSED #define VOIDUSED $defvoidused #endif #define VOIDFLAGS $voidflags #if (VOIDFLAGS & VOIDUSED) != VOIDUSED #$define void int /* is void to be avoided? */ #$define M_VOID /* Xenix strikes again */ #endif !GROK!THIS! SHAR_EOF if test 4619 -ne "`wc -c config.h.SH`" then echo shar: error transmitting config.h.SH '(should have been 4619 characters)' fi echo shar: extracting inp.c '(8134 characters)' cat << \SHAR_EOF > inp.c /* $Header: inp.c,v 2.0.1.1 88/06/03 15:06:13 lwall Locked $ * * $Log: inp.c,v $ * Revision 2.0.1.1 88/06/03 15:06:13 lwall * patch10: made a little smarter about sccs files * * Revision 2.0 86/09/17 15:37:02 lwall * Baseline for netwide release. * */ #include "EXTERN.h" #include "common.h" #include "util.h" #include "pch.h" #include "INTERN.h" #include "inp.h" /* Input-file-with-indexable-lines abstract type */ 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 */ /* New patch--prepare to edit another file. */ void re_input() { if (using_plan_a) { i_size = 0; #ifndef lint if (i_ptr != Null(char**)) free((char *)i_ptr); #endif 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; } } /* Constuct the line index, somehow or other. */ void scan_input(filename) char *filename; { if (!plan_a(filename)) plan_b(filename); if (verbose) { say3("Patching file %s using Plan %s...\n", filename, (using_plan_a ? "A" : "B") ); } } /* Try keeping everything in memory. */ bool plan_a(filename) char *filename; { int ifd; Reg1 char *s; Reg2 LINENUM iline; if (ok_to_create_file && stat(filename, &filestat) < 0) { if (verbose) say2("(Creating file %s...)\n",filename); makedirs(filename, TRUE); close(creat(filename, 0666)); } 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) say2("Can't find %s--attempting to check it out from RCS.\n", filename); if (system(buf) || stat(filename, &filestat)) fatal2("Can't check out %s.\n", filename); } else { Sprintf(buf+20, "SCCS/%s%s", SCCSPREFIX, filename); if (stat(s=buf+20, &filestat) >= 0 || stat(s=buf+25, &filestat) >= 0) { Sprintf(buf, GET, s); if (verbose) say2("Can't find %s--attempting to get it from SCCS.\n", filename); if (system(buf) || stat(filename, &filestat)) fatal2("Can't get %s.\n", filename); } else fatal2("Can't find %s.\n", filename); } } filemode = filestat.st_mode; if ((filemode & S_IFMT) & ~S_IFREG) fatal2("%s is not a normal file--can't patch.\n", filename); i_size = filestat.st_size; if (out_of_mem) { set_hunkmax(); /* make sure dynamic arrays are allocated */ out_of_mem = FALSE; return FALSE; /* force plan b because plan a bombed */ } #ifdef lint i_womp = Nullch; #else i_womp = malloc((MEM)(i_size+2)); /* lint says this may alloc less than */ /* i_size, but that's okay, I think. */ #endif if (i_womp == Nullch) return FALSE; if ((ifd = open(filename, 0)) < 0) fatal2("Can't open file %s\n", filename); #ifndef lint if (read(ifd, i_womp, (int)i_size) != i_size) { Close(ifd); /* probably means i_size > 15 or 16 bits worth */ free(i_womp); /* at this point it doesn't matter if i_womp was */ return FALSE; /* undersized. */ } #endif Close(ifd); if (i_size && 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++; } #ifdef lint i_ptr = Null(char**); #else i_ptr = (char **)malloc((MEM)((iline + 2) * sizeof(char *))); #endif 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)) { if (force) { if (verbose) say2( "Warning: this file doesn't appear to be the %s version--patching anyway.\n", revision); } else { ask2( "This file doesn't appear to be the %s version--patch anyway? [n] ", revision); if (*buf != 'y') fatal1("Aborted.\n"); } } else if (verbose) say2("Good. This file appears to be the %s version.\n", revision); } return TRUE; /* plan a will work */ } /* Keep (virtually) nothing in memory. */ void plan_b(filename) char *filename; { Reg3 FILE *ifp; Reg1 int i = 0; Reg2 int maxlen = 1; Reg4 bool found_revision = (revision == Nullch); using_plan_a = FALSE; if ((ifp = fopen(filename, "r")) == Nullfp) fatal2("Can't open file %s\n", filename); if ((tifd = creat(TMPINNAME, 0666)) < 0) fatal2("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) { if (force) { if (verbose) say2( "Warning: this file doesn't appear to be the %s version--patching anyway.\n", revision); } else { ask2( "This file doesn't appear to be the %s version--patch anyway? [n] ", revision); if (*buf != 'y') fatal1("Aborted.\n"); } } else if (verbose) say2("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) fatal1("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) fatal1("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) fatal1("patch: can't write temp file.\n"); break; } } Fclose(ifp); Close(tifd); if ((tifd = open(TMPINNAME, 0)) < 0) { fatal2("Can't reopen file %s\n", TMPINNAME); } } /* Fetch a line from the input file, \n terminated, not necessarily \0. */ char * ifetch(line,whichbuf) Reg1 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; #ifndef lint /* complains of long accuracy */ Lseek(tifd, (long)baseline / lines_per_buf * BUFFERSIZE, 0); #endif if (read(tifd, tibuf[whichbuf], BUFFERSIZE) < 0) fatal2("Error reading tmp file %s.\n", TMPINNAME); } return tibuf[whichbuf] + (tireclen*offline); } } /* True if the string argument contains the revision number we want. */ bool rev_in_string(string) char *string; { Reg1 char *s; Reg2 int patlen; if (revision == Nullch) return TRUE; patlen = strlen(revision); if (strnEQ(string,revision,patlen) && isspace(s[patlen])) return TRUE; for (s = string; *s; s++) { if (isspace(*s) && strnEQ(s+1, revision, patlen) && isspace(s[patlen+1] )) { return TRUE; } } return FALSE; } SHAR_EOF if test 8134 -ne "`wc -c inp.c`" then echo shar: error transmitting inp.c '(should have been 8134 characters)' fi echo shar: extracting inp.h '(473 characters)' cat << \SHAR_EOF > inp.h /* $Header: inp.h,v 2.0 86/09/17 15:37:25 lwall Exp $ * * $Log: inp.h,v $ * Revision 2.0 86/09/17 15:37:25 lwall * Baseline for netwide release. * */ EXT LINENUM input_lines INIT(0); /* how long is input file in lines */ EXT LINENUM last_frozen_line INIT(0); /* how many input lines have been */ /* irretractibly output */ bool rev_in_string(); void scan_input(); bool plan_a(); /* returns false if insufficient memory */ void plan_b(); char *ifetch(); SHAR_EOF if test 473 -ne "`wc -c inp.h`" then echo shar: error transmitting inp.h '(should have been 473 characters)' fi echo shar: extracting malloc.c '(12262 characters)' cat << \SHAR_EOF > malloc.c /* * @(#)nmalloc.c 1 (Caltech) 2/21/82 * * U of M Modified: 20 Jun 1983 ACT: strange hacks for Emacs * * Nov 1983, Mike@BRL, Added support for 4.1C/4.2 BSD. * * This is a very fast storage allocator. It allocates blocks of a small * number of different sizes, and keeps free lists of each size. Blocks * that don't exactly fit are passed up to the next larger size. In this * implementation, the available sizes are (2^n)-4 (or -16) bytes long. * This is designed for use in a program that uses vast quantities of * memory, but bombs when it runs out. To make it a little better, it * warns the user when he starts to get near the end. * * June 84, ACT: modified rcheck code to check the range given to malloc, * rather than the range determined by the 2-power used. * * Jan 85, RMS: calls malloc_warning to issue warning on nearly full. * No longer Emacs-specific; can serve as all-purpose malloc for GNU. * You should call malloc_init to reinitialize after loading dumped Emacs. * Call malloc_stats to get info on memory stats if MSTATS turned on. * realloc knows how to return same block given, just changing its size, * if the power of 2 is correct. */ /* * nextf[i] is the pointer to the next free block of size 2^(i+3). The * smallest allocatable block is 8 bytes. The overhead information will * go in the first int of the block, and the returned pointer will point * to the second. * #ifdef MSTATS * nmalloc[i] is the difference between the number of mallocs and frees * for a given block size. #endif /* MSTATS */ */ #define ISALLOC ((char) 0xf7) /* magic byte that implies allocation */ #define ISFREE ((char) 0x54) /* magic byte that implies free block */ /* this is for error checking only */ extern char etext; /* end of the program; can be changed by calling init_malloc */ static char *endofpure = &etext; #ifdef MSTATS static int nmalloc[30]; static int nmal, nfre; #endif /* MSTATS */ /* If range checking is not turned on, all we have is a flag indicating whether memory is allocated, an index in nextf[], and a size field; to realloc() memory we copy either size bytes or 1<<(index+3) bytes depending on whether the former can hold the exact size (given the value of 'index'). If range checking is on, we always need to know how much space is allocated, so the 'size' field is never used. */ struct mhead { char mh_alloc; /* ISALLOC or ISFREE */ char mh_index; /* index in nextf[] */ /* Remainder are valid only when block is allocated */ unsigned short mh_size; /* size, if < 0x10000 */ #ifdef rcheck unsigned mh_nbytes; /* number of bytes allocated */ int mh_magic4; /* should be == MAGIC4 */ #endif /* rcheck */ }; /* Access free-list pointer of a block. It is stored at block + 4. This is not a field in the mhead structure because we want sizeof (struct mhead) to describe the overhead for when the block is in use, and we do not want the free-list pointer to count in that. */ #define CHAIN(a) \ (*(struct mhead **) (sizeof (char *) + (char *) (a))) #ifdef rcheck /* To implement range checking, we write magic values in at the beginning and end of each allocated block, and make sure they are undisturbed whenever a free or a realloc occurs. */ /* Written in each of the 4 bytes following the block's real space */ #define MAGIC1 0x55 /* Written in the 4 bytes before the block's real space */ #define MAGIC4 0x55555555 #define ASSERT(p) if (!(p)) botch("p"); else static botch(s) char *s; { printf("assertion botched: %s\n", s); abort(); } #define EXTRA 4 /* 4 bytes extra for MAGIC1s */ #else #define ASSERT(p) #define EXTRA 0 #endif /* rcheck */ /* nextf[i] is free list of blocks of size 2**(i + 3) */ static struct mhead *nextf[30]; #ifdef M_WARN /* Number of bytes of writable memory we can expect to be able to get */ static int lim_data; /* Level number of warnings already issued. 0 -- no warnings issued. 1 -- 75% warning already issued. 2 -- 85% warning already issued. */ static int warnlevel; #endif /* M_WARN */ /* nonzero once initial bunch of free blocks made */ static int gotpool; /* Cause reinitialization based on job parameters; also declare where the end of pure storage is. */ malloc_init (end) char *end; { endofpure = end; #ifdef M_WARN lim_data = 0; warnlevel = 0; #endif /* M_WARN */ } static morecore (nu) /* ask system for more memory */ register int nu; { /* size index to get more of */ char *sbrk (); register char *cp; register int nblks; register int siz; #ifdef M_WARN #ifndef BSD42 #ifdef USG extern long ulimit (); if (lim_data == 0) /* find out how much we can get */ lim_data = ulimit (3, 0) - TEXT_START; #else /*HMS: was endif */ if (lim_data == 0) /* find out how much we can get */ lim_data = vlimit (LIM_DATA, -1); #endif /* USG */ /HMS:* was not here */ #else if (lim_data == 0) { struct rlimit XXrlimit; getrlimit (RLIMIT_DATA, &XXrlimit); lim_data = XXrlimit.rlim_cur;} /* soft limit */ #endif /* BSD42 */ #endif /* M_WARN */ /* On initial startup, get two blocks of each size up to 1k bytes */ if (!gotpool) getpool (), getpool (), gotpool = 1; /* Find current end of memory and issue warning if getting near max */ cp = sbrk (0); siz = cp - endofpure; #ifdef M_WARN switch (warnlevel) { case 0: if (siz > (lim_data / 4) * 3) { warnlevel++; malloc_warning ("Warning: past 75% of memory limit");} break; case 1: if (siz > (lim_data / 20) * 17) { warnlevel++; malloc_warning ("Warning: past 85% of memory limit");} break; case 2: if (siz > (lim_data / 20) * 19) { warnlevel++; malloc_warning ("Warning: past 95% of memory limit");} break;} #endif /* M_WARN */ if ((int) cp & 0x3ff) /* land on 1K boundaries */ sbrk (1024 - ((int) cp & 0x3ff)); /* Take at least 2k, and figure out how many blocks of the desired size we're about to get */ nblks = 1; if ((siz = nu) < 8) nblks = 1 << ((siz = 8) - nu); if ((cp = sbrk (1 << (siz + 3))) == (char *) -1) return; /* no more room! */ if ((int) cp & 7) { /* shouldn't happen, but just in case */ cp = (char *) (((int) cp + 8) & ~7); nblks--;} /* save new header and link the nblks blocks together */ nextf[nu] = (struct mhead *) cp; siz = 1 << (nu + 3); while (1) { ((struct mhead *) cp) -> mh_alloc = ISFREE; ((struct mhead *) cp) -> mh_index = nu; if (--nblks <= 0) break; CHAIN ((struct mhead *) cp) = (struct mhead *) (cp + siz); cp += siz;} /* CHAIN ((struct mhead *) cp) = 0; /* since sbrk() returns cleared core, this is already set */ } static getpool () { register int nu; register char *cp = sbrk (0); if ((int) cp & 0x3ff) /* land on 1K boundaries */ sbrk (1024 - ((int) cp & 0x3ff)); /* Get 2k of storage */ cp = sbrk (04000); if (cp == (char *) -1) return; /* Divide it into an initial 8-word block plus one block of size 2**nu for nu = 3 ... 10. */ CHAIN (cp) = nextf[0]; nextf[0] = (struct mhead *) cp; ((struct mhead *) cp) -> mh_alloc = ISFREE; ((struct mhead *) cp) -> mh_index = 0; cp += 8; for (nu = 0; nu < 7; nu++) { CHAIN (cp) = nextf[nu]; nextf[nu] = (struct mhead *) cp; ((struct mhead *) cp) -> mh_alloc = ISFREE; ((struct mhead *) cp) -> mh_index = nu; cp += 8 << nu;}} char * malloc (n) /* get a block */ unsigned n; { register struct mhead *p; register unsigned int nbytes; register int nunits = 0; /* Figure out how many bytes are required, rounding up to the nearest multiple of 4, then figure out which nextf[] area to use */ nbytes = (n + sizeof *p + EXTRA + 3) & ~3; { register unsigned int shiftr = (nbytes - 1) >> 2; while (shiftr >>= 1) nunits++; } /* If there are no blocks of the appropriate size, go get some */ /* COULD SPLIT UP A LARGER BLOCK HERE ... ACT */ if (nextf[nunits] == 0) morecore (nunits); /* Get one block off the list, and set the new list head */ if ((p = nextf[nunits]) == 0) return 0; nextf[nunits] = CHAIN (p); /* Check for free block clobbered */ /* If not for this check, we would gobble a clobbered free chain ptr */ /* and bomb out on the NEXT allocate of this size block */ if (p -> mh_alloc != ISFREE || p -> mh_index != nunits) #ifdef rcheck botch ("block on free list clobbered"); #else abort (); #endif /* rcheck */ /* Fill in the info, and if range checking, set up the magic numbers */ p -> mh_alloc = ISALLOC; #ifdef rcheck p -> mh_nbytes = n; p -> mh_magic4 = MAGIC4; { register char *m = (char *) (p + 1) + n; *m++ = MAGIC1, *m++ = MAGIC1, *m++ = MAGIC1, *m = MAGIC1; } #else p -> mh_size = n; #endif /* rcheck */ #ifdef MSTATS nmalloc[nunits]++; nmal++; #endif /* MSTATS */ return (char *) (p + 1);} free (mem) char *mem; { register struct mhead *p; { register char *ap = mem; ASSERT (ap != 0); p = (struct mhead *) ap - 1; ASSERT (p -> mh_alloc == ISALLOC); #ifdef rcheck ASSERT (p -> mh_magic4 == MAGIC4); ap += p -> mh_nbytes; ASSERT (*ap++ == MAGIC1); ASSERT (*ap++ == MAGIC1); ASSERT (*ap++ == MAGIC1); ASSERT (*ap == MAGIC1); #endif /* rcheck */ } { register int nunits = p -> mh_index; ASSERT (nunits <= 29); p -> mh_alloc = ISFREE; CHAIN (p) = nextf[nunits]; nextf[nunits] = p; #ifdef MSTATS nmalloc[nunits]--; nfre++; #endif /* MSTATS */ } } char * realloc (mem, n) char *mem; register unsigned n; { register struct mhead *p; register unsigned int tocopy; register int nbytes; register int nunits; if ((p = (struct mhead *) mem) == 0) return malloc (n); p--; nunits = p -> mh_index; ASSERT (p -> mh_alloc == ISALLOC); #ifdef rcheck ASSERT (p -> mh_magic4 == MAGIC4); { register char *m = mem + (tocopy = p -> mh_nbytes); ASSERT (*m++ == MAGIC1); ASSERT (*m++ == MAGIC1); ASSERT (*m++ == MAGIC1); ASSERT (*m == MAGIC1); } #else if (p -> mh_index >= 13) tocopy = (1 << (p -> mh_index + 3)) - sizeof *p; else tocopy = p -> mh_size; #endif /* rcheck */ /* See if desired size rounds to same power of 2 as actual size. */ nbytes = (n + sizeof *p + EXTRA + 7) & ~7; /* If ok, use the same block, just marking its size as changed. */ if (nbytes > (4 << nunits) && nbytes <= (8 << nunits)) { #ifdef rcheck register char *m = mem + tocopy; *m++ = 0; *m++ = 0; *m++ = 0; *m++ = 0; p-> mh_nbytes = n; m = mem + n; *m++ = MAGIC1; *m++ = MAGIC1; *m++ = MAGIC1; *m++ = MAGIC1; #else p -> mh_size = n; #endif /* rcheck */ return mem;} if (n < tocopy) tocopy = n; { register char *new; void bcopy(); /*HMS: here? */ if ((new = malloc (n)) == 0) return 0; bcopy (mem, new, tocopy); free (mem); return new; } } #ifdef MSTATS /* Return statistics describing allocation of blocks of size 2**n. */ struct mstats_value { int blocksize; int nfree; int nused; }; struct mstats_value malloc_stats (size) int size; { struct mstats_value v; register int i; register struct mhead *p; v.nfree = 0; if (size < 0 || size >= 30) { v.blocksize = 0; v.nused = 0; return v;} v.blocksize = 1 << (size + 3); v.nused = nmalloc[size]; for (p = nextf[size]; p; p = CHAIN (p)) v.nfree++; return v;} #endif /* how much space is available? */ unsigned freespace() { register int i, j; register struct mhead *p; register unsigned space = 0; int local; /* address only is used */ space = (char *)&local - sbrk(0); /* stack space */ for (i = 0; i < 30; i++) { for (j = 0, p = nextf[i]; p; p = CHAIN (p), j++) ; space += j * (1 << (i + 3));} return(space);} /* How big is this cell? */ unsigned mc_size(cp) char *cp;{ register struct mhead *p; if ((p = (struct mhead *) cp) == 0) { /*HMS? */ } p--; #ifdef rcheck return p -> mh_nbytes; #else return (1 << (p -> mh_index + 3)) - sizeof *p; /**/ /* if (p -> mh_index >= 13) /* return (1 << (p -> mh_index + 3)) - sizeof *p; /* else /* return p -> mh_size; /**/ #endif /* rcheck */ } /*HMS: Really should use memcpy, if available... */ void bcopy(source, dest, len) register char *source, *dest; register len; { register i; for (i = 0; i < len; i++) *dest++ = *source++;} SHAR_EOF if test 12262 -ne "`wc -c malloc.c`" then echo shar: error transmitting malloc.c '(should have been 12262 characters)' fi echo shar: extracting patch.c '(19018 characters)' cat << \SHAR_EOF > patch.c char rcsid[] = "$Header: patch.c,v 2.0.1.6 88/06/22 20:46:39 lwall Locked $"; /* 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.6 88/06/22 20:46:39 lwall * patch12: rindex() wasn't declared * * Revision 2.0.1.5 88/06/03 15:09:37 lwall * patch10: exit code improved. * patch10: better support for non-flexfilenames. * * 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 failtotal = 0; int i; setbuf(stderr, serrbuf); for (i = 0; i 13) if (s[12] == '.') /* try to preserve difference */ s[12] = s[13]; /* between .h, .c, .y, etc. */ s[13] = '\0'; } #endif Strcat(rejname, REJEXT); } if (skip_rest_of_patch) { say4("%d out of %d hunks ignored--saving rejects to %s\n", failed, hunk, rejname); } else { say4("%d out of %d hunks failed--saving rejects to %s\n", failed, hunk, rejname); } if (move_file(TMPREJNAME, rejname) < 0) trejkeep = TRUE; } set_signals(1); } my_exit(failtotal); } /* Prepare to find the next patch to do in the patch file. */ void reinitialize_almost_everything() { re_patch(); re_input(); input_lines = 0; last_frozen_line = 0; filec = 0; if (filearg[0] != Nullch && !out_of_mem) { free(filearg[0]); filearg[0] = Nullch; } if (outname != Nullch) { free(outname); outname = Nullch; } last_offset = 0; diff_type = 0; if (revision != Nullch) { free(revision); revision = Nullch; } reverse = FALSE; skip_rest_of_patch = FALSE; get_some_switches(); if (filec >= 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 'B': origprae = 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]; } if (!isalpha(*s)) fatal1("Argument to -D not an identifier.\n"); 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); } Unlink(TMPPATNAME); exit(status); } SHAR_EOF if test 19018 -ne "`wc -c patch.c`" then echo shar: error transmitting patch.c '(should have been 19018 characters)' fi echo shar: extracting patch.man '(14457 characters)' cat << \SHAR_EOF > patch.man .rn '' }` ''' $Header: patch.man,v 2.0.1.2 88/06/22 20:47:18 lwall Locked $ ''' ''' $Log: patch.man,v $ ''' Revision 2.0.1.2 88/06/22 20:47:18 lwall ''' patch12: now avoids Bell System Logo ''' ''' Revision 2.0.1.1 88/06/03 15:12:51 lwall ''' patch10: -B switch was contributed. ''' ''' Revision 2.0 86/09/17 15:39:09 lwall ''' Baseline for netwide release. ''' ''' Revision 1.4 86/08/01 19:23:22 lwall ''' Documented -v, -p, -F. ''' Added notes to patch senders. ''' ''' Revision 1.3 85/03/26 15:11:06 lwall ''' Frozen. ''' ''' Revision 1.2.1.4 85/03/12 16:14:27 lwall ''' Documented -p. ''' ''' Revision 1.2.1.3 85/03/12 16:09:41 lwall ''' Documented -D. ''' ''' Revision 1.2.1.2 84/12/05 11:06:55 lwall ''' Added -l switch, and noted bistability bug. ''' ''' Revision 1.2.1.1 84/12/04 17:23:39 lwall ''' Branch for sdcrdcf changes. ''' ''' Revision 1.2 84/12/04 17:22:02 lwall ''' Baseline version. ''' .de Sh .br .ne 5 .PP \fB\\$1\fR .PP .. .de Sp .if t .sp .5v .if n .sp .. ''' ''' Set up \*(-- to give an unbreakable dash; ''' string Tr holds user defined translation string. ''' Bell System Logo is used as a dummy character. ''' .ie n \{\ .tr \(*W-\*(Tr .ds -- \(*W- .if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch .if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch .ds L" "" .ds R" "" .ds L' ' .ds R' ' 'br\} .el\{\ .ds -- \(em\| .tr \*(Tr .ds L" `` .ds R" '' .ds L' ` .ds R' ' 'br\} .TH PATCH 1 LOCAL .SH NAME patch - a program for applying a diff file to an original .SH SYNOPSIS .B patch [options] orig patchfile [+ [options] orig] .sp but usually just .sp .B patch sets the maximum fuzz factor. This switch only applies to context diffs, and causes .I patch to ignore up to that many lines in looking for places to install a hunk. Note that a larger fuzz factor increases the odds of a faulty patch. The default fuzz factor is 2, and it may not be set to more than the number of lines of context in the context diff, ordinarily 3. .TP 5 .B \-l causes the pattern matching to be done loosely, in case the tabs and spaces have been munged in your input file. Any sequence of whitespace in the pattern line will match any sequence in the input file. Normal characters must still match exactly. Each line of the context must still match a line in the input file. .TP 5 .B \-n forces .I patch to interpret the patch file as a normal diff. .TP 5 .B \-N causes .I patch to ignore patches that it thinks are reversed or already applied. See also .B \-R . .TP 5 .B \-o causes the next argument to be interpreted as the output file name. .TP 5 .B \-p sets the pathname strip count, which controls how pathnames found in the patch file are treated, in case the you keep your files in a different directory than the person who sent out the patch. The strip count specifies how many slashes are to be stripped from the front of the pathname. (Any intervening directory names also go away.) For example, supposing the filename in the patch file was .sp /u/howard/src/blurfl/blurfl.c .sp setting .B \-p or .B \-p0 gives the entire pathname unmodified, .B \-p1 gives .sp u/howard/src/blurfl/blurfl.c .sp without the leading slash, .B \-p4 gives .sp blurfl/blurfl.c .sp and not specifying .B \-p at all just gives you "blurfl.c". Whatever you end up with is looked for either in the current directory, or the directory specified by the .B \-d switch. .TP 5 .B \-r causes the next argument to be interpreted as the reject file name. .TP 5 .B \-R tells .I patch that this patch was created with the old and new files swapped. (Yes, I'm afraid that does happen occasionally, human nature being what it is.) .I Patch will attempt to swap each hunk around before applying it. Rejects will come out in the swapped format. The .B \-R switch will not work with ed diff scripts because there is too little information to reconstruct the reverse operation. .Sp If the first hunk of a patch fails, .I patch will reverse the hunk to see if it can be applied that way. If it can, you will be asked if you want to have the .B \-R switch set. If it can't, the patch will continue to be applied normally. (Note: this method cannot detect a reversed patch if it is a normal diff and if the first command is an append (i.e. it should have been a delete) since appends always succeed, due to the fact that a null context will match anywhere. Luckily, most patches add or change lines rather than delete them, so most reversed normal diffs will begin with a delete, which will fail, triggering the heuristic.) .TP 5 .B \-s makes .I patch do its work silently, unless an error occurs. .TP 5 .B \-S causes .I patch to ignore this patch from the patch file, but continue on looking for the next patch in the file. Thus .sp patch -S + -S + sets internal debugging flags, and is of interest only to .I patch patchers. .SH ENVIRONMENT No environment variables are used by .IR patch . .SH FILES /tmp/patch* .SH SEE ALSO diff(1) .SH NOTES FOR PATCH SENDERS There are several things you should bear in mind if you are going to be sending out patches. First, you can save people a lot of grief by keeping a patchlevel.h file which is patched to increment the patch level as the first diff in the patch file you send out. If you put a Prereq: line in with the patch, it won't let them apply patches out of order without some warning. Second, make sure you've specified the filenames right, either in a context diff header, or with an Index: line. If you are patching something in a subdirectory, be sure to tell the patch user to specify a .B \-p switch as needed. Third, you can create a file by sending out a diff that compares a null file to the file you want to create. This will only work if the file you want to create doesn't exist already in the target directory. Fourth, take care not to send out reversed patches, since it makes people wonder whether they already applied the patch. Fifth, while you may be able to get away with putting 582 diff listings into one file, it is probably wiser to group related patches into separate files in case something goes haywire. .SH DIAGNOSTICS Too many to list here, but generally indicative that .I patch couldn't parse your patch file. .PP The message \*(L"Hmm...\*(R" indicates that there is unprocessed text in the patch file and that .I patch is attempting to intuit whether there is a patch in that text and, if so, what kind of patch it is. .PP .I Patch will exit with a non-zero status if any reject files were created. When applying a set of patches in a loop it behooves you to check this exit status so you don't apply a later patch to a partially patched file. .SH CAVEATS .I Patch cannot tell if the line numbers are off in an ed script, and can only detect bad line numbers in a normal diff when it finds a \*(L"change\*(R" or a \*(L"delete\*(R" command. A context diff using fuzz factor 3 may have the same problem. Until a suitable interactive interface is added, you should probably do a context diff in these cases to see if the changes made sense. Of course, compiling without errors is a pretty good indication that the patch worked, but not always. .PP .I Patch usually produces the correct results, even when it has to do a lot of guessing. However, the results are guaranteed to be correct only when the patch is applied to exactly the same version of the file that the patch was generated from. .SH BUGS Could be smarter about partial matches, excessively \&deviant offsets and swapped code, but that would take an extra pass. .PP If code has been duplicated (for instance with #ifdef OLDCODE ... #else ... #endif), .I patch is incapable of patching both versions, and, if it works at all, will likely patch the wrong one, and tell you that it succeeded to boot. .PP If you apply a patch you've already applied, .I patch will think it is a reversed patch, and offer to un-apply the patch. This could be construed as a feature. .rn }` '' SHAR_EOF if test 14457 -ne "`wc -c patch.man`" then echo shar: error transmitting patch.man '(should have been 14457 characters)' fi echo shar: extracting patchlevel.h '(22 characters)' cat << \SHAR_EOF > patchlevel.h #define PATCHLEVEL 12 SHAR_EOF if test 22 -ne "`wc -c patchlevel.h`" then echo shar: error transmitting patchlevel.h '(should have been 22 characters)' fi echo shar: extracting pch.c '(28639 characters)' cat << \SHAR_EOF > pch.c /* $Header: pch.c,v 2.0.1.7 88/06/03 15:13:28 lwall Locked $ * * $Log: pch.c,v $ * Revision 2.0.1.7 88/06/03 15:13:28 lwall * patch10: Can now find patches in shar scripts. * patch10: Hunks that swapped and then swapped back could core dump. * * 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); 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. */ 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; } ask1("File to patch: "); if (*buf != '\n') { if (bestguess) free(bestguess); bestguess = savestr(buf); filearg[0] = fetchname(buf, 0, FALSE); } if (filearg[0] == Nullch) { 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; } /* 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 == 'X'; 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; #ifdef zilog p_line[(short)p_end] = Nullch; #else p_line[p_end] = Nullch; #endif 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; if (strnEQ(s,"0,0",3)) strcpy(s,s+2); 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 (buf[1] == '\n' && canonicalize) strcpy(buf+1," \n"); 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) say4("%s\n%s\n%s\n", "(Fascinating--this is really a new-style context diff but without", "the telltale extra asterisks on the *** line that usually indicate", "the new style...)"); 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 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,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 */ 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; 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 = min; p_repl_lines = max - min + 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", min, max); 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 == 'X'); 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 */ 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 */ 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; } /* 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(1); } SHAR_EOF if test 28639 -ne "`wc -c pch.c`" then echo shar: error transmitting pch.c '(should have been 28639 characters)' fi echo shar: extracting pch.h '(780 characters)' cat << \SHAR_EOF > pch.h /* $Header: pch.h,v 2.0.1.1 87/01/30 22:47:16 lwall Exp $ * * $Log: pch.h,v $ * Revision 2.0.1.1 87/01/30 22:47:16 lwall * Added do_ed_script(). * * Revision 2.0 86/09/17 15:39:57 lwall * Baseline for netwide release. * */ EXT FILE *pfp INIT(Nullfp); /* patch file pointer */ void re_patch(); void open_patch_file(); void set_hunkmax(); void grow_hunkmax(); bool there_is_another_patch(); int intuit_diff_type(); void next_intuit_at(); void skip_to(); bool another_hunk(); bool pch_swap(); char *pfetch(); short 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(); void do_ed_script(); SHAR_EOF if test 780 -ne "`wc -c pch.h`" then echo shar: error transmitting pch.h '(should have been 780 characters)' fi echo shar: extracting util.c '(7348 characters)' cat << \SHAR_EOF > util.c #include "EXTERN.h" #include "common.h" #include "INTERN.h" #include "util.h" /* Rename a file, copying it if necessary. */ int move_file(from,to) char *from, *to; { char bakname[512]; Reg1 char *s; Reg2 int i; Reg3 int fromfd; /* to stdout? */ if (strEQ(to, "-")) { #ifdef DEBUGGING if (debug & 4) say2("Moving %s to stdout.\n", from); #endif fromfd = open(from, 0); if (fromfd < 0) fatal2("patch: internal error, can't reopen %s\n", from); while ((i=read(fromfd, buf, sizeof buf)) > 0) if (write(1, buf, i) != 1) fatal1("patch: write failed\n"); Close(fromfd); return 0; } if (origprae) { Strcpy (bakname, origprae); Strcat(bakname, to); } else { 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) say3("Moving %s to %s.\n", to, bakname); #endif if (link(to, bakname) < 0) { say3("patch: can't backup %s, output is in %s\n", to, from); return -1; } while (unlink(to) >= 0) ; } #ifdef DEBUGGING if (debug & 4) say3("Moving %s to %s.\n", from, to); #endif if (link(from, to) < 0) { /* different file system? */ Reg4 int tofd; tofd = creat(to, 0666); if (tofd < 0) { say3("patch: can't create %s, output is in %s.\n", to, from); return -1; } fromfd = open(from, 0); if (fromfd < 0) fatal2("patch: internal error, can't reopen %s\n", from); while ((i=read(fromfd, buf, sizeof buf)) > 0) if (write(tofd, buf, i) != i) fatal1("patch: write failed\n"); Close(fromfd); Close(tofd); } Unlink(from); return 0; } /* Copy a file. */ void copy_file(from,to) char *from, *to; { Reg3 int tofd; Reg2 int fromfd; Reg1 int i; tofd = creat(to, 0666); if (tofd < 0) fatal2("patch: can't create %s.\n", to); fromfd = open(from, 0); if (fromfd < 0) fatal2("patch: internal error, can't reopen %s\n", from); while ((i=read(fromfd, buf, sizeof buf)) > 0) if (write(tofd, buf, i) != i) fatal2("patch: write (%s) failed\n", to); Close(fromfd); Close(tofd); } /* Allocate a unique area for a string. */ char * savestr(s) Reg1 char *s; { Reg3 char *rv; Reg2 char *t; if (!s) s = "Oops"; t = s; while (*t++); rv = malloc((MEM) (t - s)); if (rv == Nullch) { if (using_plan_a) out_of_mem = TRUE; else fatal1("patch: out of memory (savestr)\n"); } else { t = rv; while (*t++ = *s++); } return rv; } #if defined(lint) && defined(CANVARARG) /*VARARGS ARGSUSED*/ say(pat) char *pat; { ; } /*VARARGS ARGSUSED*/ fatal(pat) char *pat; { ; } /*VARARGS ARGSUSED*/ ask(pat) char *pat; { ; } #else /* Vanilla terminal output (buffered). */ void say(pat,arg1,arg2,arg3) char *pat; long arg1,arg2,arg3; { fprintf(stderr, pat, arg1, arg2, arg3); Fflush(stderr); } /* Terminal output, pun intended. */ void /* very void */ fatal(pat,arg1,arg2,arg3) char *pat; long arg1,arg2,arg3; { void my_exit(); say(pat, arg1, arg2, arg3); my_exit(1); } /* Get a response from the user, somehow or other. */ void ask(pat,arg1,arg2,arg3) char *pat; long arg1,arg2,arg3; { int ttyfd; int r; bool tty2 = isatty(2); Sprintf(buf, pat, arg1, arg2, arg3); Fflush(stderr); write(2, buf, strlen(buf)); if (tty2) { /* might be redirected to a file */ r = read(2, buf, sizeof buf); } else if (isatty(1)) { /* this may be new file output */ Fflush(stdout); write(1, buf, strlen(buf)); r = read(1, buf, sizeof buf); } else if ((ttyfd = open("/dev/tty", 2)) >= 0 && isatty(ttyfd)) { /* might be deleted or unwriteable */ write(ttyfd, buf, strlen(buf)); r = read(ttyfd, buf, sizeof buf); Close(ttyfd); } else if (isatty(0)) { /* this is probably patch input */ Fflush(stdin); write(0, buf, strlen(buf)); r = read(0, buf, sizeof buf); } else { /* no terminal at all--default it */ buf[0] = '\n'; r = 1; } if (r <= 0) buf[0] = 0; else buf[r] = '\0'; if (!tty2) say1(buf); } #endif /* lint */ /* How to handle certain events when not in a critical region. */ void set_signals(reset) int reset; { void my_exit(); #ifndef lint #ifdef VOIDSIG static void (*hupval)(),(*intval)(); #else static int (*hupval)(),(*intval)(); #endif if (!reset) { hupval = signal(SIGHUP, SIG_IGN); if (hupval != SIG_IGN) #ifdef VOIDSIG hupval = my_exit; #else hupval = (int(*)())my_exit; #endif intval = signal(SIGINT, SIG_IGN); if (intval != SIG_IGN) #ifdef VOIDSIG intval = my_exit; #else intval = (int(*)())my_exit; #endif } Signal(SIGHUP, hupval); Signal(SIGINT, intval); #endif } /* How to handle certain events when in a critical region. */ void ignore_signals() { #ifndef lint Signal(SIGHUP, SIG_IGN); Signal(SIGINT, SIG_IGN); #endif } /* Make sure we'll have the directories to create a file. */ void makedirs(filename,striplast) Reg1 char *filename; bool striplast; { char tmpbuf[256]; Reg2 char *s = tmpbuf; char *dirv[20]; Reg3 int i; Reg4 int dirvp = 0; while (*filename) { if (*filename == '/') { filename++; dirv[dirvp++] = s; *s++ = '\0'; } else { *s++ = *filename++; } } *s = '\0'; dirv[dirvp] = s; if (striplast) dirvp--; if (dirvp < 0) return; strcpy(buf, "mkdir"); s = buf; for (i=0; i<=dirvp; i++) { while (*s) s++; *s++ = ' '; strcpy(s, tmpbuf); *dirv[i] = '/'; } system(buf); } /* Make filenames more reasonable. */ char * fetchname(at,strip_leading,assume_exists) char *at; int strip_leading; int assume_exists; { char *s; char *name; Reg1 char *t; char tmpbuf[200]; if (!at) return Nullch; s = savestr(at); for (t=s; isspace(*t); t++) ; name = t; #ifdef DEBUGGING if (debug & 128) say4("fetchname %s %d %d\n",name,strip_leading,assume_exists); #endif if (strnEQ(name, "/dev/null", 9)) /* so files can be created by diffing */ return Nullch; /* against /dev/null. */ for (; *t && !isspace(*t); t++) if (*t == '/') if (--strip_leading >= 0) name = t+1; *t = '\0'; if (name != s && *s != '/') { name[-1] = '\0'; if (stat(s, &filestat) && filestat.st_mode & S_IFDIR) { name[-1] = '/'; name=s; } } name = savestr(name); Sprintf(tmpbuf, "RCS/%s", name); free(s); if (stat(name, &filestat) < 0 && !assume_exists) { 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; } SHAR_EOF if test 7348 -ne "`wc -c util.c`" then echo shar: error transmitting util.c '(should have been 7348 characters)' fi echo shar: extracting util.h '(1972 characters)' cat << \SHAR_EOF > util.h /* $Header: util.h,v 2.0 86/09/17 15:40:06 lwall Exp $ * * $Log: util.h,v $ * Revision 2.0 86/09/17 15:40:06 lwall * Baseline for netwide release. * */ /* and for those machine that can't handle a variable argument list */ #ifdef CANVARARG #define say1 say #define say2 say #define say3 say #define say4 say #define ask1 ask #define ask2 ask #define ask3 ask #define ask4 ask #define fatal1 fatal #define fatal2 fatal #define fatal3 fatal #define fatal4 fatal #else /* hope they allow multi-line macro actual arguments */ #ifdef lint #define say1(a) say(a, 0, 0, 0) #define say2(a,b) say(a, (b)==(b), 0, 0) #define say3(a,b,c) say(a, (b)==(b), (c)==(c), 0) #define say4(a,b,c,d) say(a, (b)==(b), (c)==(c), (d)==(d)) #define ask1(a) ask(a, 0, 0, 0) #define ask2(a,b) ask(a, (b)==(b), 0, 0) #define ask3(a,b,c) ask(a, (b)==(b), (c)==(c), 0) #define ask4(a,b,c,d) ask(a, (b)==(b), (c)==(c), (d)==(d)) #define fatal1(a) fatal(a, 0, 0, 0) #define fatal2(a,b) fatal(a, (b)==(b), 0, 0) #define fatal3(a,b,c) fatal(a, (b)==(b), (c)==(c), 0) #define fatal4(a,b,c,d) fatal(a, (b)==(b), (c)==(c), (d)==(d)) #else /* lint */ /* if this doesn't work, try defining CANVARARG above */ #define say1(a) say(a, Nullch, Nullch, Nullch) #define say2(a,b) say(a, b, Nullch, Nullch) #define say3(a,b,c) say(a, b, c, Nullch) #define say4 say #define ask1(a) ask(a, Nullch, Nullch, Nullch) #define ask2(a,b) ask(a, b, Nullch, Nullch) #define ask3(a,b,c) ask(a, b, c, Nullch) #define ask4 ask #define fatal1(a) fatal(a, Nullch, Nullch, Nullch) #define fatal2(a,b) fatal(a, b, Nullch, Nullch) #define fatal3(a,b,c) fatal(a, b, c, Nullch) #define fatal4 fatal #endif /* lint */ /* if neither of the above work, join all multi-line macro calls. */ #endif EXT char serrbuf[BUFSIZ]; /* buffer for stderr */ char *fetchname(); int move_file(); void copy_file(); void say(); void fatal(); void ask(); char *savestr(); void set_signals(); void ignore_signals(); void makedirs(); SHAR_EOF if test 1972 -ne "`wc -c util.h`" then echo shar: error transmitting util.h '(should have been 1972 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 echo shar: creating directory UU mkdir UU chdir UU echo shar: extracting myread '(331 characters)' cat << \SHAR_EOF > myread case "$fastread" in yes) ans=''; echo " " ;; *) ans='!';; esac while expr "X$ans" : "X!" >/dev/null; do read ans case "$ans" in !) sh echo " " echo -n "$rp " ;; !*) set `expr "X$ans" : "X!\(.*\)$"` sh -c "$*" echo " " echo -n "$rp " ;; esac done rp='Your answer:' case "$ans" in '') ans="$dflt";; esac SHAR_EOF if test 331 -ne "`wc -c myread`" then echo shar: error transmitting myread '(should have been 331 characters)' fi echo shar: extracting 123456789abcdef '(3 characters)' cat << \SHAR_EOF > 123456789abcdef hi SHAR_EOF if test 3 -ne "`wc -c 123456789abcdef`" then echo shar: error transmitting 123456789abcdef '(should have been 3 characters)' fi echo shar: extracting filexp '(616 characters)' cat << \SHAR_EOF > filexp #!/bin/sh : expand filename case "$1" in ~/*|~) echo $1 | /bin/sed "s|~|${HOME-$LOGDIR}|" ;; ~*) if test -f /bin/csh; then /bin/csh -f -c "glob $1" echo "" else name=`/bin/expr x$1 : '..\([^/]*\)'` dir=`/bin/sed -n -e "/^${name}:/{s/^[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\).*"'$'"/\1/" -e p -e q -e '}' &2 exit 1 fi case "$1" in */*) echo $dir/`/bin/expr x$1 : '..[^/]*/\(.*\)'` ;; *) echo $dir ;; esac fi ;; *) echo $1 ;; esac SHAR_EOF if test 616 -ne "`wc -c filexp`" then echo shar: error transmitting filexp '(should have been 616 characters)' fi echo shar: done with directory UU chdir .. echo shar: extracting errata '(587 characters)' cat << \SHAR_EOF > errata cc -c -O patch.c cc -c -O pch.c cc -c -O inp.c cc -c -O util.c cc -c -O version.c cc patch.o pch.o inp.o util.o version.o -o patch export PATH || exit 1 mv /usr/local/bin/patch /usr/local/bin/patch.old mv: /usr/local/bin/patch: Cannot access: No such file or directory *** Error code 1 (ignored) if test `pwd` != /usr/local/bin; then cp patch /usr/local/bin; fi cd /usr/local/bin; chmod 755 patch if test `pwd` != /usr/man/mann; then \ for page in patch.man; do \ rm -f /usr/man/mann/../catn/`basename $page .man`.n; \ cp $page /usr/man/mann/`basename $page .man`.n; \ done; \ fi SHAR_EOF if test 587 -ne "`wc -c errata`" then echo shar: error transmitting errata '(should have been 587 characters)' fi echo shar: extracting Makefile.sparc '(2093 characters)' cat << \SHAR_EOF > Makefile.sparc # $Header: Makefile.SH,v 2.0.1.2 88/06/22 20:43:40 lwall Locked $ # # $Log: Makefile.SH,v $ # Revision 2.0.1.2 88/06/22 20:43:40 lwall # patch12: config.h now depends on config.h.SH # # Revision 2.0.1.1 88/06/03 15:00:48 lwall # patch10: upgraded to match some new metaconfig stuff # # Revision 2.0 86/09/17 15:36:15 lwall # Baseline for netwide release. # # Revision 1.2 86/09/08 14:07:42 lwall # Split up patch.c. # # Revision 1.1 86/08/01 20:18:35 lwall # Initial revision # CC = cc bin = /usr/local/bin mansrc = /usr/man/mann manext = n CFLAGS = -O LDFLAGS = SMALL = LARGE = public = patch private = manpages = patch.man util = Makefile c = patch.c pch.c inp.c version.c util.c obj = patch.o pch.o inp.o util.o version.o lintflags = -phbvxac addedbyconf = Makefile.old bsd config.h config.sh eunice loc pdp11 usg v7 # grrr SHELL = /bin/sh .c.o: $(CC) -c $(CFLAGS) $(LARGE) $*.c all: $(public) $(private) $(util) touch all patch: $(obj) $(CC) $(LDFLAGS) $(obj) $(libs) -o patch config.h: config.h.SH sh config.h.SH # won't work with csh install: patch export PATH || exit 1 - mv $(bin)/patch $(bin)/patch.old - if test `pwd` != $(bin); then cp $(public) $(bin); fi cd $(bin); chmod 755 $(public) - if test `pwd` != $(mansrc); then \ for page in $(manpages); do \ rm -f $(mansrc)/../cat$(manext)/`basename $$page .man`.$(manext); \ cp $$page $(mansrc)/`basename $$page .man`.$(manext); \ done; \ fi clean: rm -f *.o *.orig core realclean: rm -f patch *.o *.orig core $(addedbyconf) # The following lint has practically everything turned on. Unfortunately, # you have to wade through a lot of mumbo jumbo that can't be suppressed. # If the source file has a /*NOSTRICT*/ somewhere, ignore the lint message # for that spot. lint: lint $(lintflags) $(defs) $(c) > patch.fuzz patch.o: config.h common.h patch.c inp.h pch.h util.h version.h pch.o: config.h common.h pch.c pch.h util.h inp.o: config.h common.h inp.c inp.h util.h util.o: config.h common.h util.c util.h version.o: config.h common.h version.c version.h patchlevel.h util.h SHAR_EOF if test 2093 -ne "`wc -c Makefile.sparc`" then echo shar: error transmitting Makefile.sparc '(should have been 2093 characters)' fi echo shar: extracting config.h.sparc '(4218 characters)' cat << \SHAR_EOF > config.h.sparc /* config.h * This file was produced by running the config.h.SH script, which * gets its values from config.sh, which is generally produced by * running Configure. * * Feel free to modify any of this as the need arises. Note, however, * that running config.h.SH again will wipe out any changes you've made. * For a more permanent change edit config.sh and rerun config.h.SH. */ /* EUNICE: * This symbol, if defined, indicates that the program is being compiled * under the EUNICE package under VMS. The program will need to handle * things like files that don't go away the first time you unlink them, * due to version numbering. It will also need to compensate for lack * of a respectable link() command. */ /* VMS: * This symbol, if defined, indicates that the program is running under * VMS. It is currently only set in conjunction with the EUNICE symbol. */ #/*undef EUNICE /**/ #/*undef VMS /**/ /* CPPSTDIN: * This symbol contains the first part of the string which will invoke * the C preprocessor on the standard input and produce to standard * output. Typical value of "cc -E" or "/lib/cpp". */ /* CPPMINUS: * This symbol contains the second part of the string which will invoke * the C preprocessor on the standard input and produce to standard * output. This symbol will have the value "-" if CPPSTDIN needs a minus * to specify standard input, otherwise the value is "". */ #define CPPSTDIN "/usr/lib/cpp" #define CPPMINUS "" /* CHARSPRINTF: * This symbol is defined if this system declares "char *sprintf()" in * stdio.h. The trend seems to be to declare it as "int sprintf()". It * is up to the package author to declare sprintf correctly based on the * symbol. */ #define CHARSPRINTF /**/ /* FLEXFILENAMES: * This symbol, if defined, indicates that the system supports filenames * longer than 14 characters. */ #define FLEXFILENAMES /**/ /* index: * This preprocessor symbol is defined, along with rindex, if the system * uses the strchr and strrchr routines instead. */ /* rindex: * This preprocessor symbol is defined, along with index, if the system * uses the strchr and strrchr routines instead. */ #/*undef index strchr /* cultural */ #/*undef rindex strrchr /* differences? */ /* VOIDSIG: * This symbol is defined if this system declares "void (*signal())()" in * signal.h. The old way was to declare it as "int (*signal())()". It * is up to the package author to declare things correctly based on the * symbol. */ #define VOIDSIG /**/ /* Reg1: * This symbol, along with Reg2, Reg3, etc. is either the word "register" * or null, depending on whether the C compiler pays attention to this * many register declarations. The intent is that you don't have to * order your register declarations in the order of importance, so you * can freely declare register variables in sub-blocks of code and as * function parameters. Do not use Reg more than once per routine. */ #define Reg1 register /**/ #define Reg2 register /**/ #define Reg3 register /**/ #define Reg4 register /**/ #define Reg5 register /**/ #define Reg6 register /**/ #define Reg7 register /**/ #define Reg8 register /**/ #define Reg9 register /**/ #define Reg10 register /**/ #define Reg11 /**/ #define Reg12 /**/ #define Reg13 /**/ #define Reg14 /**/ #define Reg15 /**/ #define Reg16 /**/ /* VOIDFLAGS: * This symbol indicates how much support of the void type is given by this * compiler. What various bits mean: * * 1 = supports declaration of void * 2 = supports arrays of pointers to functions returning void * 4 = supports comparisons between pointers to void functions and * addresses of void functions * * The package designer should define VOIDUSED to indicate the requirements * of the package. This can be done either by #defining VOIDUSED before * including config.h, or by defining defvoidused in Myinit.U. If the * level of void support necessary is not present, defines void to int. */ #ifndef VOIDUSED #define VOIDUSED 7 #endif #define VOIDFLAGS 7 #if (VOIDFLAGS & VOIDUSED) != VOIDUSED #define void int /* is void to be avoided? */ #define M_VOID /* Xenix strikes again */ #endif SHAR_EOF if test 4218 -ne "`wc -c config.h.sparc`" then echo shar: error transmitting config.h.sparc '(should have been 4218 characters)' fi echo shar: extracting Makefile.sun3 '(2093 characters)' cat << \SHAR_EOF > Makefile.sun3 # $Header: Makefile.SH,v 2.0.1.2 88/06/22 20:43:40 lwall Locked $ # # $Log: Makefile.SH,v $ # Revision 2.0.1.2 88/06/22 20:43:40 lwall # patch12: config.h now depends on config.h.SH # # Revision 2.0.1.1 88/06/03 15:00:48 lwall # patch10: upgraded to match some new metaconfig stuff # # Revision 2.0 86/09/17 15:36:15 lwall # Baseline for netwide release. # # Revision 1.2 86/09/08 14:07:42 lwall # Split up patch.c. # # Revision 1.1 86/08/01 20:18:35 lwall # Initial revision # CC = cc bin = /usr/local/bin mansrc = /usr/man/manl manext = l CFLAGS = -O LDFLAGS = SMALL = LARGE = public = patch private = manpages = patch.man util = Makefile c = patch.c pch.c inp.c version.c util.c obj = patch.o pch.o inp.o util.o version.o lintflags = -phbvxac addedbyconf = Makefile.old bsd config.h config.sh eunice loc pdp11 usg v7 # grrr SHELL = /bin/sh .c.o: $(CC) -c $(CFLAGS) $(LARGE) $*.c all: $(public) $(private) $(util) touch all patch: $(obj) $(CC) $(LDFLAGS) $(obj) $(libs) -o patch config.h: config.h.SH sh config.h.SH # won't work with csh install: patch export PATH || exit 1 - mv $(bin)/patch $(bin)/patch.old - if test `pwd` != $(bin); then cp $(public) $(bin); fi cd $(bin); chmod 755 $(public) - if test `pwd` != $(mansrc); then \ for page in $(manpages); do \ rm -f $(mansrc)/../cat$(manext)/`basename $$page .man`.$(manext); \ cp $$page $(mansrc)/`basename $$page .man`.$(manext); \ done; \ fi clean: rm -f *.o *.orig core realclean: rm -f patch *.o *.orig core $(addedbyconf) # The following lint has practically everything turned on. Unfortunately, # you have to wade through a lot of mumbo jumbo that can't be suppressed. # If the source file has a /*NOSTRICT*/ somewhere, ignore the lint message # for that spot. lint: lint $(lintflags) $(defs) $(c) > patch.fuzz patch.o: config.h common.h patch.c inp.h pch.h util.h version.h pch.o: config.h common.h pch.c pch.h util.h inp.o: config.h common.h inp.c inp.h util.h util.o: config.h common.h util.c util.h version.o: config.h common.h version.c version.h patchlevel.h util.h SHAR_EOF if test 2093 -ne "`wc -c Makefile.sun3`" then echo shar: error transmitting Makefile.sun3 '(should have been 2093 characters)' fi echo shar: extracting Makefile.VAX '(2093 characters)' cat << \SHAR_EOF > Makefile.VAX # $Header: Makefile.SH,v 2.0.1.2 88/06/22 20:43:40 lwall Locked $ # # $Log: Makefile.SH,v $ # Revision 2.0.1.2 88/06/22 20:43:40 lwall # patch12: config.h now depends on config.h.SH # # Revision 2.0.1.1 88/06/03 15:00:48 lwall # patch10: upgraded to match some new metaconfig stuff # # Revision 2.0 86/09/17 15:36:15 lwall # Baseline for netwide release. # # Revision 1.2 86/09/08 14:07:42 lwall # Split up patch.c. # # Revision 1.1 86/08/01 20:18:35 lwall # Initial revision # CC = cc bin = /usr/local/bin mansrc = /usr/man/manl manext = l CFLAGS = -O LDFLAGS = SMALL = LARGE = public = patch private = manpages = patch.man util = Makefile c = patch.c pch.c inp.c version.c util.c obj = patch.o pch.o inp.o util.o version.o lintflags = -phbvxac addedbyconf = Makefile.old bsd config.h config.sh eunice loc pdp11 usg v7 # grrr SHELL = /bin/sh .c.o: $(CC) -c $(CFLAGS) $(LARGE) $*.c all: $(public) $(private) $(util) touch all patch: $(obj) $(CC) $(LDFLAGS) $(obj) $(libs) -o patch config.h: config.h.SH sh config.h.SH # won't work with csh install: patch export PATH || exit 1 - mv $(bin)/patch $(bin)/patch.old - if test `pwd` != $(bin); then cp $(public) $(bin); fi cd $(bin); chmod 755 $(public) - if test `pwd` != $(mansrc); then \ for page in $(manpages); do \ rm -f $(mansrc)/../cat$(manext)/`basename $$page .man`.$(manext); \ cp $$page $(mansrc)/`basename $$page .man`.$(manext); \ done; \ fi clean: rm -f *.o *.orig core realclean: rm -f patch *.o *.orig core $(addedbyconf) # The following lint has practically everything turned on. Unfortunately, # you have to wade through a lot of mumbo jumbo that can't be suppressed. # If the source file has a /*NOSTRICT*/ somewhere, ignore the lint message # for that spot. lint: lint $(lintflags) $(defs) $(c) > patch.fuzz patch.o: config.h common.h patch.c inp.h pch.h util.h version.h pch.o: config.h common.h pch.c pch.h util.h inp.o: config.h common.h inp.c inp.h util.h util.o: config.h common.h util.c util.h version.o: config.h common.h version.c version.h patchlevel.h util.h SHAR_EOF if test 2093 -ne "`wc -c Makefile.VAX`" then echo shar: error transmitting Makefile.VAX '(should have been 2093 characters)' fi echo shar: extracting config.h.VAX '(4186 characters)' cat << \SHAR_EOF > config.h.VAX /* config.h * This file was produced by running the config.h.SH script, which * gets its values from config.sh, which is generally produced by * running Configure. * * Feel free to modify any of this as the need arises. Note, however, * that running config.h.SH again will wipe out any changes you've made. * For a more permanent change edit config.sh and rerun config.h.SH. */ /* EUNICE: * This symbol, if defined, indicates that the program is being compiled * under the EUNICE package under VMS. The program will need to handle * things like files that don't go away the first time you unlink them, * due to version numbering. It will also need to compensate for lack * of a respectable link() command. */ /* VMS: * This symbol, if defined, indicates that the program is running under * VMS. It is currently only set in conjunction with the EUNICE symbol. */ #/*undef EUNICE /**/ #/*undef VMS /**/ /* CPPSTDIN: * This symbol contains the first part of the string which will invoke * the C preprocessor on the standard input and produce to standard * output. Typical value of "cc -E" or "/lib/cpp". */ /* CPPMINUS: * This symbol contains the second part of the string which will invoke * the C preprocessor on the standard input and produce to standard * output. This symbol will have the value "-" if CPPSTDIN needs a minus * to specify standard input, otherwise the value is "". */ #define CPPSTDIN "/usr/lib/cpp" #define CPPMINUS "" /* CHARSPRINTF: * This symbol is defined if this system declares "char *sprintf()" in * stdio.h. The trend seems to be to declare it as "int sprintf()". It * is up to the package author to declare sprintf correctly based on the * symbol. */ #define CHARSPRINTF /**/ /* FLEXFILENAMES: * This symbol, if defined, indicates that the system supports filenames * longer than 14 characters. */ #define FLEXFILENAMES /**/ /* index: * This preprocessor symbol is defined, along with rindex, if the system * uses the strchr and strrchr routines instead. */ /* rindex: * This preprocessor symbol is defined, along with index, if the system * uses the strchr and strrchr routines instead. */ #/*undef index strchr /* cultural */ #/*undef rindex strrchr /* differences? */ /* VOIDSIG: * This symbol is defined if this system declares "void (*signal())()" in * signal.h. The old way was to declare it as "int (*signal())()". It * is up to the package author to declare things correctly based on the * symbol. */ #define VOIDSIG /**/ /* Reg1: * This symbol, along with Reg2, Reg3, etc. is either the word "register" * or null, depending on whether the C compiler pays attention to this * many register declarations. The intent is that you don't have to * order your register declarations in the order of importance, so you * can freely declare register variables in sub-blocks of code and as * function parameters. Do not use Reg more than once per routine. */ #define Reg1 register /**/ #define Reg2 register /**/ #define Reg3 register /**/ #define Reg4 register /**/ #define Reg5 register /**/ #define Reg6 register /**/ #define Reg7 /**/ #define Reg8 /**/ #define Reg9 /**/ #define Reg10 /**/ #define Reg11 /**/ #define Reg12 /**/ #define Reg13 /**/ #define Reg14 /**/ #define Reg15 /**/ #define Reg16 /**/ /* VOIDFLAGS: * This symbol indicates how much support of the void type is given by this * compiler. What various bits mean: * * 1 = supports declaration of void * 2 = supports arrays of pointers to functions returning void * 4 = supports comparisons between pointers to void functions and * addresses of void functions * * The package designer should define VOIDUSED to indicate the requirements * of the package. This can be done either by #defining VOIDUSED before * including config.h, or by defining defvoidused in Myinit.U. If the * level of void support necessary is not present, defines void to int. */ #ifndef VOIDUSED #define VOIDUSED 7 #endif #define VOIDFLAGS 7 #if (VOIDFLAGS & VOIDUSED) != VOIDUSED #define void int /* is void to be avoided? */ #define M_VOID /* Xenix strikes again */ #endif SHAR_EOF if test 4186 -ne "`wc -c config.h.VAX`" then echo shar: error transmitting config.h.VAX '(should have been 4186 characters)' fi echo shar: done with directory patch chdir .. # End of shell archive exit 0