X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-check;h=4d09cd6f63571bd407b417b31331ac6109a9c60c;hb=79560b3e45c27da11286b23430505e15ef01aaa3;hp=1ad6aa325a76b881a36473ce508cd4596a66c96f;hpb=3ea7429edd2fd82bbf77fac7a69d254b1a4d20f4;p=releases.git diff --git a/deblob-check b/deblob-check index 1ad6aa325a76..4d09cd6f6357 100755 --- a/deblob-check +++ b/deblob-check @@ -1,6 +1,6 @@ #! /bin/sh -# deblob-check version 2008-03-29 $Rev$ +# deblob-check version 2008-07-16.1 # 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. @@ -195,6 +195,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) @@ -468,37 +473,51 @@ 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 } # 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. + accept " static const u32 test_pat\[4\]\[6\] = {$sepx$blobpat*$sepx};" 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,8 +537,7 @@ 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: @@ -598,6 +616,10 @@ 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\] =' # new in 2.6.25 accept "%canned_values = ([\\n] \\([0-9]\\+ => \\[[ \\n]\\+\\(\\([0-9]\\+\\|'0x[0-9a-f]\\+'\\),[ \\n]*\\)*\\]\\(, \\|[\\n]\\)\\)*);" @@ -625,6 +647,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 =' @@ -636,8 +675,8 @@ set_except () { 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 +709,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\] =' @@ -740,7 +779,6 @@ 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\] =' initnc 'static char coefficients\[NM_TOTAL_COEFF_COUNT \* 4\] =' @@ -811,7 +849,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\] =' @@ -893,9 +931,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 +972,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\[\] =' @@ -959,11 +999,10 @@ 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\[\] =' @@ -976,11 +1015,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\] =' @@ -1039,8 +1074,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 \[\] =' @@ -1049,13 +1084,66 @@ 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' + 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 int sysdiv_to_div_x_2\[\] =' arch/powerpc/platforms/512x/clock.c + initnc 'static const __u16 t10_dif_crc_table\[256\] =' lib/crc-t10dif.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" @@ -1077,14 +1165,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\[\] =' @@ -1155,9 +1238,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 },' @@ -1222,7 +1310,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. @@ -1766,8 +1854,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 @@ -1804,7 +1894,7 @@ check () { *.tar*) cmd="tar -xf - --to-command='echo \";/*begin \$TAR_FILENAME*/;\"; cat; echo \";/**/;\"; echo \";/*end \$TAR_FILENAME*/;\"'" ;; - *patch* | *diff*) + *.patch | */patch-* | *.diff) sedpatch=' /^[-]/d; /^\(@@\|+++\) / {