X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-check;h=534eb838a139ccf79bb60d9f9cc5d67baee356ae;hb=33a52d5af63ddec570a95942976fdbc65af0b0ac;hp=3cd3e74904c850017b6eea99efed44a780d42351;hpb=35b3102726215ed962b6302753bf9e8d6f75c78a;p=releases.git diff --git a/deblob-check b/deblob-check index 3cd3e74904c8..534eb838a139 100755 --- a/deblob-check +++ b/deblob-check @@ -1,6 +1,6 @@ #! /bin/sh -# deblob-check version 2008-03-29 $Rev$ +# deblob-check version 2008-08-04 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -26,7 +26,7 @@ # usage: deblob-check [-S] [-vv] [-s S] [-lDdBbCcXxPpFftVh?H] \ -# [*.tar* patch-* *.patch] +# [*.tar* patch-* *.patch *.diff] # Look for too-long undocumented sequences of numbers (generally blobs # in disguise) in source files. @@ -38,6 +38,9 @@ # Specifies the number of consecutive integral or # character constants that trigger the blob detector. +# --reverse-patch: Test the removed parts of a patch, rather than +# the added ones. + # The default sensitivity is 32 constants. # The sensitivity, if present, must be the first option. The action @@ -195,6 +198,11 @@ # Yeah, lots of stuff to do. Want to help? +# This makes it much faster, and mostly immune to non-ASCII stuff, as +# long as a 8-bit-safe sed is used. Probably a safe assumption these +# days. +case ${LANG+set} in set) LANG=C; export LANG;; esac + rm="rm -f" case $1 in --save-scripts | -S) @@ -245,6 +253,14 @@ case $1 in ;; esac +reverse_patch=false +case $1 in +--reverse-patch) + reverse_patch=: + shift; + ;; +esac + test_mode=false name=deblob-check @@ -468,37 +484,56 @@ fi set_except () { # Look for a multi-line definition starting with a line that matches # $1 (implicitly anchored to the beginning of the line), and ending - # at the first ';'. + # at the first ';'. $2 may optionally name the files in which this + # match is to be disregarded as a potential blob. initnc () { - addx "$1[^;]*;" + addx "$1[^;]*;\\?" $2 + } + + # Same as initnc, but require the terminating semicolon. + defsnc () { + addx "$1[^;]*;" $2 } # Look for a multi-line definition starting with a line that matches # $1 (implicitly anchored to the beginning of the line), and ending # at the first ';' that's not within comments. initc () { - addx "$1\\([^;]*\\|$comment\\)*;" + addx "$1\\([^;]*\\|$comment\\)*;\\?" $2 } # Accept as a non-blob an expression $1 that would have otherwise # triggered blob detection. The expression must end in a way that # would trigger the blob detection machinery. accept () { - addx "$1" + addx "$1" $2 } # Match up to the end a comment started in $1. ocomment () { - addx "$1\\([^*]\\|[*][*]*[^*/]\\|[*]*[\\n]\\)*[*]*[*][/]" + addx "$1\\([^*]\\|[*][*]*[^*/]\\|[*]*[\\n]\\)*[*]*[*][/]" $2 } # Match $1 followed by backslash-terminated lines and a last # non-backslash-terminated line. oprepline () { - addx "$1\\([^\\n]*\\\\[\\n]\\)*[^\\n\\\\]*$eol" + addx "$1\\([^\\n]*\\\\[\\n]\\)*[^\\n\\\\]*$eol" $2 + } + + # Match $1 in $2 as a blob. Not implemented yet. + blob () { + : } case /$1 in + /drivers/net/tg3.c) + # This file contains firmwares that we deblob with high + # sensitivity, so make sure the sequences of numbers that are not + # blobs are not deblobbed. FIXME: we should have patterns to + # recognize the blobs instead. + defsnc ' static const u32 test_pat\[4\]\[6\] =' drivers/net/tg3.c + accept " }\\(,\\? mem_tbl_5\\(70x\\|705\\|755\\|906\\)\\[\\] = {$sepx$blobpat*$sepx}\\)*;" drivers/net/tg3.c + ;; */*linux*.tar* | */*kernel*.tar* | */*linux-*.*.*/*) # false alarms, contain source # drivers/net/wan/wanxlfw.inc_shipped -> wanxlfw.S @@ -518,78 +553,45 @@ set_except () { initnc ' \.initial_reg_values = (struct ixp2000_reg_value \[\]) {' # drivers/net/ixp2000/ixp2400_rx.ucode -> ixp2400_rx.uc initnc ' \.initial_reg_values = (struct ixp2000_reg_value \[\]) {' - # crypto/tcrypt.h - initnc '[ ]*\.\(digest\|entries\|input\|key\|output\|plaintext\|result\)[ ]*= {' + initnc '[ ]*\.\(digest\|entries\|input\|key\|output\|plaintext\|result\)[ ]*= [{"]' crypto/tcrypt.h # checked: accept ' \$3 = {{pge = {{ste = {\(\([0-9][0-9a-fx{},\n ]*\|\(pge\|ste\) =\|\)[{},\n ]*\)*}'"$eol" - # arch/sparc/lib/divdi3.S - accept '__clz_tab:[\n] \.byte 0\(,[0-5]\)\+'"$sepx$blobpat*" - accept 'PITBL:[\n] \.long 0xC0040000,0xC90FDAA2,'"$blobpat*" - # arch/m68k/mac/mac_penguin.S - accept '\(0x[0F][0F],\)\+\\[\n]\(\(0x[0F][0F],\)\+\\[\n]\)*\(0x[0F][0F],\)\+0x00' - # arch/s390/kernel/head.S - accept '\.lowcase:[\n] \.byte 0x00\(,0x0[1-7]\)\+'"$sepx$blobpat*$eol" - # arch/s390/kernel/bitmap.S - accept '_zb_findmap:[\n] \.byte 0\(,[123],0\)\+,4'"$sepx$blobpat*$eol" - accept '_sb_findmap:[\n] \.byte 8\(,0,[123]\)\+,0'"$sepx$blobpat*$eol" - # arch/powerpc/lib/copyuser_64.S - accept ' \.section __ex_table,"a"'"$sepx$blobpat*" - # arch/powerpc/platforms/iseries/mf.c - accept ' memcpy(src, "\\x01\\x00\\x00\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00".*PROGxxxx' - # arch/ppc/platforms/ev64260.c - initnc 'static const unsigned int cpu_745x\[2\]\[16\] =' - # arch/alpha/lib/fls.c - initnc 'const unsigned char __flsm1_tab\[256\] =' - # drivers/input/misc/map_to_7segment.h - accept '#define _MAP_0_32_ASCII_SEG7_NON_PRINTABLE \\[\n] \(0,\)\+'"$eol" - # sound/oss/ad1848.c - initc ' static int init_values_b\[\] =' - # drivers/input/keyboard/atkbd.c - initnc 'static unsigned char atkbd_set2_keycode\[512\] =' - # drivers/usb/serial/keyspan_pda.S and - # drivers/usb/serial/xircom_pgs.S - accept 'desc_config1:[\n] \.byte 0x09, 0x02'"$sepx$blobpat*" - accept 'string_mfg:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_mfg_end:' - accept 'string_product:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_product_end:' - # drivers/media/video/pwc/pwc-nala.h - accept ' [/][*] \(SQCIF\|QSIF\|QCIF\|SIF\|CIF\|VGA\) [*][/][\n] {[\n] {'"$blobpat*" - # drivers/video/logo/*.ppm - accept 'P[13]\([\n]#[^\n]*\)*[\n]*\([\n][0-9 ]*\)\+' - # Documentation/specialix.txt - accept 'for i in [ 0-9\\\n]*[\n]do' - # Documentation/cpu-freq/cpufreq-stats.txt - accept ' : 3600000 3400000 3200000 3000000 2800000 ' - # Documentation/scsi/sym53c8xx_2.txt and - # Documentation/scsi/ncr53c8xx_2.txt - accept '00 00[\n]64 01[\n]8e 0b[\n][\n][0-9a-f \n]*fe fe' - accept '0f 00 08 08 64 00 0a 00 - id 0[\n]'"$blobpat*" - accept 'default nvram data:'"$sepx$blobpat*" - # Documentation/video4linux/sn9c102.txt - accept '0x0458 0x7025[\n]'"$blobpat*" - # Documentation/video4linux/et61x251.txt - accept '0x102c 0x6151[\n]'"$blobpat*" - # Documentation/video4linux/zc0301.txt - accept '0x041e 0x4017[\n]'"$blobpat*" - # Documentation/uml/UserModeLinux-HOWTO.txt - accept ' (gdb) x\/100x \$25[\n] 0x507d2434: 0x507d2434 0x00000000 0x08048000 0x080a4f8c'"$sepx$blobpat*" - # Documentation/isdn/README.inc - accept ' 1 0 0 0 0x308'"$sepx$blobpat*" - # Documentation/sched-stats.txt - accept 'domain 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36'"$eol" - # net/ipv4/ipvs/ip_vs_sync.c and - # net/sctp/sm_make_chunk.c and - # include/linux/sctp.h - accept '[ * ]*0 1 2 3[\n][ * ]*0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1' - # arch/x86/lguest/boot.c - accept ' \* 1 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0' - # drivers/net/fealnx.c - ocomment ' [/][*] Configure the PCI bus bursts and FIFO thresholds.' - # drivers/hwmon/via686a.c - ocomment '[/][*] the original LUT values from Alex van Kaam ' - # drivers/media/video/saa7114.c - initc 'static const unsigned char init\[\] = {[^;]*MODE=0 ;.*SAA_7114_NTSC_HSYNC_START' + accept '__clz_tab:[\n] \.byte 0\(,[0-5]\)\+'"$sepx$blobpat*" arch/sparc/lib/divdi3.S + accept 'PITBL:[\n] \.long 0xC0040000,0xC90FDAA2,'"$blobpat*" arch/sparc/lib/divdi3.S + accept '\(0x[0F][0F],\)\+\\[\n]\(\(0x[0F][0F],\)\+\\[\n]\)*\(0x[0F][0F],\)\+0x00' arch/m68k/mac/mac_penguin.S + accept '\.lowcase:[\n] \.byte 0x00\(,0x0[1-7]\)\+'"$sepx$blobpat*$eol" arch/s390/kernel/head.S + accept '_zb_findmap:[\n] \.byte 0\(,[123],0\)\+,4'"$sepx$blobpat*$eol" arch/s390/kernel/bitmap.S + accept '_sb_findmap:[\n] \.byte 8\(,0,[123]\)\+,0'"$sepx$blobpat*$eol" arch/s390/kernel/bitmap.S + accept ' \.section __ex_table,"a"'"$sepx$blobpat*" arch/powerpc/lib/copyuser_64.S + accept ' memcpy(src, "\\x01\\x00\\x00\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00".*PROGxxxx' arch/powerpc/platforms/iseries/mf.c + initnc 'static const unsigned int cpu_745x\[2\]\[16\] =' arch/ppc/platforms/ev64260.c + initnc 'const unsigned char __flsm1_tab\[256\] =' arch/alpha/lib/fls.c + accept '#define _MAP_0_32_ASCII_SEG7_NON_PRINTABLE \\[\n] \(0,\)\+'"$eol" drivers/input/misc/map_to_7segment.h + initc ' static int init_values_b\[\] =' sound/oss/ad1848.c + initnc 'static unsigned char atkbd_set2_keycode\[512\] =' drivers/input/keyboard/atkbd.c + accept 'desc_config1:[\n] \.byte 0x09, 0x02'"$sepx$blobpat*" 'drivers/usb/serial/\(keyspan_pda\|xircom_pgs\).S' + accept 'string_mfg:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_mfg_end:' 'drivers/usb/serial/\(keyspan_pda\|xircom_pgs\).S' + accept 'string_product:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_product_end:' 'drivers/usb/serial/\(keyspan_pda\|xircom_pgs\).S' + accept ' [/][*] \(SQCIF\|QSIF\|QCIF\|SIF\|CIF\|VGA\) [*][/][\n] {[\n] {'"$blobpat*" drivers/media/video/pwc/pwc-nala.h + accept 'P[13]\([\n]#[^\n]*\)*[\n]*\([\n][0-9 ]*\)\+' drivers/video/logo/*.ppm + accept 'for i in [ 0-9\\\n]*[\n]do' Documentation/specialix.txt + accept ' : 3600000 3400000 3200000 3000000 2800000 ' Documentation/cpu-freq/cpufreq-stats.txt + accept '00 00[\n]64 01[\n]8e 0b[\n][\n][0-9a-f \n]*fe fe' 'Documentation/scsi/\(sym\|ncr\)53c8xx_2.txt' + accept '0f 00 08 08 64 00 0a 00 - id 0[\n]'"$blobpat*" 'Documentation/scsi/\(sym\|ncr\)53c8xx_2.txt' + accept 'default nvram data:'"$sepx$blobpat*" 'Documentation/scsi/\(sym\|ncr\)53c8xx_2.txt' + accept '0x0458 0x7025[\n]'"$blobpat*" Documentation/video4linux/sn9c102.txt + accept '0x102c 0x6151[\n]'"$blobpat*" Documentation/video4linux/et61x251.txt + accept '0x041e 0x4017[\n]'"$blobpat*" Documentation/video4linux/zc0301.txt + accept ' (gdb) x\/100x \$25[\n] 0x507d2434: 0x507d2434 0x00000000 0x08048000 0x080a4f8c'"$sepx$blobpat*" Documentation/uml/UserModeLinux-HOWTO.txt + accept ' 1 0 0 0 0x308'"$sepx$blobpat*" Documentation/isdn/README.inc + accept 'domain 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36'"$eol" Documentation/sched-stats.txt + accept '[ * ]*0 1 2 3[\n][ * ]*0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1' 'net/ipv4/ipvs/ip_vs_sync.c|net/sctp/sm_make_chunk.c|include/linux/scpt.h' + accept ' \* 1 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0' arch/x86/lguest/boot.c + ocomment ' [/][*] Configure the PCI bus bursts and FIFO thresholds.' drivers/net/fealnx.c + ocomment '[/][*] the original LUT values from Alex van Kaam ' drivers/hwmon/via686a.c + initc 'static const unsigned char init\[\] = {[^;]*MODE=0 ;.*SAA_7114_NTSC_HSYNC_START' drivers/media/video/saa7114.c # in 2.6.23 only accept " Psize Ipps Tput Rxint Txint Done Ndone[\\n] ---------------------------------------------------------------\\([\\n][ 0-9]\\+\\)\\+$eol" @@ -598,6 +600,25 @@ set_except () { initnc ' static const unsigned char invert5\[\] =' initnc 'static unsigned char alpa2target\[\] =' initnc 'static unsigned char target2alpa\[\] =' + oprepline '#define INIT_THREAD [{0},]\+[ ]*\\[\n][ ]*[{0},]\+' + initnc 'static uint tas300\(1c\|4\)_\(master\|mixer\|treble\|bass\)_tab\[\]=' + initnc 'static short dmasound_[au]law2dma16\[\] =' + initnc 'static const unsigned short DACVolTable\[101\] =' + + # in 2.6.22 + initnc 'static const UQItype __clz_tab\[\] =' arch/arm26/lib/udivdi3.c + initnc ' static unsigned char scale\[101\] =' sound/oss/opl3sa2.c + initnc '} syncs\[\] =' drivers/scsi/53c7xx.c + initnc 'genoa_md:'"$sepx$blobpat*"'[\n] \.ascii "Genoa"' arch/i386/boot/video.S + + # in 2.6.21 + initnc 'Vendor ID Product ID[\n]-\+ -\+[\n]'"$blobpat*" Documentation/video4linux/sn9c102.txt + defsnc 'static short [au]law2dma16\[\]' arch/ppc/8xx_io/cs4218_tdm.c + defsnc ' static const char minimal_ascii_table\[\]' drivers/ieee1394/csr1212.c + defsnc 'static u16 key_map \[256\] =' drivers/media/dvb/ttpci/av7110_ir.c + defsnc 'static unsigned char gf64_inv\[64\] =' drivers/mtd/nand/cafe_ecc.c + defsnc 'static unsigned short err_pos_lut\[4096\] =' drivers/mtd/nand/cafe_ecc.c + defsnc 'static unsigned char testdata\[TESTDATA_LEN\] =' fs/jffs2/comprtest.c # new in 2.6.25 accept "%canned_values = ([\\n] \\([0-9]\\+ => \\[[ \\n]\\+\\(\\([0-9]\\+\\|'0x[0-9a-f]\\+'\\),[ \\n]*\\)*\\]\\(, \\|[\\n]\\)\\)*);" @@ -625,6 +646,23 @@ set_except () { initnc 'static const struct ath5k_ini_rf rfregs_5413\[\] =' initnc 'const u\(8\|16\|32\) b43_ntab_\(\(adjustpower\|estimatepowerlt\|gainctl\|iqlt\|loftlt\|noisevar1\|tdi[24]0a\)[01]\|channelest\|frame\(lookup\|struct\)\|mcs\|pilot\|tdtrn\|tmap\)\[\] =' + # new in 2.6.26 + initnc 'static u64 vec2off\[68\] =' arch/ia64/kvm/process.c + initnc " interrupts = <\\(0x\\)\\?3 \\(0x\\)\\?0 \\(0x\\)\\?0 $blobpat*>;" 'arch/powerpc/boot/dts/\(cm5200\|lite5200b\?\|kuroboxHG\|pcm030\|tqm5200\).dts' + initnc 'static const u32 crctab32\[\] =' arch/x86/boot/tools/build.c + initnc 'static struct mse2snr_tab \(vsb\|qam\(64\|256\)\)_mse2snr_tab\[\] =' drivers/media/dvb/frontends/au8522.c + initnc '} \(VSB\|QAM\)_mod_tab\[\] =' drivers/media/dvb/frontends/au8522.c + initnc '} itd1000_\(lpf_pga\|fre_values\)\[\] =' drivers/media/dvb/frontends/itd1000.c + initnc '} \(vsb\|qam\(64\|256\)\)_snr_tab\[\] =' drivers/media/dvb/frontends/s5h1411.c + initnc '} snr_tab\[\] =' drivers/media/dvb/frontends/tda10048.c + initnc 'static u32 reg_init_initialize\[\] =' drivers/media/video/saa717x.c + initnc 'static const u32 \(main\|gear\)_seedset\[BACKOFF_SEEDSET_ROWS\]\[BACKOFF_SEEDSET_LFSRS\] =' drivers/net/forcedeth.c + initnc 'static const struct ath5k_ini_mode rf24\(13\|25\)_ini_mode_end\[\] =' drivers/net/wireless/ath5k/initvals.c + initnc 'static const u16 wm9713_reg\[\] =' sound/soc/codecs/wm9713.c + + # This looks suspicious, but it pretty much just sets stuff to zero. + initnc 'static __u8 mode8420\(pro\|con\)\[\] =' drivers/media/video/cs8420.h + # quite suspicious # arch/parisc/kernel/perf_images.h initc 'static uint32_t onyx_images\[\]\[PCXU_IMAGE_SIZE\/sizeof(uint32_t)\] __read_mostly =' @@ -632,12 +670,12 @@ set_except () { # These are regarded as ok initnc 'static const u8 SN9C102_\(Y\|UV\)_QTABLE[01]\[64\] = {' - initnc ' static const u8 jpeg_header\[589\] = {' + initnc ' static \(const \)\?u8 jpeg_header\[589\] = {' media/video/sn9c102/sn9c102_core.c accept '[ ]\{1,2\}err = sn9c102_write_const_regs(cam\(,[ \n]\+{0x[0-9a-fA-F][0-9a-fA-F], 0x[0-9a-fA-F][0-9a-fA-F]}\)*);' # too lax? - initnc 'static yyconst flex_int\(16\|32\)_t yy_[^[]*\[[][0-9]*\] =' - initnc 'static const yytype_u\?int\(8\|16\) yy[^[]*\[\] =' + initnc 'static yyconst \(flex_int\(16\|32\)_t\|\(\(short \)\?int\)\) yy_[^[]*\[[][0-9]*\] =' + initnc 'static const \(yytype_u\?int\(8\|16\)\|\(unsigned \)\?\(short\( int\)\?\|char\)\) yy[^[]*\[\] =' initnc '\(\| \)static \(const \|\)\(unsigned \(short\|char\)\|struct SiS_[^ ]*\) SiS[^[]*\(\[[] [*0-9]*\]\)\+ *=' initnc 'static const a3d_Hrtf_t A3dHrirZeros = {' @@ -670,7 +708,7 @@ set_except () { initnc ' #define WakeupSeq {' initnc ' SetRate44100\[\] =' initnc ' const short period\[32\] =' - initnc ' const static int desc_idx_table\[\] =' + initnc ' \(const static\|static const\) int desc_idx_table\[\] =' initnc ' int prop_bcomm_irq\[3\*16\] =' initnc ' static char logSlopeTable\[128\] =' initnc ' static const int uc_\(dup\|word\)_table\[\]\[2\] =' @@ -696,7 +734,7 @@ set_except () { initnc ' static unsigned char CRCTable2\[\] =' initnc ' static unsigned char default_colors\[\] =' initnc ' static unsigned char iso_regs\[8\]\[4\] =' - initnc ' static unsigned char log_scale\[101\] =' + initnc ' static unsigned char log_scale\[101\] =' sound/oss/pss.c initnc ' static unsigned char msg\[\] =' initnc ' static unsigned char static_pad\[\] =' initnc ' static unsigned char table_alaw2ulaw\[\] =' @@ -740,9 +778,8 @@ set_except () { initnc 'static __const__ __u16 gx_coeff\[256\] =' initnc 'static __u8 init7121ntsc\[\] =' initnc 'static __u8 init7121pal\[\] =' - initnc 'static __u8 mode8420\(pro\|con\)\[\] =' initnc 'static byte capidtmf_leading_zeroes_table\[0x100\] =' - initnc 'static char channel_map_madi_ss\[HDSPM_MAX_CHANNELS\] =' + defsnc 'static char channel_map_madi_[sdq]s\[HDSPM_MAX_CHANNELS\] =' sound/pci/rme9652/hdspm.c initnc 'static char coefficients\[NM_TOTAL_COEFF_COUNT \* 4\] =' initnc 'static char ecc_syndrome_table\[\] =' initnc 'static char isdn_audio_alaw_to_ulaw\[\] =' @@ -811,7 +848,7 @@ set_except () { initnc 'static const u32 treble_table\[41\]\[5\] =' initnc 'static const u64 [CT][0-7]\[256\] =' initnc 'static const u64 sbox[1-4]\[256\] =' - initnc 'static const u64 sha512_K\[80\] =' + initnc 'static const u64 sha512_K\[80\] =' 'crypto/sha512\(_generic\)\?.c' initnc 'static const u8 Tr\[4\]\[8\] =' initnc 'static const u8 aes_sbox\[256\] =' initnc 'static const u8 calc_sb_tbl\[512\] =' @@ -841,13 +878,13 @@ set_except () { initnc 'static const unsigned char blue\[256\] =' initnc 'static const unsigned char chktab[hl]\[256\] =' initnc 'static const unsigned char comet_miireg2offset\[32\] =' - initnc 'static const unsigned char euc2sjisibm_g3upper_map\[\]\[2\] =' + initnc 'static \(const \)\?unsigned char euc2sjisibm_g3upper_map\[\]\[2\] =' initnc 'static const unsigned char green\[256\] =' initnc 'static const unsigned char hash_table_ops\[64\*4\] =' initnc 'static const unsigned char hid_keyboard\[256\] =' initnc 'static const unsigned char mts_direction\[256\/8\] =' initnc 'static const unsigned char red\[256\] =' - initnc 'static const unsigned char sjisibm2euc_map\[\]\[2\] =' + initnc 'static \(const \)\?unsigned char sjisibm2euc_map\[\]\[2\] =' initnc 'static const unsigned char vol_cvt_datt\[128\] =' initnc 'static const unsigned char wm_vol\[256\] =' initnc 'static const unsigned int MulIdx\[16\]\[16\] =' @@ -857,7 +894,7 @@ set_except () { initnc 'static const unsigned short wd7000_iobase\[\] =' initnc 'static const unsigned short x86_keycodes\[256\] =' initnc 'static const unsigned table\[\] =' - initnc 'static int MV300_reg_8bit\[256\] =' + initnc 'static int MV300_reg_8bit\[256\] \?=' drivers/video/atafb.c initnc 'static int fifo_map\[\]\[MAX_TX_FIFOS\] =' initnc 'static int initial_lfsr\[\] =' initnc 'static int log_tbl\[129\] =' @@ -868,7 +905,7 @@ set_except () { initnc 'static int reserve_list\[MAX_RES_ARGS\] =' initnc 'static int reverse6\[64\] =' initnc 'static short attack_time_tbl\[128\] =' - initnc 'static short beep_wform\[256\] =' + defsnc 'static short beep_wform\[256\] =' 'sound/ppc/beep.c|sound/oss/dmasound/dmasound_awacs.c|arch/ppc/8xx_io/cs4218_tdm.c' initnc 'static short decay_time_tbl\[128\] =' initnc 'static short isdn_audio_[ua]law_to_s16\[\] =' initnc 'static struct cipher_testvec anubis_cbc_dec_tv_template\[\] =' @@ -893,9 +930,9 @@ set_except () { initnc 'static struct cipher_testvec xtea_dec_tv_template\[\] =' initnc 'static struct cipher_testvec xtea_enc_tv_template\[\] =' initnc 'static struct comp_testvec deflate_decomp_tv_template\[\] =' - initnc 'static struct hash_testvec aes_xcbc128_tv_template\[\] =' + initnc 'static struct hash_testvec aes_xcbc128_tv_template\[\] =' crypto/tcrypt.h initnc 'static struct hash_testvec crc32c_tv_template\[\] =' - initnc 'static struct hash_testvec hmac_sha256_tv_template\[\] =' + initnc 'static struct hash_testvec hmac_sha256_tv_template\[\] =' crypto/tcrypt.h initnc 'static struct hash_testvec sha256_tv_template\[\] =' initnc 'static struct hash_testvec sha384_tv_template\[\] =' initnc 'static struct hash_testvec sha512_tv_template\[\] =' @@ -934,8 +971,10 @@ set_except () { initnc 'static u8 ini_time_value\[\]\[8\] =' initnc 'static u8 init_tab \[\] =' initnc 'static u8 mac_reader\[\] =' - initnc 'static u8 mt2131_config1\[\] =' - initnc 'static u8 mt2266_init2\[\] =' + initnc 'static u8 mt2131_config1\[\] =' drivers/media/dvb/frontends/mt2131.c # <= 2.6.25 + initnc 'static u8 mt2131_config1\[\] =' drivers/media/common/tuners/mt2131.c # >= 2.6.26 + initnc 'static u8 mt2266_init2\[\] =' drivers/media/dvb/frontends/mt2266.c # <= 2.6.25 + initnc 'static u8 mt2266_init2\[\] =' drivers/media/common/tuners/mt2266.c # >= 2.6.26 initnc 'static u8 opera1_inittab\[\] =' initnc 'static u8 rco_time_value\[\]\[8\] =' initnc 'static u8 saa7113_init_regs\[\] =' @@ -944,6 +983,9 @@ set_except () { initnc 'static u8 w1_crc8_table\[\] =' initnc 'static u_char const data_sizes_32\[32\] =' initnc 'static u_long ident_map\[32\] =' + initnc 'static u_short alt_map\[NR_KEYS\] =' + initnc 'static u_short altgr_map\[NR_KEYS\] =' + initnc 'static u_short ctrl_alt_map\[NR_KEYS\] =' initnc 'static u_short ctrl_map\[NR_KEYS\] *=' initnc 'static u_short shift_ctrl_map\[NR_KEYS\] =' initnc 'static u_short shift_map\[NR_KEYS\] *=' @@ -956,14 +998,13 @@ set_except () { initnc 'static uchar sbox\[8\]\[4\]\[16\] =' initnc 'static uint16_t crc_table\[256\] =' initnc 'static uint8_t lpfcAlpaArray\[\] =' - initnc 'static uint8_t seqprog\[\] =' + initnc 'static \(const \)\?uint8_t seqprog\[\] =' initnc 'static unsigned char V110_OffMatrix_9600\[\] =' initnc 'static unsigned char V110_OnMatrix_9600\[\] =' initnc 'static unsigned char a2232_65EC02code\[\] =' - initnc 'static unsigned char alaw_main\[\] =' initnc 'static unsigned char atkbd_set3_keycode\[512\] =' initnc 'static unsigned char atkbd_unxlate_table\[128\] =' - initnc 'static unsigned char banner_table\[\] =' + initnc 'static unsigned char banner_table\[\] =' arch/sh/boards/superh/microdev/led.c initnc 'static unsigned char bootlogo_bits\[\] =' initnc 'static unsigned char bus2core_8260\[\] =' initnc 'static unsigned char bus2core_8280\[\] =' @@ -973,11 +1014,7 @@ set_except () { initnc 'static unsigned char expressiontab\[128\] =' initnc 'static unsigned char header2\[\] =' initnc 'static unsigned char hidp_keycode\[256\] =' - initnc 'static unsigned char ima_adpcm_capture\[\] =' - initnc 'static unsigned char ima_adpcm_init\[\] =' - initnc 'static unsigned char ima_adpcm_playback\[\] =' initnc 'static unsigned char irq_xlate\[32\] =' - initnc 'static unsigned char mulaw_main\[\] =' initnc 'static unsigned char nkbd_keycode\[128\] =' initnc 'static unsigned char pan_volumes\[256\] =' initnc 'static unsigned char parm_block\[32\] =' @@ -1036,8 +1073,8 @@ set_except () { initnc 'u_short shift_ctrl_map\[NR_KEYS\] =' initnc 'u_short shift_map\[NR_KEYS\] *=' initnc 'uint patch_2[0f]00\[\] =' - initnc 'uint16_t e1000_igp_cable_length_table\[IGP01E1000_AGC_LENGTH_TABLE_SIZE\] =' - initnc 'uint16_t e1000_igp_2_cable_length_table\[IGP02E1000_AGC_LENGTH_TABLE_SIZE\] =' + initnc '\(uint16_t\|u16\) e1000_igp_cable_length_table\[IGP01E1000_AGC_LENGTH_TABLE_SIZE\] =' drivers/net/e1000/e1000_hw.c # u16 on 2.6.26 + initnc '\(uint16_t\|u16\) e1000_igp_2_cable_length_table\[IGP02E1000_AGC_LENGTH_TABLE_SIZE\] =' drivers/net/e1000/e1000_hw.c # u16 on 2.6.26 initnc '} euc2sjisibm_jisx0212_map\[\] =' initnc '} freq\[\] =' initnc '} hps_h_coeff_tab \[\] =' @@ -1046,13 +1083,117 @@ set_except () { initnc '} maven_gamma\[\] =' initnc '} mem_table\[\] =' initnc '} mxb_saa7740_init\[\] =' - initnc '} pll_table\[\] =' + initnc '} pll_table\[\] =' drivers/video/geode/lxfb_ops.c initnc '} qam256_snr_tab\[\] =' initnc '} qam64_snr_tab\[\] =' initnc '} sil_port\[\] =' initnc '} vsb_snr_tab\[\] =' initnc '} yss225_registers\[\] __devinitdata =' ;; + + */patch*2.6.27-rc* | */patch*2.6.26-git* | */git-linus.diff) + accept ' \.section __ex_table,"a"'"$sepx$blobpat*" 'arch/x86/lib/copy_user_\(nocache_\)\?64.S' + initnc 'static struct cipher_testvec des3_ede_cbc_\(enc\|dec\)_tv_template\[\] =' crypto/tcrypt.h + accept 'desc_config1:[\n] \.byte 0x09, 0x02'"$sepx$blobpat*" 'firmware/keyspan_pda/\(keyspan_pda\|xircom_pgs\).S' + accept 'string_mfg:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_mfg_end:' 'firmware/keyspan_pda/\(keyspan_pda\|xircom_pgs\).S' + accept 'string_product:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_product_end:' 'firmware/keyspan_pda/\(keyspan_pda\|xircom_pgs\).S' + accept ':03000000020200F9[\n]:040023000205\(9B0037\|5F0073\)[\n]\(:050030000000000000CB[\n]\|:0400430002010000B6[\n]\)*'"$sepx$blobpat*"'[\n]:\(0E06E0006400670065007400060334003700F4\|0606A000060334003700E0\)[\n]:00000001FF[\n]' 'firmware/keyspan_pda/\(keyspan_pda\|xircom_pgs\).HEX' + accept ':100000000C004000000000000000000000000000A4[\n]'"$sepx$blobpat*"'[\n]\/\* DSP56001 bootstrap code \*\/' firmware/dsp56k/bootstrap.bin.ihex + initnc 'static const u16 uda1380_reg\[UDA1380_CACHEREGNUM\] =' sound/soc/codecs/uda1380.c + initnc 'static const u16 wm8510_reg\[WM8510_CACHEREGNUM\] =' sound/soc/codecs/wm8510.c + + initnc 'static const unsigned short atkbd_set[23]_keycode\[512\] =' drivers/input/keyboard/atkbd.c + initnc 'static const unsigned short atkbd_unxlate_table\[128\] =' drivers/input/keyboard/atkbd.c + initnc 'static const unsigned char usb_kbd_keycode\[256\] =' drivers/hid/usbhid/usbkbd.c + initnc ' u8 buf, bufs\[\] =' drivers/media/dvb/dvb-usb/cxusb.c + initnc 'static struct dvb_pll_desc [^\n]* =' drivers/media/dvb/frontends/dvb-pll.c + initnc ' static int sysdiv_to_div_x_2\[\] =' arch/powerpc/platforms/512x/clock.c + initnc 'static const __u8 cx_inits_\(176\|320\|352\|640\)\[\] =' drivers/media/video/gspca/conex.c + initnc 'static const __u8 cx_jpeg_init\[\]\[8\] =' drivers/media/video/gspca/conex.c + initnc 'static const __u8 cxjpeg_\(640\|352\|320\|176\|qtable\)\[\]\[8\] =' drivers/media/video/gspca/conex.c + initnc 'static const unsigned char quant\[\]\[0x88\] =' drivers/media/video/gspca/jpeg.h + initnc 'static unsigned char huffman\[\] =' drivers/media/video/gspca/jpeg.h + initc ' static const struct ov_i2c_regvals norm_76[1247]0\[\] =' drivers/media/video/gspca/ov519.c + initnc 'static const __u8 pac207_sensor_init\[\]\[8\] =' drivers/media/video/gspca/pac207.c + initnc 'static const __u8 pac7311_jpeg_header\[\] =' drivers/media/video/gspca/pac7311.c + initnc 'static const __u8 init\(Hv7131\|Ov\(6650\|7630\(_3\)\?\)\|Pas\(106\|202\)\|Tas51[13]0\)\[\] =' drivers/media/video/gspca/sonixb.c + initnc 'static const __u8 \(hv7131\|ov\(6650\|7630\(_3\)\?\)\|pas\(106\|202\)\|tas51[13]0\)_sensor_init\(_com\)\?\[\]\[8\] =' drivers/media/video/gspca/sonixb.c + initnc 'static const __u8 \(hv7131r\|mi0360\|mo4000\|ov76\(60\|48\)\)_sensor_init\[\]\[8\] =' drivers/media/video/gspca/sonixj.c + initnc 'static const __u8 qtable4\[\] =' drivers/media/video/gspca/sonixj.c + initnc 'static const __u16 \(spca500_visual\|Clicksmart510\)_defaults\[\]\[3\] =' drivers/media/video/gspca/spca500.c + initnc 'static const __u8 qtable_\(creative_pccam\|kodak_ez200\|pocketdv\)\[2\]\[64\] =' drivers/media/video/gspca/spca500.c + initnc 'static const __u16 spca501c\?_\(\(3com\|arowana\|mysterious\)_\)\?\(init\|open\)_data\[\]\[3\] =' drivers/media/video/gspca/spca501.c + initnc 'static const __u16 spca505b\?_\(init\|open\)_data\(_ccd\)\?\[\]\[3\] =' drivers/media/video/gspca/spca505.c + initnc 'static const __u16 spca508\(cs110\|_sightcam2\?\|_vista\)\?_init_data\[\]\[3\] =' drivers/media/video/gspca/spca508.c + initnc 'static const __u16 spca561_init_data\[\]\[2\] =' drivers/media/video/gspca/spca561.c + initnc 'static const __u16 spca504\(_pccam600\|A_clicksmart420\)_\(init\|open\)_data\[\]\[3\] =' drivers/media/video/gspca/sunplus.c + initnc 'static const __u8 qtable_\(creative_pccam\|spca504_default\)\[2\]\[64\] =' drivers/media/video/gspca/sunplus.c + initnc 'static const __u8 \(effects\|gamma\)_table\[MAX_[A-Z]*\]\[[0-9]*\] =' drivers/media/video/gspca/t631.c + initnc 'static const __u8 tas5130a_sensor_init\[\]\[8\] =' drivers/media/video/gspca/t613.c + initnc ' static const __u8 \(read_indexs\|n\(set\)\?[0-9]*\|missing\)\[[0-9x]*\] =' drivers/media/video/gspca/t613.c + initc 'static const __u8 \(mi13[12]0\|po3130\|hv7131r\|ov76[67]0\)_\(\(soc\)\?initQ\?VGA_\(JPG\|data\)\|rundata\)\[\]\[4\] =' drivers/media/video/gspca/vc032x.c + initnc 'static const struct usb_action \(cs2102\|hdcs2020xx\|icm105axx\|ov7630c\|pb0330[3x]x\)_Initial\(Scale\)\?\[\] =' drivers/media/video/gspca/zc3xx.c + initnc 'static const u8 rtl8225z2_agc\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const u8 rtl8225z2_agc\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const u8 rtl8225z2_ofdm\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const u8 rtl8225z2_tx_power_cck\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const u8 rtl8225z2_tx_power_cck_ch14\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const __u16 t10_dif_crc_table\[256\] =' lib/crc-t10dif.c + initnc 'static crb_128M_2M_block_map_t crb_128M_2M_map\[64\] =' drivers/net/netxen/netxen_hw.c + initnc 'static const __u16 crc10_table\[256\] =' drivers/usb/serial/safe_serial.c + accept '[ ]*\( *0\)*\( *1\)*[\n][ ]*0 1 2 3 4 5 6 7 8 9 0 1 *2 3 4 5 6 7' 'Documentation/bt8xxgpio.txt' + initnc ' static int exp_lut\[256\] =' drivers/isdn/mISDN/dsp_audio.c + initnc 'static const u32 bf_pbox\[16 \+ 2\] =' drivers/isdn/mISDN/dsp_blowfish.c + initnc 'static const u32 bf_sbox\[256 \* 4\] =' drivers/isdn/mISDN/dsp_blowfish.c + initnc 'static u8 sample_\(german_\(all\|old\)\|american_\(dialtone\|ringing\|busy\)\|special[123]\|silence\)\[\] =' drivers/isdn/mISDN/dsp_tones.c + initnc 'struct pattern {[^}]*int tone;[^}]*} pattern\[\] =' drivers/isdn/mISDN/dsp_tones.c + initnc 'static u8 \([au]\|_4\)law_to_\([ua]law\|4bit\)\[256\] =' drivers/isdn/mISDN/l1oip_codec.c + initnc 'static unsigned char banner_table\[\] =' arch/sh/boards/mach-microdev/led.c + initnc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static const \(yytype_u\?int\(8\|16\)\|\(unsigned \)\?\(short\( int\)\?\|char\)\) yy[^[]*\[\] =[*][/];' scripts/genksyms/parse.c_shipped + + ;; + + */drm-modesetting-radeon.patch) + initnc 'static int atom_dst_to_src\[8\]\[4\] =' drivers/gpu/drm/radeon/atom.c + ;; + + */patch*2.6.26-rc*) + initnc 'static u64 vec2off\[68\] =' arch/ia64/kvm/process.c + initnc " interrupts = <\\(0x\\)\\?3 \\(0x\\)\\?0 \\(0x\\)\\?0 $blobpat*>;" 'arch/powerpc/boot/dts/\(cm5200\|lite5200b\?\|kuroboxHG\|pcm030\|tqm5200\).dts' + initnc 'static const u32 crctab32\[\] =' arch/x86/boot/tools/build.c + initnc 'static const u64 sha512_K\[80\] =' 'crypto/sha512\(_generic\)\?.c' + initnc 'static struct hash_testvec \(hmac_sha\(224\|256\)\|aes_xcbc128\|crc32c\)_tv_template\[\] =' crypto/tcrypt.h + initnc 'static struct cipher_testvec \(bf_cbc\|serpent\|tnepres\|aes\(_\(cbc\|ctr\|xts\)\)\?\|x\?tea\|anubis\(_cbc\)\?\|xeta\|camellia_cbc\|cts_mode\)_\(enc\|dec\)_tv_template\[\] =' crypto/tcrypt.h + initnc ' \.\(digest\|entries\|input\|key\|output\|plaintext\|result\)[ ]*= [{"]' crypto/tcrypt.h + initnc 'static const u8 speedtab \[3\]\[12\] =' drivers/ide/legacy/umc8672.c + initnc 'static u8 cvs_time_value\[\]\[XFER_UDMA_6 - XFER_UDMA_0 + 1\] =' drivers/ide/pci/sis5513.c + initnc 'static u8 \(ini\|act\|rco\)_time_value\[\]\[8\] =' drivers/ide/pci/sis5513.c + initnc 'static u8 mt2131_config1\[\] =' drivers/media/common/tuners/mt2131.c + initnc 'static u8 mt2266_init2\[\] =' drivers/media/common/tuners/mt2266.c + initnc 'u16 e1000_igp_cable_length_table\[IGP01E1000_AGC_LENGTH_TABLE_SIZE\] =' drivers/net/e1000/e1000_hw.c + initnc '\(uint16_t\|u16\) e1000_igp_2_cable_length_table\[IGP02E1000_AGC_LENGTH_TABLE_SIZE\] =' drivers/net/e1000/e1000_hw.c # u16 on 2.6.26 + oprepline '#define AR5K_RATES_11[ABG] ' drivers/net/wireless/ath5k/ath5k.h + oprepline ' { 1, MODULATION_XR, 1000, 2, 139, 1 }, ' drivers/net/wireless/ath5k/ath5k.h + initnc 'static const struct ath5k_ini_mode rf\(5413\|24\(13\|25\)\)_ini_mode_end\[\] =' drivers/net/wireless/ath5k/initvals.c + initnc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static const yytype_u\?int\(8\|16\) yy[^\n []*\[\] =[*][/];' scripts/kconfig/zconf.tab.c_shipped + initnc 'static const yytype_u\?int\(8\|16\) yy[^\n []*\[\] =' scripts/kconfig/zconf.tab.c_shipped + # new in 2.6.26 + initnc 'static struct mse2snr_tab \(vsb\|qam\(64\|256\)\)_mse2snr_tab\[\] =' drivers/media/dvb/frontends/au8522.c + initnc '} \(VSB\|QAM\)_mod_tab\[\] =' drivers/media/dvb/frontends/au8522.c + initnc '} itd1000_\(lpf_pga\|fre_values\)\[\] =' drivers/media/dvb/frontends/itd1000.c + initnc '} \(vsb\|qam\(64\|256\)\)_snr_tab\[\] =' drivers/media/dvb/frontends/s5h1411.c + initnc '} snr_tab\[\] =' drivers/media/dvb/frontends/tda10048.c + initnc ' static const u8 biphase_tbl\[\] =' drivers/media/video/cx18/cx18-av-vbi.c + initnc ' static const u8 mpeg_hdr_data\[\] =' drivers/media/video/cx18/cx18-vbi.c + initnc 'static u32 reg_init_initialize\[\] =' drivers/media/video/saa717x.c + initnc ' } vals\[\] =' drivers/media/video/saa717x.c + initnc 'static const u32 \(main\|gear\)_seedset\[BACKOFF_SEEDSET_ROWS\]\[BACKOFF_SEEDSET_LFSRS\] =' drivers/net/forcedeth.c + blob '^unsigned char \(IDX_ACTIVATE_\(READ\|WRITE\)\|\(CM\|ULP\)_\(ENABLE\|SETUP\)\|DM_ACT\) = '"$sepx$blobseq*$sepx;" drivers/s390/net/qeth_core_mpc.c # from drivers/s390/net/qeth_mpc.c in 2.6.25 + initnc '} pll_table\[\] =' drivers/video/geode/lxfb_ops.c + accept " { 0x00014284, 19688 },[\n] { 0x00011104, 20400 },[\n] { $blobpat* }," drivers/video/geode/lxfb_ops.c # won't be necessary in rc3 + initnc 'static const u16 wm9713_reg\[\] =' sound/soc/codecs/wm9713.c + accept 'P[13]\([\n]#[^\n]*\)*[\n]*\([\n][0-9 ]*\)\+' drivers/video/logo/logo_blackfin_clut224.ppm + ;; */patch*2.6.25-rc*) initnc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static uchar sbox\[8\]\[4\]\[16\] = {[*][/];' accept ' \$3 = {{pge = {{ste = {\(\([0-9][0-9a-fx{},\n ]*\|\(pge\|ste\) =\|\)[{},\n ]*\)*}'"$eol" @@ -1074,14 +1215,9 @@ set_except () { initnc 'static const struct arb_line write_arb_data\[NUM_WR_Q\]\[MAX_WR_ORD + 1\] =' initnc 'uint16_t e1000_igp_cable_length_table\[IGP01E1000_AGC_LENGTH_TABLE_SIZE\] =' initnc 'uint16_t e1000_igp_2_cable_length_table\[IGP02E1000_AGC_LENGTH_TABLE_SIZE\] =' - oprepline '#define AR5K_RATES_11A ' - oprepline '#define AR5K_RATES_11B ' - oprepline '#define AR5K_RATES_11G ' - oprepline '#define AR5K_RATES_TURBO ' - oprepline '#define AR5K_RATES_XR ' + oprepline '#define AR5K_RATES_11\([ABG]\|TURBO\|XR\) ' drivers/net/wireless/ath5k/ath5k.h initnc ' } blinkrates\[\] =' initnc 'static const struct ath5k_ini ar5212_ini\[\] =' - initnc 'static const struct ath5k_ini_mode rf5413_ini_mode_end\[\] =' initnc 'static const struct ath5k_ini_rf rfregs_5111\[\] =' initnc 'static const struct ath5k_ini_rf rfregs_5112\[\] =' initnc 'static const struct ath5k_ini_rf rfregs_5112a\[\] =' @@ -1152,9 +1288,14 @@ set_except () { oprepline '#define AR5K_RATES_TURBO ' oprepline '#define AR5K_RATES_XR ' initnc 'static const struct ath5k_ini ar5212_ini\[\] =' - initnc 'static const struct ath5k_ini_mode rf\(5413\|24\(13\|25\)\)_ini_mode_end\[\] =' + initnc 'static const struct ath5k_ini_mode rf\(5413\|24\(13\|25\)\)_ini_mode_end\[\] =' drivers/net/wireless/ath5k/initvals.c # ? initnc ' } blinkrates\[\] =' + initnc 'static const u8 rtl8225z2_agc\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const u8 rtl8225z2_ofdm\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const u8 rtl8225z2_tx_power_cck\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const u8 rtl8225z2_tx_power_cck_ch14\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + # git logs accept ' sudo modprobe ath5k debug=0x00000400[\n][ ]*[\n]\([ ]*Band[^\n]*[\n]\([ ]*\(\(channels\|rates\):\|[- 0-9a-f]*\|\[\.\.\. etc \]\)[\n]\)\+\)\+ 540 000c 0000 0000' oprepline ' { 1, MODULATION_XR, 3000, 1, 150, 3 },' @@ -1219,7 +1360,7 @@ defineblob='[ ]*#[ ]*define[ ]\+\([^\n]*\\[\n]\)*[^\n]*'"$blobseq"'\([^\n]*\\ # Regular expression that matches an assembly label followed by a blob # without any intervening label. -asmblob="[a-zA-Z_.][^\\n:;#/ ]*[ ]*:\\([^:]*\\|$asmcomment\\)*$blobseq\\([^:]*\\|$asmcomment\\)*" +asmblob="[a-zA-Z_.][^\\n:;#/ ]*[ ]*:\\([^:{}]*\\|$asmcomment\\)*$blobseq\\([^:]*\\|$asmcomment\\)*" # Regular expression that matches one or more blobs without # intervening line breaks. @@ -1763,8 +1904,10 @@ check () { falsepos_name=`mktemp -t deblob-check-falsepos-XXXXXX` tempfiles="$falsepos_name" - # Add $1 to falsepos. Its usage makes it implicitly anchored to - # the beginning of the line. + + # Add $1 to falsepos. Its usage makes it implicitly anchored to the + # beginning of the line. $2, if present, will some day narrow the + # falsepos matches to files that match it. addx () { if test -n "$1"; then echo -n "\\|$1" >> $falsepos_name @@ -1797,22 +1940,27 @@ check () { fi # Extract or otherwise munge... - case $input in + case /$input in *.tar*) cmd="tar -xf - --to-command='echo \";/*begin \$TAR_FILENAME*/;\"; cat; echo \";/**/;\"; echo \";/*end \$TAR_FILENAME*/;\"'" ;; - *patch* | *diff*) - sedpatch=' - /^[-]/d; - /^\(@@\|+++\) / { - i\ -;/**/;\ -;/*end patchlet */;\ + *.patch | */patch-* | *.diff) + if $reverse_patch; then + s=- r=+ + else + s=+ r=- + fi + sedpatch=" + /^[$r]/d; + /^\\(@@\\|$s$s$s\\) / { + i\\ +;/**/;\\ +;/*end patchlet */;\\ ;/*begin patchlet */; - s/^/;\/*/; - s/$/*\/;/; + s/^/;\\/*/; + s/\$/*\\/;/; }; - s/^[ +]//;' + s/^[ $s]//;" cmd='sed "$sedpatch"' ;; *)