diff options
author | Andrew Bartlett <abartlet@samba.org> | 2012-05-28 12:13:14 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2012-05-30 04:15:11 +0200 |
commit | 53d4ffcc227cd2d3a998718faeeeca0d1431e54b (patch) | |
tree | 0ecc265db86cdb0238538a6e7ef4c9834f7f1de8 | |
parent | c691ada7096a9c5c6c95de390329ebb16e2086c5 (diff) | |
download | samba-53d4ffcc227cd2d3a998718faeeeca0d1431e54b.tar.gz samba-53d4ffcc227cd2d3a998718faeeeca0d1431e54b.tar.bz2 samba-53d4ffcc227cd2d3a998718faeeeca0d1431e54b.zip |
s3-iconv: Remove unused script/gen-8bit-gap.sh
We decided to rely on a system iconv rather than these
modules.
Andrew Bartlett
-rw-r--r-- | source3/configure.in | 2 | ||||
-rw-r--r-- | source3/script/gap.awk | 39 | ||||
-rw-r--r-- | source3/script/gaptab.awk | 48 | ||||
-rw-r--r-- | source3/script/gen-8bit-gap.awk | 18 | ||||
-rwxr-xr-x | source3/script/gen-8bit-gap.sh.in | 48 |
5 files changed, 1 insertions, 154 deletions
diff --git a/source3/configure.in b/source3/configure.in index 995b50e6ac..a95a15dc69 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6677,7 +6677,7 @@ fi ]) AC_OUTPUT(Makefile - script/findsmb smbadduser script/gen-8bit-gap.sh script/installbin.sh script/uninstallbin.sh + script/findsmb smbadduser script/installbin.sh script/uninstallbin.sh lib/netapi/examples/Makefile lib/netapi/tests/Makefile pkgconfig/smbclient.pc diff --git a/source3/script/gap.awk b/source3/script/gap.awk deleted file mode 100644 index 11680d10f9..0000000000 --- a/source3/script/gap.awk +++ /dev/null @@ -1,39 +0,0 @@ -BEGIN { hv["0"] = 0; hv["1"] = 1; hv["2"] = 2; hv["3"] = 3; - hv["4"] = 4; hv["5"] = 5; hv["6"] = 6; hv["7"] = 7; - hv["8"] = 8; hv["9"] = 9; hv["A"] = 10; hv["B"] = 11; - hv["C"] = 12; hv["D"] = 13; hv["E"] = 14; hv["F"] = 15; - hv["a"] = 10; hv["b"] = 11; hv["c"] = 12; hv["d"] = 13; - hv["e"] = 14; hv["f"] = 15; - - first = 0; last = 0; idx = 0; -} - -function tonum(str) -{ - num=0; - cnt=1; - while (cnt <= length(str)) { - num *= 16; - num += hv[substr(str,cnt,1)]; - ++cnt; - } - return num; -} - -{ - u = tonum($1); - if (u - last > 6) - { - if (last) - { - printf (" { 0x%04x, 0x%04x, %5d },\n", - first, last, idx); - idx -= u - last - 1; - } - first = u; - } - last = u; -} - -END { printf (" { 0x%04x, 0x%04x, %5d },\n", - first, last, idx); } diff --git a/source3/script/gaptab.awk b/source3/script/gaptab.awk deleted file mode 100644 index a309089cd5..0000000000 --- a/source3/script/gaptab.awk +++ /dev/null @@ -1,48 +0,0 @@ -BEGIN { hv["0"] = 0; hv["1"] = 1; hv["2"] = 2; hv["3"] = 3; - hv["4"] = 4; hv["5"] = 5; hv["6"] = 6; hv["7"] = 7; - hv["8"] = 8; hv["9"] = 9; hv["A"] = 10; hv["B"] = 11; - hv["C"] = 12; hv["D"] = 13; hv["E"] = 14; hv["F"] = 15; - hv["a"] = 10; hv["b"] = 11; hv["c"] = 12; hv["d"] = 13; - hv["e"] = 14; hv["f"] = 15; - - first = 0; last = 0; idx = 0; f = 0; -} - -function tonum(str) -{ - num=0; - cnt=1; - while (cnt <= length(str)) { - num *= 16; - num += hv[substr(str,cnt,1)]; - ++cnt; - } - return num; -} - -function fmt(val) -{ - if (f++ % 8 == 0) - { printf ("\n 0x%02x,", val); } - else - { printf (" 0x%02x,", val); } -} - -{ - u = tonum($1); c = tonum($2); - - if (u - last > 6) - { - if (last) { idx += last - first + 1; } - first = u; - } - else - { - for (m = last+1; m < u; m++) { fmt(0); } - } - - fmt(c); - last = u; -} - -END { print "" } diff --git a/source3/script/gen-8bit-gap.awk b/source3/script/gen-8bit-gap.awk deleted file mode 100644 index 59a1a23be0..0000000000 --- a/source3/script/gen-8bit-gap.awk +++ /dev/null @@ -1,18 +0,0 @@ -BEGIN { - for (i=0; i<256; i++) { - tbl[sprintf("%02x",i)] = "0x0000"; - } -} - -/^<U([[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]])>[[:space:]]*.x([[:xdigit:]][[:xdigit:]])[:space:]*.*$/ { - tbl[substr($2,3,2)]=sprintf("0x%s",substr($1,3,4)); -} - -END { - for(i=0; i<32; i++) { - for(j=0; j<8; j++) { - printf(" %s,", tbl[sprintf("%02x",i*8+j)]); - } - printf "\n" - } -}
\ No newline at end of file diff --git a/source3/script/gen-8bit-gap.sh.in b/source3/script/gen-8bit-gap.sh.in deleted file mode 100755 index 0ceaa8128b..0000000000 --- a/source3/script/gen-8bit-gap.sh.in +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -if test $# -ne 2 ; then - echo "Usage: $0 <charmap file> <CHARSET NAME>" - exit 1 -fi - -CHARMAP=$1 -CHARSETNAME=$2 - -echo "/* " -echo " * Conversion table for $CHARSETNAME charset " -echo " * " -echo " * Conversion tables are generated using $CHARMAP table " -echo " * and source/script/gen-8bit-gap.sh script " -echo " * " -echo " * This program is free software; you can redistribute it and/or modify " -echo " * it under the terms of the GNU General Public License as published by " -echo " * the Free Software Foundation; either version 3 of the License, or " -echo " * (at your option) any later version. " -echo " * " -echo " * This program is distributed in the hope that it will be useful," -echo " * but WITHOUT ANY WARRANTY; without even the implied warranty of " -echo " * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the " -echo " * GNU General Public License for more details. " -echo " * " -echo " * You should have received a copy of the GNU General Public License " -echo " * along with this program; if not, see <http://www.gnu.org/licenses/>." -echo " */" - -echo '#include "includes.h"' -echo -echo "static const uint16 to_ucs2[256] = {" -cat "$CHARMAP" | @AWK@ -f @srcdir@/script/gen-8bit-gap.awk -echo "};" -echo -echo "static const struct charset_gap_table from_idx[] = {" -sed -ne 's/^<U\(....\).*/\1/p' \ - "$CHARMAP" | sort -u | @AWK@ -f @srcdir@/script/gap.awk -echo " { 0xffff, 0xffff, 0 }" -echo "};" -echo -echo "static const unsigned char from_ucs2[] = {" -sed -ne 's/^<U\(....\)>[[:space:]]*.x\(..\).*/\1 \2/p' \ - "$CHARMAP" | sort -u | @AWK@ -f @srcdir@/script/gaptab.awk -echo "};" -echo -echo "SMB_GENERATE_CHARSET_MODULE_8_BIT_GAP($CHARSETNAME)" -echo |