X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-check;h=78136262d55591b2f750d72fb9d8ada6c28c4e95;hb=03b05fb6af7472b4df877f4a01eb91abd1c89e0d;hp=9333719cbe5e48bc1ddc56a68c1b1a793151f626;hpb=e0ed4646e6466e9dce15f06284e6eb2b53eb8e0f;p=releases.git diff --git a/deblob-check b/deblob-check index 9333719cbe5e..78136262d555 100755 --- a/deblob-check +++ b/deblob-check @@ -1,13 +1,13 @@ #! /bin/sh -# deblob-check version 2008-08-12 +# deblob-check version 2009-01-24 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva # Check http://www.fsfla.org/svn/fsfla/software/linux-libre for newer # versions. -# Copyright (C) 2008 Alexandre Oliva +# Copyright (C) 2008, 2009 Alexandre Oliva # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,10 +26,11 @@ # usage: deblob-check [-S] [-vv] [-s S] [-lDdBbCcXxPpFftVh?H] \ -# [*.tar* patch-* *.patch *.diff] +# *.tar* patch-* [-i prefix/] *.patch *.diff... -# Look for too-long undocumented sequences of numbers (generally blobs -# in disguise) in source files. +# Look for and report too-long undocumented sequences of numbers +# (generally blobs in disguise) in source files, as well as requests +# for loading non-Free firmware. # The order of command line flags is significant. Flags given out of # the order above won't be handled correctly, sorry. @@ -109,6 +110,27 @@ # -v --verbose: increase verbosity level, for internal debugging. May # be given at most twice. + +# file options: + +# --: Don't process command-line options any further. All following +# arguments are taken as filenames. + +# -i --implied-prefix --prefix: prepend the given prefix to each filename +# listed after this option, when configuring false positives +# and negatives. + +# *.tar*: iterate over all files in the named tar file. + +# *.patch, patch-*, *.diff: Look for blobs in the [ +] parts of the +# *patch, unless --reverse-patch is given, in which case +# the [ -] parts will be used. + +# Anything else is assumed to be a source file. + +# *.gz | *.bz2: Decompress automatically. + + # The exit status is only significant for the --list options: it will # be true if nothing was found, and false otherwise. @@ -261,6 +283,20 @@ case $1 in ;; esac +prefix=/ +case $1 in +--implied-prefix | --prefix| -i) + prefix=$2 + case $prefix in + /*/) ;; + */) prefix=/$prefix ;; + /*) prefix=$prefix/ ;; + *) prefix=/$prefix/ ;; + esac + shift 2 || exit 1 + ;; +esac + test_mode=false name=deblob-check @@ -386,9 +422,10 @@ q 1;" *) case $1 in - -- | -l | --list-blobs) shift;; + -l | --list-blobs) shift;; esac case $1 in + -- | --implied-prefix | --prefix | -i) ;; -*) if test ! -f "$1"; then echo "$name: \`$1' given too late or out of the proper sequence." >&2 @@ -409,7 +446,9 @@ q 1;" esac case $1 in ---) shift;; +--) + sawdashdash=t + shift;; esac if $test_mode; then @@ -520,20 +559,23 @@ set_except () { addx "$1\\([^\\n]*\\\\[\\n]\\)*[^\\n\\\\]*$eol" $2 } - # Match $1 in $2 as a blob. Not implemented yet. + # Match $1 in $2 as a blob. Not anchored. + blobna () { + badx "$1" $2 + } + + # Match $1 in $2 as a blob. The expectation is a match in the + # beginning of line, but we don't do anchoring of blob patterns ATM. blob () { - : + badx "$1" $2 } - 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 - ;; + blobna "request_firmware_nowait" + blobna "request_firmware" + blobna "request_ihex_firmware" + blobna "MODULE_FIRMWARE([^;]*)[^;]*;" + + case $prefix$1 in */*linux*.tar* | */*kernel*.tar* | */*linux-*.*.*/*) # false alarms, contain source # drivers/net/wan/wanxlfw.inc_shipped -> wanxlfw.S @@ -553,7 +595,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 \[\]) {' - initnc '[ ]*\.\(digest\|entries\|input\|key\|output\|plaintext\|result\)[ ]*= [{"]' crypto/tcrypt.h + # checked: @@ -568,7 +610,7 @@ set_except () { 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 + accept '#define _MAP_0_32_ASCII_SEG7_NON_PRINTABLE \\[\n] \(0,\)\+'"$eol" 'drivers/input/misc/map_to_7segment\.h\|include/linux/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' @@ -576,7 +618,7 @@ set_except () { 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 'for i in [ 0-9\\\n]*[\n]do' 'Documentation/specialix\.txt|Documentation/serial/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' @@ -587,16 +629,49 @@ set_except () { 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 '[ * ]*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/\(netfilter\|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 + defsnc 'static struct cipher_testvec \(aes\|anubis\|bf\|camellia\|cts_mode\|des3_ede\|cast6\|salsa20_stream\|serpent\|tf\|tnepres\|xeta\|x\?tea\)\(_\(cbc\|ctr\|xts\)\)\?_\(enc\|dec\)_tv_template\[\] =' 'crypto/\(tcrypt\|testmgr\).h' + defsnc 'static struct comp_testvec \(deflate\|lzo\)_\(de\)\?comp_tv_template\[\] =' 'crypto/\(tcrypt\|testmgr\).h' + defsnc 'static struct hash_testvec \(aes_xcbc128\|crc32c\|hmac_sha2\(24\|56\)\|\(sha\|wp\)\(256\|384\|512\)\)_tv_template\[\] =' 'crypto/\(tcrypt\|testmgr\).h' + # initnc '[ ]*\.\(digest\|entries\|input\|key\|output\|plaintext\|result\)[ \n ]*= [{"]' 'crypto/\(tcrypt\|testmgr\).h' + + defsnc 'static \(const \)\?RegInitializer initData\[\] __initdata =' 'drivers/ide/ali14xx\.c\|drivers/ide/legacy/ali14xx\.c' + defsnc 'static const u8 setup\[\] =' 'drivers/ide/delkin_cb\.c\|drivers/ide/pci/delkin_cb\.c' + defsnc 'static u8 cvs_time_value\[\]\[XFER_UDMA_6 - XFER_UDMA_0 + 1\] =' 'drivers/ide/sis5513\.c\|drivers/ide/pci/sis5513\.c' + defsnc 'static u8 \(act\|ini\|rco\)_time_value\[\]\[8\] =' 'drivers/ide/sis5513\.c\|drivers/ide/pci/sis5513\.c' + defsnc 'static const u8 speedtab \[3\]\[12\] =' 'drivers/ide/umc8672\.c\|drivers/ide/legacy/umc8672\.c' + defsnc 'static const s8 \(b43\(\|legacy\)\|bcm43xx\)_tssi2dbm_[bg]_table\[\] =' net/wireless/b43/phy.c + defsnc 'static const char zr360[56]0_dht\[0x1a4\] =' 'drivers/media/video/zr36060\.c\|drivers/media/video/zoran/zr36060\.c' + defsnc 'static const char zr360[56]0_dqt\[0x86\] =' 'drivers/media/video/zr36060\.c\|drivers/media/video/zoran/zr36060\.c' + defsnc 'static u8 tas3004_treble_table\[\] =' sound/aoa/codecs/tas-basstreble.h + + # 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 + + # end of generic checked expressions. + # version-specific checked bits start here + + # removed in 2.6.28 + defsnc 'static unsigned char irq_xlate\[32\] =' arch/sparc/kernel/sun4m_irq.c + defsnc 'static int logitech_expanded_keymap\[LOGITECH_EXPANDED_KEYMAP_SIZE\] =' drivers/hid/hid-input.c + initnc ' static const __u8 \(read_indexs\|n\(set\)\?[0-9]*\|missing\)\[[0-9x]*\] =' drivers/media/video/gspca/t613.c + defsnc 'static const u_char nand_ecc_precalc_table\[\] =' drivers/mtd/nand/nand_ecc.c + oprepline '#define AR5K_RATES_\(11[ABG]\|TURBO\|XR\) ' drivers/net/wireless/ath5k/ath5k.h + defsnc 'static const struct ath_hal ar5416hal =' drivers/net/wireless/ath9k/hw.c + defsnc 'const unsigned char INIT_2\[127\] =' drivers/video/omap/lcd_sx1.c + + # removed in 2.6.24 accept " Psize Ipps Tput Rxint Txint Done Ndone[\\n] ---------------------------------------------------------------\\([\\n][ 0-9]\\+\\)\\+$eol" initnc 'static u_short ataplain_map\[NR_KEYS\] __initdata =' - initnc 'static RegInitializer initData\[\] __initdata =' initnc ' static const unsigned char invert5\[\] =' initnc 'static unsigned char alpa2target\[\] =' initnc 'static unsigned char target2alpa\[\] =' @@ -605,13 +680,13 @@ set_except () { initnc 'static short dmasound_[au]law2dma16\[\] =' initnc 'static const unsigned short DACVolTable\[101\] =' - # in 2.6.22 + # removed in 2.6.23 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 + # removed in 2.6.22 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 @@ -620,7 +695,7 @@ set_except () { 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 + # added in 2.6.25 accept "%canned_values = ([\\n] \\([0-9]\\+ => \\[[ \\n]\\+\\(\\([0-9]\\+\\|'0x[0-9a-f]\\+'\\),[ \\n]*\\)*\\]\\(, \\|[\\n]\\)\\)*);" # from 2.6.25-rc* patches @@ -632,11 +707,6 @@ set_except () { initnc 'static u8 bnx2x_stats_len_arr\[BNX2X_NUM_STATS\] =' initnc 'static const struct arb_line read_arb_data\[NUM_RD_Q\]\[MAX_RD_ORD + 1\] =' initnc 'static const struct arb_line write_arb_data\[NUM_WR_Q\]\[MAX_WR_ORD + 1\] =' - 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 ' initnc ' } blinkrates\[\] =' initnc 'static const struct ath5k_ini ar5212_ini\[\] =' initnc 'static const struct ath5k_ini_mode rf5413_ini_mode_end\[\] =' @@ -660,6 +730,139 @@ set_except () { 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 + # new in 2.6.27 + accept ' \.section __ex_table,"a"'"$sepx$blobpat*" 'arch/x86/lib/copy_user_\(nocache_\)\?64.S' + 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' '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 + defsnc 'static const __u8 cx_inits_\(176\|320\|352\|640\)\[\] =' drivers/media/video/gspca/conex.c + defsnc 'static const __u8 cx_jpeg_init\[\]\[8\] =' drivers/media/video/gspca/conex.c + defsnc '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 \(start\|page[34]\)_73\(02\|11\)\[\] =' 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 + defsnc 'static \(const \)\?__u8 \(hv7131r\|mi0360\|mo4000\|ov76\([36]0\|48\)\|om6802\)_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]*\|[A-Z]*_MAX\)\]\[[0-9]*\] =' drivers/media/video/gspca/t631.c + initnc 'static const __u8 tas5130a_sensor_init\[\]\[8\] =' 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_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 + accept 'irq_prio_\([hdl]\|l[cd]\):'"$sepx$blobpat*" arch/arm/inlcude/asm/hardware/entry-macro-iomd.S + defsnc ' static const int desc_idx_table\[\] =' arch/arm/include/asm/hardware/iop3xx-adma.h + defsnc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static const __u8 \(hv7131r\|mi0360\|mo4000\|ov76\(60\|48\)\)_sensor_init\[\]\[8\] = {[*][/];' drivers/media/video/gspca/sonixj.c + defsnc 'static \(const \)\?u32 ar\(5416\|9280\)\(Modes\(_fast_clock\)\?\|Common\|BB_RfGain\|Bank6\(TPC\)\?\|Addac\)\(_91[06]0\(1_1\)\?\|_9280\(_2\)\?\)\?\[\]\[[236]\] =' drivers/net/wireless/ath9k/initvals.h + + # new in 2.6.28 + accept '\(static \)\?const char \(inv\)\?parity\[256\] = {[ \n01,]*};' 'Documentation/mtd/nand_ecc\.txt\|drivers/mtd/nand/nand_ecc\.c' + defsnc 'static const char \(bitsperbyte\|addressbits\)\[256\] =' drivers/mtd/nand/nand_ecc.c + defsnc 'static struct pinmux_cfg_reg pinmux_config_regs\[\] =' arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c + defsnc ' static const u8 e_keymap\[\] =' drivers/hid/hid-lg.c + defsnc ' *struct phy_reg phy_reg_init\(_[01]\)\?\[\] =' drivers/net/r8169.c + defsnc 'DEFINE_DEFAULT_PDR(0x0161, 256,' drivers/net/wireless/hermes_dld.c + defsnc 'static const int isink_cur\[\] =' drivers/regulator/wm8350-regulator.c + defsnc 'static const s16 \(converge_speed_ipb\?\|LAMBDA_table\[4\]\)\[101\] =' drivers/staging/go7007/go7007-fw.c + defsnc 'static const u32 addrinctab\[33\]\[2\] =' drivers/staging/go7007/go7007-fw.c + defsnc 'static const u8 \(default_intra_quant_table\|\(val\|bits\)_[ad]c_\(lu\|chro\)minance\)\[\] =' drivers/staging/go7007/go7007-fw.c + defsnc 'static const int zz\[64\] =' drivers/staging/go7007/go7007-fw.c + defsnc ' u16 pack\[\] =' drivers/staging/go7007/go7007-fw.c + defsnc 'static u8 \(initial\|channel\)_registers\[\] =' 'drivers/staging/go7007/wis-\(ov7640\|saa7113\|tw2804\).c' + defsnc 'u16 MTO_One_Exchange_Time_Tbl_[ls]\[MTO_MAX_FRAG_TH_LEVELS\]\[MTO_MAX_DATA_RATE_LEVELS\] =' drivers/staging/winbond/mto.c + defsnc 'u32 \(al2230_txvga_data\|w89rf242_txvga_old_mapping\)\[\]\[2\] =' drivers/staging/winbond/reg.c + defsnc 'static const UINT16 crc16tab\[256\] =' drivers/staging/wlan-ng/hfa384x.c + defsnc 'static const UINT32 wep_crc32_table\[256\] =' drivers/staging/wlan-ng/p80211wep.c + defsnc 'static const unsigned char wm_vol\[256\] =' sound/pci/ice1712/phase.c + defsnc 'static const u16 wm8900_reg_defaults\[WM8900_MAXREG\] =' sound/soc/wm8900.c + defsnc '} \(clk_sys_ratios\|bclk_divs\)\[\] =' sound/soc/wm8903.c + defsnc 'static u8 af9015_ir_table_\(leadtek\|twinhan\|a_link\|msi\|mygictv\|kworld\)\[\] =' drivers/media/dvb/dvb-usb/af9015.h + defsnc 'static struct snr_table \(qpsk\|qam\(16\|64\)\)_snr_table\[\] =' drivers/media/dvb/frontends/af9013_priv.h + defsnc 'static struct regdesc \(ofsm_init\|tuner_init_\(env77h11d5\|mt2060\(\|_2\)\|mxl500\(3d\|5\)\|qt1010\|mc44s803\|unknown\|tda18271\)\)\[\] =' drivers/media/dvb/frontends/af9013_priv.h + defsnc 'static u8 stv0288_earda_inittab\[\] =' drivers/media/dvb/frontends/eds1547.h + defsnc 'static u8 serit_sp1511lhb_inittab\[\] =' drivers/media/dvb/frontends/si21xx.c + defsnc 'static u8 stv0288_inittab\[\] =' drivers/media/dvb/frontends/stv0288.c + defsnc 'static const struct rf_channel rf_vals_b\[\] =' drivers/net/wireless/rt2x00/rt2400pci.c + defsnc 'static const u8 rtl8187b_reg_table\[\]\[3\] =' drivers/net/wireless/rtl8187_dev.c + + # request_firmware matches for 2.6.28 + accept 'D: Firmware loader (request_firmware)' CREDITS + accept 'FIRMWARE LOADER (request_firmware)' MAINTAINERS + accept ' - request_firmware() hotplug interface info.' Documentation/00-INDEX + accept 'This driver requires a patch for firmware_class[^\n]*[\n]request_firmware_nowait function\.' Documentation/dell_rbu.txt + accept ' request_firmware() hotplug interface:[\n] --*[\n].* - request_firmware_nowait() is also provided for convenience' Documentation/firmware_class/README + accept 'Still, there are kernel threads that may want.*For example, if request_.*_firmware() will fail regardless' Documentation/power/freezing-of-tasks.txt + accept 'Also, there may be some operations,.*calling request_firmware() from their .resume() routines' Documentation/power/notifiers.txt + accept 'There is an USB interface for downloading[/]uploading.*request_firmware interface\.' Documentation/video4linux/si470x.txt + accept '[\t]- move firmware loading to request_firmware()' drivers/staging/slicoss/README + accept 'config FIRMWARE_IN_KERNEL.*let firmware be loaded from userspace\.' drivers/base/Kconfig + accept 'static int[\n]_request_firmware(const struct firmware \*\*firmware_p, const char \*name,[^{]*[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c + accept 'static int[\n]request_firmware_work_func(void \*arg)[\n]{[\n]\([^}]\|[^\n}]}*\)*ret = _request_firmware(\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c + accept '[/][*][*][\n] [*] request_firmware: - send firmware [^{]*[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c + accept '[/][*][*][\n] [*] request_firmware_nowait: asynchronous version[^{]*[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c + accept 'EXPORT_SYMBOL(request_firmware\(_nowait\)\?);' drivers/base/firmware_class.c + accept 'int request_firmware\(_nowait\)\?([^;]*);' include/linux/firmware.h + accept 'static inline int request_firmware\(_nowait\)\?([^{]*)[\n]{[\n][\t]return -EINVAL;[\n]}[\n]' include/linux/firmware.h + accept 'static inline int \(maybe_\)\?reject_firmware\(_nowait\)\?([^{;]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' include/linux/firmware.h + + accept 'static inline int request_ihex_firmware\?([^{]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' include/linux/ihex.h + ocomment '[/][*] Optional firmware\([^\n]*[\n] [*]\)*[^\n]* MODULE_FIRMWARE()' + oprepline '#define MODULE_FIRMWARE(_firmware)' include/linux/module.h + accept ' [*] Sample code on how to use request_firmware() from drivers\.' samples/firmware_class/firmware_sample_driver.c + accept '[\t]\(retval\|error\) = request_firmware\(_nowait\)\?([^;]*"sample_driver_fw",[^;]*);' samples/firmware_class/firmware_sample_driver.c + ocomment ' [/][*] request_firmware blocks until userspace finished' samples/firmware_class/firmware_sample_driver.c + accept ' [ \t]*" request_firmware_nowait failed' samples/firmware_class/firmware_sample_driver.c + + # Hunting down non-Free firmware-loading code and instructions. + + blob 'atmsar11\.fw' drivers/atm/ambassador.c + + blob ' sprintf([^;]*fore200[^;]*FW_EXT[^;]*);' drivers/atm/fore200e.c + blobna '\(pc\|sb\)a200e\(_ecd\)\?\.bin[12]?' drivers/atm/fore200e.c + blobna 'The supplied firmware images.*fore.*Rebuild and reinstall[^.]*\.' Documentation/networking/fore200e.txt + + blobna 'intelliport2\.bin' drivers/char/ip2/ip2main.c + + blobna '\(agere\|prism\)_\(sta\|ap\)_fw\.bin' drivers/net/wireless/orinoco.c + blobna 'symbol_sp24t_\(prim\|sec\)_fw' drivers/net/wireless/orinoco.c + + # This looks suspicious, but it pretty much just sets stuff to zero. initnc 'static __u8 mode8420\(pro\|con\)\[\] =' drivers/media/video/cs8420.h @@ -674,8 +877,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\|\(\(short \)\?int\)\) yy_[^[]*\[[][0-9]*\] =' - initnc 'static const \(yytype_u\?int\(8\|16\)\|\(unsigned \)\?\(short\( int\)\?\|char\)\) yy[^[]*\[\] =' + defsnc 'static yyconst \(flex_int\(16\|32\)_t\|\(\(short \)\?int\)\) yy_[^[]*\[[][0-9]*\] =' + defsnc '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 = {' @@ -770,7 +973,6 @@ set_except () { initnc 'const u16 crc_itu_t_table\[256\] =' initnc 'const u8 byte_rev_table\[256\] =' initnc 'const u8 crc7_syndrome_table\[256\] =' - initnc 'const unsigned char INIT_2\[127\] =' initnc 'int snd_sf_vol_table\[128\] =' initnc 'static u_char irq_to_siubit\[\] =' initnc 'static u_char irq_to_siureg\[\] =' @@ -786,16 +988,12 @@ set_except () { initnc 'static char isdn_audio_ulaw_to_alaw\[\] =' initnc 'static char mix_cvt\[101\] =' initnc 'static char opl3_volume_table\[128\] =' - initnc 'static const RegInitializer initData\[\] __initdata =' initnc 'static const __u16 crc10_table\[256\] =' initnc 'static const __u32 crc_c\[256\] =' - initnc 'static const char zr360[56]0_dht\[0x1a4\] =' - initnc 'static const char zr360[56]0_dqt\[0x86\] =' initnc 'static const fixp_t cos_table\[46\] =' initnc 'static const int init_seq\[\] =' initnc 'static const int mobile_vid_table\[32\] =' initnc 'static const s16 snd_opl4_pitch_map\[0x600\] =' - initnc 'static const s8 \(b43\(\|legacy\)\|bcm43xx\)_tssi2dbm_[bg]_table\[\] =' initnc 'static const s8 budtab\[256\] =' initnc 'static const struct aper_size_info_32 u3_sizes\[8\] =' initnc 'static const struct aper_size_info_8 via_generic_sizes\[9\] =' @@ -864,11 +1062,8 @@ set_except () { initnc 'static const u8 rtl8225_tx_power_cck\[\] =' initnc 'static const u8 rtl8225_tx_power_cck_ch14\[\] =' initnc 'static const u8 rtl8225z2_tx_gain_cck_ofdm\[\] =' - initnc 'static const u8 setup\[\] =' - initnc 'static const u8 speedtab \[3\]\[12\] =' initnc 'static const u_char irq_to_siubit\[\] =' initnc 'static const u_char irq_to_siureg\[\] =' - initnc 'static const u_char nand_ecc_precalc_table\[\] =' initnc 'static const uint8_t parity\[256\] =' initnc 'static const unsigned char \(UV\|Y\)_QUANTABLE\[64\] =' initnc 'static const unsigned char __initdata mV_mobilevrm\[32\] =' @@ -886,7 +1081,6 @@ set_except () { initnc 'static const unsigned char red\[256\] =' 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\] =' initnc 'static const unsigned int crctab32\[\] =' initnc 'static const unsigned short crc_flex_table\[\] =' @@ -898,9 +1092,8 @@ set_except () { initnc 'static int fifo_map\[\]\[MAX_TX_FIFOS\] =' initnc 'static int initial_lfsr\[\] =' initnc 'static int log_tbl\[129\] =' - initnc 'static int logitech_expanded_keymap\[LOGITECH_EXPANDED_KEYMAP_SIZE\] =' - initnc 'static int miro_fmtuner\[\] =' - initnc 'static int miro_tunermap\[\] =' + initnc 'static int miro_fmtuner\[\] =' drivers/media/video/bt8xx/bt-cards.c + initnc 'static int miro_tunermap\[\] =' drivers/media/video/bt8xx/bt-cards.c initnc 'static int register_size\[\] =' initnc 'static int reserve_list\[MAX_RES_ARGS\] =' initnc 'static int reverse6\[64\] =' @@ -908,37 +1101,6 @@ set_except () { 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\[\] =' - initnc 'static struct cipher_testvec anubis_cbc_enc_tv_template\[\] =' - initnc 'static struct cipher_testvec anubis_dec_tv_template\[\] =' - initnc 'static struct cipher_testvec anubis_enc_tv_template\[\] =' - initnc 'static struct cipher_testvec camellia_cbc_dec_tv_template\[\] =' - initnc 'static struct cipher_testvec camellia_cbc_enc_tv_template\[\] =' - initnc 'static struct cipher_testvec camellia_dec_tv_template\[\] =' - initnc 'static struct cipher_testvec camellia_enc_tv_template\[\] =' - initnc 'static struct cipher_testvec cast6_dec_tv_template\[\] =' - initnc 'static struct cipher_testvec cast6_enc_tv_template\[\] =' - initnc 'static struct cipher_testvec serpent_dec_tv_template\[\] =' - initnc 'static struct cipher_testvec serpent_enc_tv_template\[\] =' - initnc 'static struct cipher_testvec tea_dec_tv_template\[\] =' - initnc 'static struct cipher_testvec tea_enc_tv_template\[\] =' - initnc 'static struct cipher_testvec tf_dec_tv_template\[\] =' - initnc 'static struct cipher_testvec tf_enc_tv_template\[\] =' - initnc 'static struct cipher_testvec tnepres_dec_tv_template\[\] =' - initnc 'static struct cipher_testvec xeta_dec_tv_template\[\] =' - initnc 'static struct cipher_testvec xeta_enc_tv_template\[\] =' - 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\[\] =' crypto/tcrypt.h - initnc 'static struct hash_testvec crc32c_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\[\] =' - initnc 'static struct hash_testvec wp256_tv_template\[\] =' - initnc 'static struct hash_testvec wp384_tv_template\[\] =' - initnc 'static struct hash_testvec wp512_tv_template\[\] =' initnc 'static struct iwl\(3945\)\?_tx_power power_gain_table\[2\]\[IWL_MAX_GAIN_ENTRIES\] =' initnc 'static struct ovcamchip_regvals regvals_init_\(76be\|7[16]20\|7x10\)\[\] =' initnc 'static struct regval_list ov7670_default_regs\[\] =' @@ -961,25 +1123,20 @@ set_except () { initnc 'static u32 adwDecim8\[33\] =' initnc 'static u32 h_prescale\[64\] =' initnc 'static u32 v_gain\[64\] =' - initnc 'static u8 cvs_time_value\[\]\[XFER_UDMA_6 - XFER_UDMA_0 + 1\] =' initnc 'static u8 SRAM_Table\[\]\[60\] =' - initnc 'static u8 act_time_value\[\]\[8\] =' initnc 'static u8 alps_tdee4_stv0297_inittab\[\] =' initnc 'static u8 bnx2_5706_stats_len_arr\[BNX2_NUM_STATS\] =' initnc 'static u8 bnx2_5708_stats_len_arr\[BNX2_NUM_STATS\] =' initnc 'static u8 flit_desc_map\[\] =' - initnc 'static u8 ini_time_value\[\]\[8\] =' - initnc 'static u8 init_tab \[\] =' + defsnc 'static u8 init_tab \?\[\] =' 'drivers/media/dvb/frontends/cx2270\(0\|2\)\.c' initnc 'static u8 mac_reader\[\] =' 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\[\] =' initnc 'static u8 samsung_tbmu24112_inittab\[\] =' - initnc 'static u8 tas3004_treble_table\[\] =' initnc 'static u8 w1_crc8_table\[\] =' initnc 'static u_char const data_sizes_32\[32\] =' initnc 'static u_long ident_map\[32\] =' @@ -1014,7 +1171,6 @@ set_except () { initnc 'static unsigned char expressiontab\[128\] =' initnc 'static unsigned char header2\[\] =' initnc 'static unsigned char hidp_keycode\[256\] =' - initnc 'static unsigned char irq_xlate\[32\] =' initnc 'static unsigned char nkbd_keycode\[128\] =' initnc 'static unsigned char pan_volumes\[256\] =' initnc 'static unsigned char parm_block\[32\] =' @@ -1089,6 +1245,80 @@ set_except () { initnc '} sil_port\[\] =' initnc '} vsb_snr_tab\[\] =' initnc '} yss225_registers\[\] __devinitdata =' + + ;; + + */patch*2.6.28-rc*) + # new in 2.6.28 + accept '\(static \)\?const char \(inv\)\?parity\[256\] = {[ \n01,]*};' 'Documentation/mtd/nand_ecc\.txt\|drivers/mtd/nand/nand_ecc\.c' + defsnc 'static const char \(bitsperbyte\|addressbits\)\[256\] =' drivers/mtd/nand/nand_ecc.c + defsnc 'static struct pinmux_cfg_reg pinmux_config_regs\[\] =' arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c + defsnc ' static const u8 e_keymap\[\] =' drivers/hid/hid-lg.c + defsnc ' *struct phy_reg phy_reg_init_[01]\[\] =' drivers/net/r8169.c + defsnc 'DEFINE_DEFAULT_PDR(0x0161, 256,' drivers/net/wireless/hermes_dld.c + defsnc 'static const int isink_cur\[\] =' drivers/regulator/wm8350-regulator.c + defsnc 'static const s16 \(converge_speed_ipb\?\|LAMBDA_table\[4\]\)\[101\] =' drivers/staging/go7007/go7007-fw.c + defsnc 'static const u32 addrinctab\[33\]\[2\] =' drivers/staging/go7007/go7007-fw.c + defsnc 'static const u8 \(default_intra_quant_table\|\(val\|bits\)_[ad]c_\(lu\|chro\)minance\)\[\] =' drivers/staging/go7007/go7007-fw.c + defsnc 'static const int zz\[64\] =' drivers/staging/go7007/go7007-fw.c + defsnc ' u16 pack\[\] =' drivers/staging/go7007/go7007-fw.c + defsnc 'static u8 \(initial\|channel\)_registers\[\] =' 'drivers/staging/go7007/wis-\(ov7640\|saa7113\|tw2804\).c' + defsnc 'u16 MTO_One_Exchange_Time_Tbl_[ls]\[MTO_MAX_FRAG_TH_LEVELS\]\[MTO_MAX_DATA_RATE_LEVELS\] =' drivers/staging/winbond/mto.c + defsnc 'u32 \(al2230_txvga_data\|w89rf242_txvga_old_mapping\)\[\]\[2\] =' drivers/staging/winbond/reg.c + defsnc 'static const UINT16 crc16tab\[256\] =' drivers/staging/wlan-ng/hfa384x.c + defsnc 'static const UINT32 wep_crc32_table\[256\] =' drivers/staging/wlan-ng/p80211wep.c + defsnc 'static const unsigned char wm_vol\[256\] =' sound/pci/ice1712/phase.c + defsnc 'static const u16 wm8900_reg_defaults\[WM8900_MAXREG\] =' sound/soc/wm8900.c + defsnc '} \(clk_sys_ratios\|bclk_divs\)\[\] =' sound/soc/wm8903.c + defsnc 'static u8 af9015_ir_table_\(leadtek\|twinhan\|a_link\|msi\|mygictv\|kworld\)\[\] =' drivers/media/dvb/dvb-usb/af9015.h + defsnc 'static struct snr_table \(qpsk\|qam\(16\|64\)\)_snr_table\[\] =' drivers/media/dvb/frontends/af9013_priv.h + defsnc 'static struct regdesc \(ofsm_init\|tuner_init_\(env77h11d5\|mt2060\(\|_2\)\|mxl500\(3d\|5\)\|qt1010\|mc44s803\|unknown\|tda18271\)\)\[\] =' drivers/media/dvb/frontends/af9013_priv.h + defsnc 'static u8 stv0288_earda_inittab\[\] =' drivers/media/dvb/frontends/eds1547.h + defsnc 'static u8 serit_sp1511lhb_inittab\[\] =' drivers/media/dvb/frontends/si21xx.c + defsnc 'static u8 stv0288_inittab\[\] =' drivers/media/dvb/frontends/stv0288.c + + # Suspicious, deblob for now, until contributor responds. + # defsnc ' static u16 \(sr\|twinax\)_edc\[\] =' drivers/net/cxgb3/ael1002.cn + # Non-Free license in entire file. + blob 'static unsigned char xilinx_firm\(\|_4610\)\[\] = {'"$sepx$blobseq*$sepx"'};' 'drivers/staging/me4000/me4\(00\|61\)0_firmware\.h' # CONFIG_ME4000 + + # Deblobbing needed. + blob 'static u8 \(Mojave\|Oasis\)UCode\[2\]\[65536\] ='"$sepx$blobseq*$sepx"';' 'drivers/staging/slicoss/\(gb\|oasis\(dbg\)\?\)download\.h' # CONFIG_SLICOSS + blob 'static u8 \(GB\|Oasis\)RcvUCode\[2560\] ='"$sepx$blobseq*$sepx"';' 'drivers/staging/slicoss/\(gb\|oasis\)rcvucode\.h' # CONFIG_SLICOSS + blob 'static unsigned char SaharaUCode\[2\]\[57972\] ='"$sepx$blobseq*$sepx"';' drivers/staging/sxg/saharadbgdownload.h # CONFIG_SXG + blob 'static PHY_UCODE PhyUcode\[\] =[^;]*;' drivers/staging/sxg/sxgphycode.h # CONFIG_SXG + + # ok from earlier releases + accept 'for i in [ 0-9\\\n]*[\n]do' 'Documentation/specialix.txt|Documentation/serial/specialix.txt' + defsnc 'static yyconst flex_int\(16\|32\)_t yy_[^[]*\[[0-9]*\] =' '.*\.lex\.c_shipped' + defsnc 'static const yytype_u\?int\(8\|16\) yy[^\n []*\[\] =' '.*\.lex\.c_shipped' + initnc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static const yytype_u\?int\(8\|16\) yy[^\n []*\[\] =[*][/];' '.*\.tab\.c_shipped' + defsnc 'static struct cipher_testvec \(aes\|anubis\|bf\|camellia\|cts_mode\|des3_ede\|cast6\|salsa20_stream\|serpent\|tf\|tnepres\|xeta\|x\?tea\)\(_\(cbc\|ctr\|xts\)\)\?_\(enc\|dec\)_tv_template\[\] =' 'crypto/\(tcrypt\|testmgr\).h' + defsnc 'static struct comp_testvec \(deflate\|lzo\)_\(de\)\?comp_tv_template\[\] =' 'crypto/\(tcrypt\|testmgr\).h' + defsnc 'static struct hash_testvec \(aes_xcbc128\|crc32c\|hmac_sha2\(24\|56\)\|\(sha\|wp\)\(256\|384\|512\)\)_tv_template\[\] =' 'crypto/\(tcrypt\|testmgr\).h' + defsnc 'static \(const \)\?RegInitializer initData\[\] __initdata =' 'drivers/ide/ali14xx\.c\|drivers/ide/legacy/ali14xx\.c' + defsnc 'static const u8 setup\[\] =' 'drivers/ide/pci/delkin_cb\.c\|drivers/ide/delkin_cb\.c' + defsnc 'static u8 cvs_time_value\[\]\[XFER_UDMA_6 - XFER_UDMA_0 + 1\] =' 'drivers/ide/sis5513\.c\|drivers/ide/pci/sis5513\.c' + defsnc 'static u8 \(act\|ini\|rco\)_time_value\[\]\[8\] =' 'drivers/ide/sis5513\.c\|drivers/ide/pci/sis5513\.c' + defsnc 'static const u8 speedtab \[3\]\[12\] =' 'drivers/ide/umc8672\.c\|drivers/ide/legacy/umc8672\.c' + initnc 'static const __u8 \(effects\|gamma\)_table\[\(MAX_[A-Z]*\|[A-Z]*_MAX\)\]\[[0-9]*\] =' drivers/media/video/gspca/t631.c + defsnc 'static const s8 \(b43\(\|legacy\)\|bcm43xx\)_tssi2dbm_[bg]_table\[\] =' net/wireless/b43/phy.c + accept '#define _MAP_0_32_ASCII_SEG7_NON_PRINTABLE \\[\n] \(0,\)\+'"$eol" 'drivers/input/misc/map_to_7segment\.h\|include/linux/map_to_7segment\.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' 'net/\(netfilter\|ipv4\)/ipvs/ip_vs_sync.c|net/sctp/sm_make_chunk.c|include/linux/scpt.h' + defsnc 'static const unsigned char wm_vol\[256\] =' sound/pci/ice1712/phase.c + defsnc 'static const char zr360[56]0_dht\[0x1a4\] =' 'drivers/media/video/zr36060\.c\|drivers/media/video/zoran/zr36060\.c' + defsnc 'static const char zr360[56]0_dqt\[0x86\] =' 'drivers/media/video/zr36060\.c\|drivers/media/video/zoran/zr36060\.c' + + # These are removed in 2.6.28, they're here so --reverse-patch tests pass. + defsnc 'static unsigned char irq_xlate\[32\] =' arch/sparc/kernel/sun4m_irq.c + defsnc 'static int logitech_expanded_keymap\[LOGITECH_EXPANDED_KEYMAP_SIZE\] =' drivers/hid/hid-input.c + initc ' static const __u8 \(read_indexs\|n\(set\)\?[0-9]*\|missing\)\[[0-9x]*\] =' drivers/media/video/gspca/t613.c + defsnc 'static const u_char nand_ecc_precalc_table\[\] =' drivers/mtd/nand/nand_ecc.c + oprepline '#define AR5K_RATES_\(11[ABG]\|TURBO\|XR\) ' drivers/net/wireless/ath5k/ath5k.h + defsnc 'static const struct ath_hal ar5416hal =' drivers/net/wireless/ath9k/hw.c + defsnc 'const unsigned char INIT_2\[127\] =' drivers/video/omap/lcd_sx1.c + + initc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static const __u8 ov7630_sensor_init\[\]\[8\] = {[*][/];' drivers/media/video/gspca/sonixj.c ;; */patch*2.6.27-rc* | */patch*2.6.26-git* | */git-linus.diff) @@ -1101,24 +1331,24 @@ set_except () { 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 + defsnc 'static const __u8 cx_inits_\(176\|320\|352\|640\)\[\] =' drivers/media/video/gspca/conex.c + defsnc 'static const __u8 cx_jpeg_init\[\]\[8\] =' drivers/media/video/gspca/conex.c + defsnc '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 + 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 \(start\|page[34]\)_73\(02\|11\)\[\] =' 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 + defsnc 'static \(const \)\?__u8 \(hv7131r\|mi0360\|mo4000\|ov76\([36]0\|48\)\|om6802\)_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 @@ -1134,7 +1364,6 @@ set_except () { 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 @@ -1155,13 +1384,31 @@ set_except () { defsnc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static const __u8 \(hv7131r\|mi0360\|mo4000\|ov76\(60\|48\)\)_sensor_init\[\]\[8\] = {[*][/];' drivers/media/video/gspca/sonixj.c defsnc 'static const struct ath_hal ar5416hal =' drivers/net/wireless/ath9k/hw.c defsnc 'static \(const \)\?u32 ar\(5416\|9280\)\(Modes\(_fast_clock\)\?\|Common\|BB_RfGain\|Bank6\(TPC\)\?\|Addac\)\(_91[06]0\(1_1\)\?\|_9280\(_2\)\?\)\?\[\]\[[236]\] =' drivers/net/wireless/ath9k/initvals.h - ;; + */linux-2.6-gspca-git.patch) + # Probably for 2.6.28 or .29. + initnc 'static const __u8 ov\(534\|772x\)_reg_initdata\[\]\[2\] =' drivers/media/video/gspca/ov534.c + initnc 'static const __u8 \(mi0360\|po1200\)_initQ\?VGA_\(JPG\|data\)\[\]\[4\] =' drivers/media/video/gspca/vc032x.c + # Already in 2.6.27. + initnc 'static const __u8 initOv6650\[\] =' drivers/media/video/gspca/sonixb.c + initnc ' [/][*] Some more unknown stuff [*][/]' drivers/media/video/gspca/sonixb.c + defsnc 'static const __u8 ov7648_sensor_init\[\]\[8\] =' drivers/media/video/gspca/sonixj.c + # No merge needed + defsnc '#if 0[\n] {0x30, 0x0154, 0x0008},' drivers/media/video/gspca/sunplus.c + ;; + */drm-modesetting-radeon.patch) initnc 'static int atom_dst_to_src\[8\]\[4\] =' drivers/gpu/drm/radeon/atom.c ;; + */linux*alsa*.patch) + defsnc 'static u8 tas3004_treble_table\[\] =' sound/aoa/codecs/tas-basstreble.h + defsnc 'static const unsigned char wm_vol\[256\] =' sound/pci/ice1712/phase.c + defsnc 'static const u16 wm8900_reg_defaults\[WM8900_MAXREG\] =' sound/soc/wm8900.c + defsnc '} \(clk_sys_ratios\|bclk_divs\)\[\] =' sound/soc/wm8903.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' @@ -1180,8 +1427,8 @@ set_except () { 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 + initnc 'static yyconst flex_int\(16\|32\)_t yy_[^[]*\[[0-9]*\] =' '.*\.lex\.c_shipped' + initnc 'static const yytype_u\?int\(8\|16\) yy[^\n []*\[\] =' '.*\.lex\.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 @@ -1193,7 +1440,7 @@ set_except () { 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 + 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 @@ -1257,13 +1504,18 @@ set_except () { # initnc 'static uint32_t nv\(4[013467ace]\|49_4b\|8[46]\)_ctx_\(voodoo\|prog\)\[\] =' 'drivers/char/drm/nv40_graph.c|.*' ;; - */linux-2.6-lirc.patch) + */linux-2.6*-lirc.patch) initnc 'const unsigned char map_table\[\] =' ;; */linux-2.6-modsign-mpilib.patch) initnc 'const unsigned char __clz_tab\[\] =' ;; - */linux-2.6-wireless*.patch) + */linux-2.6-netdev*.patch | \ + */linux-2.6.27-net-r8169-2.6.28.patch) + defsnc ' *struct phy_reg phy_reg_init_[01]\[\] =' drivers/net/r8169.c + ;; + */linux-2.6-wireless*.patch | */linux-2.6-ath5k.patch | \ + */git-wireless-dev.patch | */linux-2.6-zd1211rw-mac80211.patch) 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\)\[\] =' initnc 'static const s8 \(b43\(legacy\)\?\|bcm43xx\)_tssi2dbm_[bg]_table\[\] =' initnc 'static struct iwl\(3945\)\?_tx_power power_gain_table\[2\]\[IWL_MAX_GAIN_ENTRIES\] =' @@ -1307,7 +1559,17 @@ set_except () { # 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 },' + + # Fedora 8ish kernel-xen builds + initnc 'const u16 crc_itu_t_table\[256\] =' + initnc 'static const u16 tkip_sbox\[256\] =' + initnc 'static const struct ath5k_ini_mode ar5211_ini_mode\[\] =' + initnc 'static const struct ath5k_ini_mode ar5212_rf511[12]_ini_mode\[\] =' + initnc ' static const u8 log10\[\] =' + initnc 'static const u8 rtl8225z2_tx_gain_cck_ofdm\[\] =' + initnc 'static const u32 rf_vals_abg_5222\[\] =' ;; + */linux-2.6-netdev-e1000e*.patch) # drivers/net/e1000e/phy.c initnc 'static const u16 e1000_igp_2_cable_length_table\[\] =' @@ -1367,13 +1629,6 @@ defineblob='[ ]*#[ ]*define[ ]\+\([^\n]*\\[\n]\)*[^\n]*'"$blobseq"'\([^\n]*\\ # without any intervening label. asmblob="[a-zA-Z_.][^\\n:;#/ ]*[ ]*:\\([^:{}]*\\|$asmcomment\\)*$blobseq\\([^:]*\\|$asmcomment\\)*" -# Regular expression that matches one or more blobs without -# intervening line breaks. -sblobctx="\\([^\\n]*$blobfseq\\)\\+" - -# Regular expression that matches the context for a long blob match. -lblobctx="\\($initblob\\|$defineblob\\|$asmblob\\|$sblobctx\\)" - # Set up the sed script that will go through the (processed) input, # looking for sequences of blobs and printing whatever was requested. # It accepts 3 arguments. @@ -1387,7 +1642,26 @@ lblobctx="\\($initblob\\|$defineblob\\|$asmblob\\|$sblobctx\\)" # $4 is the action for every complete input pattern. set_sedmain () { - falsepos=`sed 's,^\\\|,,;s,^,\\\\(,;s,$,\\\\),' < "$falsepos_name"` + falsepos=`sed 's,^\\\|,,;s,^.,\\\\(&,;s,.$,&\\\\),' < "$falsepos_name"` + orfalseneg=`cat < "$falseneg_name"` + + case $orfalseneg in + "") + blobfast=$blobseq + bloblong=$blobfseq + ;; + *) + blobfast="\\($blobseq$orfalseneg\\)" + bloblong="\\($blobfseq$orfalseneg\\)" + ;; + esac + + # Regular expression that matches one or more blobs without + # intervening line breaks. + sblobctx="\\([^\\n]*$bloblong\\)\\+" + + # Regular expression that matches the context for a long blob match. + lblobctx="\\($initblob\\|$defineblob\\|$asmblob\\|$sblobctx\\)" if test -s "$falsepos_name"; then check_false_positives="$v:???falsepos @@ -1396,8 +1670,8 @@ $v:+++falsepos h; s/$bol$falsepos/\\1;\/**\/;/g; # See if, after removing all matches, we end up without any blobs. -$v:???blobseq -/$blobseq/!{ +$v:???blobfast +/$blobfast/!{ g; b falsepos; } @@ -1434,8 +1708,8 @@ g; $4 s/^\(;[/][*]begin [^\n]*[\n]\)*//; s/\\($bol;[/][*]\\(end [^\n]*\\)\\?[*][/];\\)*$//; -$v:???!blobseq -/$blobseq/!b clean; +$v:???!blobfast +/$blobfast/!b clean; $check_false_positives # Fall through. : blob @@ -1470,7 +1744,7 @@ $v:print_matches h; s/^\\($falsepos[^\\n]*\\)\\([\\n].*\\)\\?$/\\1/; $v:narrowed to match -/$blobfseq/ { +/$bloblong/ { i\\ ::: $file ::: p; @@ -1503,11 +1777,11 @@ $v:print_marked_matches h; s/^\\($falsepos[^\\n]*\\)\\([\\n].*\\)\\?$/\\1/; $v:narrowed to match -/$blobfseq/{ +/$bloblong/{ i\\ ::: $file ::: s/{\\($sepx\\)\\?$blobfseq\\($sepx\\)\\?}[ ]*;/{\/*(DEBLOBBED)*\/};/g; - s/$blobfseq/\/*(DEBLOBBED)*\//g; + s/$bloblong/\/*(DEBLOBBED)*\//g; p; } g; @@ -1524,10 +1798,11 @@ $v:print_blobs /^$falsepos/ { $v:delete false positive # This is tricky. We don't want to print the false positive. - /^$falsepos[^\\n]*$blobseq/ { + /^$falsepos[^\\n]*$blobfast/ { $v:delete false positive immediately followed by blob h; - s/^\\($falsepos\\)[^\\n]*$blobseq.*/\\1/; + s/^\\($falsepos\\).*/\\1/; + $v:matched false positive : print_blobs_match_loop /[\\n]/ { s/^[^\\n]*[\\n]//; @@ -1542,10 +1817,11 @@ $v:print_blobs s/^$falsepos//; b print_blobs_delete_to_eol; } -/^[^\\n]*$blobseq/! { +/^[^\\n]*$blobfast/! { $v:delete non-blob header h; - s/[\\n]\\($falsepos\\|[^\\n]*$blobseq\\).*//; + s/[\\n]\\($falsepos\\|[^\\n]*$blobfast\\).*//; + $v:matched non-blob header : print_blobs_nomatch_loop /[\\n]/ { s/^[^\\n]*[\\n]//; @@ -1560,11 +1836,11 @@ $v:print_blobs h; i\\ ::: $file ::: -s/^\\([^\\n]*\\($blobfseq[^\\n]*\\)\\+\\)\\([\\n].*\\)\\?$/\\1/; +s/^\\([^\\n]*\\($bloblong[^\\n]*\\)\\+\\)\\([\\n].*\\)\\?$/\\1/; $v:narrowed to blob p; g; -s/^\\([^\\n]*\\($blobfseq[^\\n]*\\)\\+\\)//; +s/^\\([^\\n]*\\($bloblong[^\\n]*\\)\\+\\)//; : print_blobs_delete_to_eol $v:delete to eol s/^[^\\n]*//; @@ -1577,10 +1853,11 @@ $v:print_marked_blobs /^$falsepos/ { $v:delete false positive # This is tricky. We don't want to print the false positive. - /^$falsepos[^\\n]*$blobseq/ { + /^$falsepos[^\\n]*$blobfast/ { $v:delete false positive immediately followed by blob h; - s/^\\($falsepos\\)[^\\n]*$blobseq.*/\\1/; + s/^\\($falsepos\\).*/\\1/; + $v:matched false positive : print_marked_blobs_match_loop /[\\n]/ { s/^[^\\n]*[\\n]//; @@ -1595,10 +1872,11 @@ $v:print_marked_blobs s/^falsepos//; b print_marked_blobs_delete_to_eol; } -/^[^\\n]*$blobseq/! { +/^[^\\n]*$blobfast/! { $v:delete non-blob header h; - s/[\\n]\\($falsepos\\|[^\\n]*$blobseq\\).*//; + s/[\\n]\\($falsepos\\|[^\\n]*$blobfast\\).*//; + $v:matched non-blob header : print_marked_blobs_nomatch_loop /[\\n]/ { s/^[^\\n]*[\\n]//; @@ -1613,13 +1891,13 @@ $v:print_marked_blobs h; i\\ ::: $file ::: -s/^\\([^\\n]*\\($blobfseq[^\\n]*\\)\\+\\)\\([\\n].*\\)\\?$/\\1/; +s/^\\([^\\n]*\\($bloblong[^\\n]*\\)\\+\\)\\([\\n].*\\)\\?$/\\1/; $v:narrowed to blob s/{\\($sepx\\)\\?$blobfseq\\($sepx\\)\\?}[ ]*;/{\/*(DEBLOBBED)*\/};/g; -s/$blobfseq/\/*(DEBLOBBED)*\//g; +s/$bloblong/\/*(DEBLOBBED)*\//g; p; g; -s/^\\([^\\n]*\\($blobfseq[^\\n]*\\)\\+\\)//; +s/^\\([^\\n]*\\($bloblong[^\\n]*\\)\\+\\)//; : print_marked_blobs_delete_to_eol $v:delete to eol s/^[^\\n]*//; @@ -1632,10 +1910,11 @@ $v:print_cblobs /^$falsepos/ { $v:delete false positive # This is tricky. We don't want to print the false positive. - /^$falsepos[^\\n]*$blobseq/ { + /^$falsepos[^\\n]*$blobfast/ { $v:delete false positive immediately followed by blob h; - s/^\\($falsepos\\)[^\\n]*$blobseq.*/\\1/; + s/^\\($falsepos\\).*/\\1/; + $v:matched false positive : print_cblobs_match_loop /[\\n]/ { s/^[^\\n]*[\\n]//; @@ -1654,6 +1933,7 @@ $v:print_cblobs $v:delete non-blob header h; s/[\\n]\\($falsepos\\|$lblobctx\\).*//; + $v:matched non-blob header : print_cblobs_nomatch_loop /[\\n]/ { s/^[^\\n]*[\\n]//; @@ -1668,11 +1948,11 @@ $v:print_cblobs h; i\\ ::: $file ::: -s/^\\($lblobctx[^\\n]*\\($blobfseq[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/; +s/^\\($lblobctx[^\\n]*\\($bloblong[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/; $v:narrowed to blob p; g; -s/^\\($lblobctx[^\\n]*\\($blobfseq[^\\n]*\\)*\\)//; +s/^\\($lblobctx[^\\n]*\\($bloblong[^\\n]*\\)*\\)//; : print_cblobs_delete_to_eol $v:delete to eol s/^[^\\n]*//; @@ -1685,10 +1965,11 @@ $v:print_marked_cblobs /^$falsepos/ { $v:delete false positive # This is tricky. We don't want to print the false positive. - /^$falsepos[^\\n]*$blobseq/ { + /^$falsepos[^\\n]*$blobfast/ { $v:delete false positive immediately followed by blob h; - s/^\\($falsepos\\)[^\\n]*$blobseq.*/\\1/; + s/^\\($falsepos\\).*/\\1/; + $v:matched false positive : print_marked_cblobs_match_loop /[\\n]/ { s/^[^\\n]*[\\n]//; @@ -1707,6 +1988,7 @@ $v:print_marked_cblobs $v:delete non-blob header h; s/[\\n]\\($falsepos\\|$lblobctx\\).*//; + $v:matched non-blob header : print_marked_cblobs_nomatch_loop /[\\n]/ { s/^[^\\n]*[\\n]//; @@ -1721,13 +2003,13 @@ $v:print_marked_cblobs h; i\\ ::: $file ::: -s/^\\($lblobctx[^\\n]*\\($blobfseq[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/; +s/^\\($lblobctx[^\\n]*\\($bloblong[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/; $v:narrowed to blob s/{\\($sepx\\)\\?$blobfseq\\($sepx\\)\\?}[ ]*;/{\/*(DEBLOBBED)*\/};/g; -s/$blobfseq/\/*(DEBLOBBED)*\//g; +s/$bloblong/\/*(DEBLOBBED)*\//g; p; g; -s/^\\($lblobctx[^\\n]*\\($blobfseq[^\\n]*\\)*\\)//; +s/^\\($lblobctx[^\\n]*\\($bloblong[^\\n]*\\)*\\)//; : print_marked_cblobs_delete_to_eol $v:delete to eol s/^[^\\n]*//; @@ -1737,10 +2019,11 @@ b print_marked_cblobs; : print_both $v:print_both -/^\\($falsepos\\|[^\\n]*$blobseq\\)/! { +/^\\($falsepos\\|[^\\n]*$blobfast\\)/! { $v:delete non-blob header h; - s/[\\n]\\($falsepos\\|[^\\n]*$blobseq\\).*//; + s/[\\n]\\($falsepos\\|[^\\n]*$blobfast\\).*//; + $v:matched non-blob header : print_both_nomatch_loop /[\\n]/ { s/^[^\\n]*[\\n]//; @@ -1755,11 +2038,11 @@ $v:print_both h; i\\ ::: $file ::: -s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$blobfseq[^\\n]*\\)\\($blobfseq[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/; +s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$bloblong[^\\n]*\\)\\($bloblong[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/; $v:narrowed to blob p; g; -s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$blobfseq[^\\n]*\\)\\($blobfseq[^\\n]*\\)*\\)//; +s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$bloblong[^\\n]*\\)\\($bloblong[^\\n]*\\)*\\)//; : print_both_delete_to_eol $v:delete to eol s/^[^\\n]*//; @@ -1788,9 +2071,9 @@ $v:list_matches h; s/^\\($falsepos[^\\n]*\\)\\([\\n].*\\)\\?$/\\1/; $v:narrowed to match -/$blobfseq/{ +/$bloblong/{ s/{\\($sepx\\)\\?$blobfseq\\($sepx\\)\\?}[ ]*;/{\/*(DEBLOBBED)*\/};/g; - s/$blobfseq/\/*(DEBLOBBED)*\//g; + s/$bloblong/\/*(DEBLOBBED)*\//g; } p; g; @@ -1807,10 +2090,10 @@ $v:list_blobs /^$falsepos/ { $v:print false positive # This is tricky. We don't want to deblob the false positive. - /^$falsepos[^\\n]*$blobseq/ { + /^$falsepos[^\\n]*$blobfast/ { $v:print false positive immediately followed by blob h; - s/^\\($falsepos\\)[^\\n]*$blobseq.*/\\1/; + s/^\\($falsepos\\)[^\\n]*$blobfast.*/\\1/; : list_blobs_match_loop /[\\n]/ { P; @@ -1830,10 +2113,10 @@ $v:list_blobs s/^\\($falsepos[^\\n]*\\)//; b list_blobs_delete_to_eol; } -/^[^\\n]*$blobseq/! { +/^[^\\n]*$blobfast/! { $v:print non-blob header h; - s/[\\n]\\($falsepos\\|[^\\n]*$blobseq\\).*//; + s/[\\n]\\($falsepos\\|[^\\n]*$blobfast\\).*//; p; : list_blobs_nomatch_loop /[\\n]/ { @@ -1847,13 +2130,13 @@ $v:list_blobs b list_blobs_delete_to_eol; } h; -s/^\\([^\\n]*\\($blobfseq[^\\n]*\\)\\+\\)\\([\\n].*\\)\\?$/\\1/; +s/^\\([^\\n]*\\($bloblong[^\\n]*\\)\\+\\)\\([\\n].*\\)\\?$/\\1/; $v:narrowed to blob s/{\\($sepx\\)\\?$blobfseq\\($sepx\\)\\?}[ ]*;/{\/*(DEBLOBBED)*\/};/g; -s/$blobfseq/\/*(DEBLOBBED)*\//g; +s/$bloblong/\/*(DEBLOBBED)*\//g; p; g; -s/^\\([^\\n]*\\($blobfseq[^\\n]*\\)\\+\\)//; +s/^\\([^\\n]*\\($bloblong[^\\n]*\\)\\+\\)//; : list_blobs_delete_to_eol $v:delete to eol s/^[^\\n]*//; @@ -1863,10 +2146,10 @@ b list_blobs; : list_both $v:list_both -/^\\($falsepos\\|[^\\n]*$blobseq\\)/! { +/^\\($falsepos\\|[^\\n]*$blobfast\\)/! { $v:print non-blob header h; - s/[\\n]\\($falsepos\\|[^\\n]*$blobseq\\).*//; + s/[\\n]\\($falsepos\\|[^\\n]*$blobfast\\).*//; p; : list_both_nomatch_loop /[\\n]/ { @@ -1880,13 +2163,13 @@ $v:list_both b list_both_delete_to_eol; } h; -s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$blobfseq[^\\n]*\\)\\($blobfseq[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/; +s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$bloblong[^\\n]*\\)\\($bloblong[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/; $v:narrowed to blob s/{\\($sepx\\)\\?$blobfseq\\($sepx\\)\\?}[ ]*;/{\/*(DEBLOBBED)*\/};/g; -s/$blobfseq/\/*(DEBLOBBED)*\//g; +s/$bloblong/\/*(DEBLOBBED)*\//g; p; g; -s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$blobfseq[^\\n]*\\)\\($blobfseq[^\\n]*\\)*\\)//; +s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$bloblong[^\\n]*\\)\\($bloblong[^\\n]*\\)*\\)//; : list_both_delete_to_eol $v:delete to eol s/^[^\\n]*//; @@ -1909,6 +2192,8 @@ check () { falsepos_name=`mktemp -t deblob-check-falsepos-XXXXXX` tempfiles="$falsepos_name" + falseneg_name=`mktemp -t deblob-check-falseneg-XXXXXX` + tempfiles="$tempfiles $falseneg_name" # Add $1 to falsepos. Its usage makes it implicitly anchored to the # beginning of the line. $2, if present, will some day narrow the @@ -1919,11 +2204,20 @@ check () { fi } + # Add $1 to falseneg. Unlike addx, it is NOT implicitly anchored to + # the beginning of the line. $2, if present, will some day narrow + # the falseneg matches to files that match it. + badx () { + if test -n "$1"; then + echo -n "\\|$1" >> $falseneg_name + fi + } + set_except "$input" set_sed_cmd "$input" - rm -f "$falsepos_name" + rm -f $tempfiles tempfiles= # Choose the input source... @@ -1949,7 +2243,7 @@ check () { *.tar*) cmd="tar -xf - --to-command='echo \";/*begin \$TAR_FILENAME*/;\"; cat; echo \";/**/;\"; echo \";/*end \$TAR_FILENAME*/;\"'" ;; - *.patch | */patch-* | *.diff) + *.patch | *.patch.*z* | */patch-* | *.diff | *.diff.*z*) if $reverse_patch; then s=- r=+ else @@ -2035,9 +2329,37 @@ pass=: tempfiles= trap "status=$?; test -z \"$tempfiles\" || rm -f $tempfiles; (exit $status); exit" 0 1 2 15 +process_arg= + # Go through each of the input files in the command line. for file do + case $process_arg in + "") ;; + --implied-prefix | --prefix | -i) + prefix=$file + case $prefix in + /*/) ;; + */) prefix=/$prefix ;; + /*) prefix=$prefix/ ;; + *) prefix=/$prefix/ ;; + esac + process_arg= + continue + ;; + *) + echo Internal error with process_arg=$process_arg >&2 + exit 1 + ;; + esac + + case $sawdashdash$file in + --implied-prefix | --prefix | -i) + process_arg=$file + continue + ;; + esac + # If we print anything whatsoever (even a blank line) while # processing it, we've failed. if check "$file"; then @@ -2049,6 +2371,14 @@ do fi done +case $process_arg in +"") ;; +*) + echo Missing argument to $process_arg >&2 + exit 1 + ;; +esac + #list: shift $n #list: exec test $# = 0