From owner-svn-src-vendor@FreeBSD.ORG Mon Oct 11 12:43:51 2010 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D344310656A6; Mon, 11 Oct 2010 12:43:51 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BD5648FC2A; Mon, 11 Oct 2010 12:43:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9BChphx015475; Mon, 11 Oct 2010 12:43:51 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9BChpV5015469; Mon, 11 Oct 2010 12:43:51 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201010111243.o9BChpV5015469@svn.freebsd.org> From: Martin Matuska Date: Mon, 11 Oct 2010 12:43:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213688 - in vendor/xz/dist: . po src/common src/liblzma/api src/liblzma/api/lzma src/liblzma/check src/liblzma/common src/liblzma/delta src/liblzma/lz src/liblzma/lzma src/liblzma/rang... X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Oct 2010 12:43:51 -0000 Author: mm Date: Mon Oct 11 12:43:51 2010 New Revision: 213688 URL: http://svn.freebsd.org/changeset/base/213688 Log: Vendor import of xz (stripped) Git revision: d52b411716a614c202e89ba732492efb9916cd3f Approved by: delphij (mentor) Added: vendor/xz/dist/FREEBSD-Xlist (contents, props changed) vendor/xz/dist/FREEBSD-upgrade (contents, props changed) vendor/xz/dist/po/de.po (contents, props changed) vendor/xz/dist/po/it.po (contents, props changed) vendor/xz/dist/src/common/tuklib_mbstr.h (contents, props changed) vendor/xz/dist/src/common/tuklib_mbstr_fw.c (contents, props changed) vendor/xz/dist/src/common/tuklib_mbstr_width.c (contents, props changed) Deleted: vendor/xz/dist/src/liblzma/api/lzma/subblock.h vendor/xz/dist/src/liblzma/common/chunk_size.c vendor/xz/dist/src/liblzma/subblock/ Modified: vendor/xz/dist/ChangeLog (contents, props changed) vendor/xz/dist/README (contents, props changed) vendor/xz/dist/THANKS (contents, props changed) vendor/xz/dist/po/LINGUAS (contents, props changed) vendor/xz/dist/po/POTFILES.in (contents, props changed) vendor/xz/dist/po/cs.po (contents, props changed) vendor/xz/dist/src/common/sysdefs.h (contents, props changed) vendor/xz/dist/src/common/tuklib_cpucores.c (contents, props changed) vendor/xz/dist/src/common/tuklib_gettext.h (contents, props changed) vendor/xz/dist/src/common/tuklib_physmem.c (contents, props changed) vendor/xz/dist/src/liblzma/api/lzma.h (contents, props changed) vendor/xz/dist/src/liblzma/api/lzma/index.h (contents, props changed) vendor/xz/dist/src/liblzma/api/lzma/lzma.h (contents, props changed) vendor/xz/dist/src/liblzma/api/lzma/vli.h (contents, props changed) vendor/xz/dist/src/liblzma/common/block_buffer_encoder.c (contents, props changed) vendor/xz/dist/src/liblzma/common/block_util.c (contents, props changed) vendor/xz/dist/src/liblzma/common/common.c (contents, props changed) vendor/xz/dist/src/liblzma/common/common.h (contents, props changed) vendor/xz/dist/src/liblzma/common/filter_common.c (contents, props changed) vendor/xz/dist/src/liblzma/common/filter_decoder.c (contents, props changed) vendor/xz/dist/src/liblzma/common/filter_encoder.c (contents, props changed) vendor/xz/dist/src/liblzma/common/stream_buffer_encoder.c (contents, props changed) vendor/xz/dist/src/liblzma/delta/delta_encoder.c (contents, props changed) vendor/xz/dist/src/liblzma/lz/lz_decoder.c (contents, props changed) vendor/xz/dist/src/liblzma/lz/lz_decoder.h (contents, props changed) vendor/xz/dist/src/liblzma/lz/lz_encoder.c (contents, props changed) vendor/xz/dist/src/liblzma/lz/lz_encoder.h (contents, props changed) vendor/xz/dist/src/liblzma/lz/lz_encoder_mf.c (contents, props changed) vendor/xz/dist/src/liblzma/lzma/lzma2_encoder.c (contents, props changed) vendor/xz/dist/src/liblzma/lzma/lzma_encoder_optimum_fast.c (contents, props changed) vendor/xz/dist/src/liblzma/lzma/lzma_encoder_optimum_normal.c (contents, props changed) vendor/xz/dist/src/liblzma/lzma/lzma_encoder_presets.c (contents, props changed) vendor/xz/dist/src/lzmainfo/lzmainfo.1 (contents, props changed) vendor/xz/dist/src/lzmainfo/lzmainfo.c (contents, props changed) vendor/xz/dist/src/xz/args.c (contents, props changed) vendor/xz/dist/src/xz/args.h (contents, props changed) vendor/xz/dist/src/xz/coder.c (contents, props changed) vendor/xz/dist/src/xz/coder.h (contents, props changed) vendor/xz/dist/src/xz/file_io.c (contents, props changed) vendor/xz/dist/src/xz/hardware.c (contents, props changed) vendor/xz/dist/src/xz/hardware.h (contents, props changed) vendor/xz/dist/src/xz/list.c (contents, props changed) vendor/xz/dist/src/xz/main.c (contents, props changed) vendor/xz/dist/src/xz/message.c (contents, props changed) vendor/xz/dist/src/xz/message.h (contents, props changed) vendor/xz/dist/src/xz/options.c (contents, props changed) vendor/xz/dist/src/xz/options.h (contents, props changed) vendor/xz/dist/src/xz/private.h (contents, props changed) vendor/xz/dist/src/xz/signals.c (contents, props changed) vendor/xz/dist/src/xz/signals.h (contents, props changed) vendor/xz/dist/src/xz/util.c (contents, props changed) vendor/xz/dist/src/xz/util.h (contents, props changed) vendor/xz/dist/src/xz/xz.1 (contents, props changed) vendor/xz/dist/src/xzdec/xzdec.1 (contents, props changed) vendor/xz/dist/src/xzdec/xzdec.c (contents, props changed) Directory Properties: vendor/xz/dist/AUTHORS (props changed) vendor/xz/dist/COPYING (props changed) vendor/xz/dist/TODO (props changed) vendor/xz/dist/po/Makevars (props changed) vendor/xz/dist/src/common/mythread.h (props changed) vendor/xz/dist/src/common/tuklib_common.h (props changed) vendor/xz/dist/src/common/tuklib_config.h (props changed) vendor/xz/dist/src/common/tuklib_cpucores.h (props changed) vendor/xz/dist/src/common/tuklib_exit.c (props changed) vendor/xz/dist/src/common/tuklib_exit.h (props changed) vendor/xz/dist/src/common/tuklib_integer.h (props changed) vendor/xz/dist/src/common/tuklib_open_stdxxx.c (props changed) vendor/xz/dist/src/common/tuklib_open_stdxxx.h (props changed) vendor/xz/dist/src/common/tuklib_physmem.h (props changed) vendor/xz/dist/src/common/tuklib_progname.c (props changed) vendor/xz/dist/src/common/tuklib_progname.h (props changed) vendor/xz/dist/src/liblzma/api/lzma/base.h (props changed) vendor/xz/dist/src/liblzma/api/lzma/bcj.h (props changed) vendor/xz/dist/src/liblzma/api/lzma/block.h (props changed) vendor/xz/dist/src/liblzma/api/lzma/check.h (props changed) vendor/xz/dist/src/liblzma/api/lzma/container.h (props changed) vendor/xz/dist/src/liblzma/api/lzma/delta.h (props changed) vendor/xz/dist/src/liblzma/api/lzma/filter.h (props changed) vendor/xz/dist/src/liblzma/api/lzma/hardware.h (props changed) vendor/xz/dist/src/liblzma/api/lzma/index_hash.h (props changed) vendor/xz/dist/src/liblzma/api/lzma/stream_flags.h (props changed) vendor/xz/dist/src/liblzma/api/lzma/version.h (props changed) vendor/xz/dist/src/liblzma/check/check.c (props changed) vendor/xz/dist/src/liblzma/check/check.h (props changed) vendor/xz/dist/src/liblzma/check/crc32_fast.c (props changed) vendor/xz/dist/src/liblzma/check/crc32_small.c (props changed) vendor/xz/dist/src/liblzma/check/crc32_table.c (props changed) vendor/xz/dist/src/liblzma/check/crc32_table_be.h (props changed) vendor/xz/dist/src/liblzma/check/crc32_table_le.h (props changed) vendor/xz/dist/src/liblzma/check/crc32_tablegen.c (props changed) vendor/xz/dist/src/liblzma/check/crc32_x86.S (props changed) vendor/xz/dist/src/liblzma/check/crc64_fast.c (props changed) vendor/xz/dist/src/liblzma/check/crc64_small.c (props changed) vendor/xz/dist/src/liblzma/check/crc64_table.c (props changed) vendor/xz/dist/src/liblzma/check/crc64_table_be.h (props changed) vendor/xz/dist/src/liblzma/check/crc64_table_le.h (props changed) vendor/xz/dist/src/liblzma/check/crc64_tablegen.c (props changed) vendor/xz/dist/src/liblzma/check/crc64_x86.S (props changed) vendor/xz/dist/src/liblzma/check/crc_macros.h (props changed) vendor/xz/dist/src/liblzma/check/sha256.c (props changed) vendor/xz/dist/src/liblzma/common/alone_decoder.c (props changed) vendor/xz/dist/src/liblzma/common/alone_decoder.h (props changed) vendor/xz/dist/src/liblzma/common/alone_encoder.c (props changed) vendor/xz/dist/src/liblzma/common/auto_decoder.c (props changed) vendor/xz/dist/src/liblzma/common/block_buffer_decoder.c (props changed) vendor/xz/dist/src/liblzma/common/block_decoder.c (props changed) vendor/xz/dist/src/liblzma/common/block_decoder.h (props changed) vendor/xz/dist/src/liblzma/common/block_encoder.c (props changed) vendor/xz/dist/src/liblzma/common/block_encoder.h (props changed) vendor/xz/dist/src/liblzma/common/block_header_decoder.c (props changed) vendor/xz/dist/src/liblzma/common/block_header_encoder.c (props changed) vendor/xz/dist/src/liblzma/common/easy_buffer_encoder.c (props changed) vendor/xz/dist/src/liblzma/common/easy_decoder_memusage.c (props changed) vendor/xz/dist/src/liblzma/common/easy_encoder.c (props changed) vendor/xz/dist/src/liblzma/common/easy_encoder_memusage.c (props changed) vendor/xz/dist/src/liblzma/common/easy_preset.c (props changed) vendor/xz/dist/src/liblzma/common/easy_preset.h (props changed) vendor/xz/dist/src/liblzma/common/filter_buffer_decoder.c (props changed) vendor/xz/dist/src/liblzma/common/filter_buffer_encoder.c (props changed) vendor/xz/dist/src/liblzma/common/filter_common.h (props changed) vendor/xz/dist/src/liblzma/common/filter_decoder.h (props changed) vendor/xz/dist/src/liblzma/common/filter_encoder.h (props changed) vendor/xz/dist/src/liblzma/common/filter_flags_decoder.c (props changed) vendor/xz/dist/src/liblzma/common/filter_flags_encoder.c (props changed) vendor/xz/dist/src/liblzma/common/hardware_physmem.c (props changed) vendor/xz/dist/src/liblzma/common/index.c (props changed) vendor/xz/dist/src/liblzma/common/index.h (props changed) vendor/xz/dist/src/liblzma/common/index_decoder.c (props changed) vendor/xz/dist/src/liblzma/common/index_encoder.c (props changed) vendor/xz/dist/src/liblzma/common/index_encoder.h (props changed) vendor/xz/dist/src/liblzma/common/index_hash.c (props changed) vendor/xz/dist/src/liblzma/common/stream_buffer_decoder.c (props changed) vendor/xz/dist/src/liblzma/common/stream_decoder.c (props changed) vendor/xz/dist/src/liblzma/common/stream_decoder.h (props changed) vendor/xz/dist/src/liblzma/common/stream_encoder.c (props changed) vendor/xz/dist/src/liblzma/common/stream_encoder.h (props changed) vendor/xz/dist/src/liblzma/common/stream_flags_common.c (props changed) vendor/xz/dist/src/liblzma/common/stream_flags_common.h (props changed) vendor/xz/dist/src/liblzma/common/stream_flags_decoder.c (props changed) vendor/xz/dist/src/liblzma/common/stream_flags_encoder.c (props changed) vendor/xz/dist/src/liblzma/common/vli_decoder.c (props changed) vendor/xz/dist/src/liblzma/common/vli_encoder.c (props changed) vendor/xz/dist/src/liblzma/common/vli_size.c (props changed) vendor/xz/dist/src/liblzma/delta/delta_common.c (props changed) vendor/xz/dist/src/liblzma/delta/delta_common.h (props changed) vendor/xz/dist/src/liblzma/delta/delta_decoder.c (props changed) vendor/xz/dist/src/liblzma/delta/delta_decoder.h (props changed) vendor/xz/dist/src/liblzma/delta/delta_encoder.h (props changed) vendor/xz/dist/src/liblzma/delta/delta_private.h (props changed) vendor/xz/dist/src/liblzma/lz/lz_encoder_hash.h (props changed) vendor/xz/dist/src/liblzma/lz/lz_encoder_hash_table.h (props changed) vendor/xz/dist/src/liblzma/lzma/fastpos.h (props changed) vendor/xz/dist/src/liblzma/lzma/fastpos_table.c (props changed) vendor/xz/dist/src/liblzma/lzma/fastpos_tablegen.c (props changed) vendor/xz/dist/src/liblzma/lzma/lzma2_decoder.c (props changed) vendor/xz/dist/src/liblzma/lzma/lzma2_decoder.h (props changed) vendor/xz/dist/src/liblzma/lzma/lzma2_encoder.h (props changed) vendor/xz/dist/src/liblzma/lzma/lzma_common.h (props changed) vendor/xz/dist/src/liblzma/lzma/lzma_decoder.c (props changed) vendor/xz/dist/src/liblzma/lzma/lzma_decoder.h (props changed) vendor/xz/dist/src/liblzma/lzma/lzma_encoder.c (props changed) vendor/xz/dist/src/liblzma/lzma/lzma_encoder.h (props changed) vendor/xz/dist/src/liblzma/lzma/lzma_encoder_private.h (props changed) vendor/xz/dist/src/liblzma/rangecoder/price.h (props changed) vendor/xz/dist/src/liblzma/rangecoder/price_table.c (props changed) vendor/xz/dist/src/liblzma/rangecoder/price_tablegen.c (props changed) vendor/xz/dist/src/liblzma/rangecoder/range_common.h (props changed) vendor/xz/dist/src/liblzma/rangecoder/range_decoder.h (props changed) vendor/xz/dist/src/liblzma/rangecoder/range_encoder.h (props changed) vendor/xz/dist/src/liblzma/simple/arm.c (props changed) vendor/xz/dist/src/liblzma/simple/armthumb.c (props changed) vendor/xz/dist/src/liblzma/simple/ia64.c (props changed) vendor/xz/dist/src/liblzma/simple/powerpc.c (props changed) vendor/xz/dist/src/liblzma/simple/simple_coder.c (props changed) vendor/xz/dist/src/liblzma/simple/simple_coder.h (props changed) vendor/xz/dist/src/liblzma/simple/simple_decoder.c (props changed) vendor/xz/dist/src/liblzma/simple/simple_decoder.h (props changed) vendor/xz/dist/src/liblzma/simple/simple_encoder.c (props changed) vendor/xz/dist/src/liblzma/simple/simple_encoder.h (props changed) vendor/xz/dist/src/liblzma/simple/simple_private.h (props changed) vendor/xz/dist/src/liblzma/simple/sparc.c (props changed) vendor/xz/dist/src/liblzma/simple/x86.c (props changed) vendor/xz/dist/src/xz/file_io.h (props changed) vendor/xz/dist/src/xz/list.h (props changed) vendor/xz/dist/src/xz/main.h (props changed) vendor/xz/dist/src/xz/suffix.c (props changed) vendor/xz/dist/src/xz/suffix.h (props changed) Modified: vendor/xz/dist/ChangeLog ============================================================================== --- vendor/xz/dist/ChangeLog Mon Oct 11 11:25:37 2010 (r213687) +++ vendor/xz/dist/ChangeLog Mon Oct 11 12:43:51 2010 (r213688) @@ -1,3 +1,817 @@ +commit d52b411716a614c202e89ba732492efb9916cd3f +Author: Lasse Collin +Date: Sun Oct 10 17:58:58 2010 +0300 + + xz: Use "%"PRIu32 instead of "%d" in a format string. + +commit ae74d1bdeb075c3beefe76e1136c5741804e7e91 +Author: Lasse Collin +Date: Sun Oct 10 17:43:26 2010 +0300 + + test_files.sh: Fix the first line. + + For some reason this prevented running the test only + on OS/2 and even on that it broke only recently. + + Thanks to Elbert Pol. + +commit d492b80ddd6f9a13419de6d102df7374d8f448e8 +Author: Lasse Collin +Date: Sun Oct 10 16:49:01 2010 +0300 + + lzmainfo: Use "%"PRIu32 instead of "%u" for uint32_t. + +commit 825e859a9054bd91202e5723c41a17e72f63040a +Author: Lasse Collin +Date: Sun Oct 10 16:47:01 2010 +0300 + + lzmainfo: Use fileno(stdin) instead of STDIN_FILENO. + +commit acbc4cdecbeec2a4dfaac04f185ece49b2ff17c8 +Author: Lasse Collin +Date: Sat Oct 9 23:20:51 2010 +0300 + + lzmainfo: Use setmode() on DOS-like systems. + +commit ef364d3abc5647111c5424ea0d83a567e184a23b +Author: Lasse Collin +Date: Sat Oct 9 21:51:03 2010 +0300 + + OS/2 and DOS: Be less verbose on signals. + + Calling raise() to kill xz when user has pressed C-c + is a bit verbose on OS/2 and DOS/DJGPP. Instead of + calling raise(), set only the exit status to 1. + +commit 5629c4be07b6c67e79842b2569da1cedc9c0d69a +Author: Lasse Collin +Date: Sat Oct 9 19:28:49 2010 +0300 + + DOS: Update the Makefile, config.h and README. + + This is now simpler and builds only xz.exe. + +commit f25a77e6b9bc48a243ddfbbd755b7960eec7e0ac +Author: Lasse Collin +Date: Sat Oct 9 18:57:55 2010 +0300 + + Windows: Put some license info into README-Windows.txt. + +commit e75100f549f85d231df25c07aa94d63e78e2d668 +Author: Lasse Collin +Date: Sat Oct 9 18:57:04 2010 +0300 + + Windows: Fix a diagnostics bug in build.bash. + +commit efeb998a2b1025df1c1d202cc7d21d866cd1c336 +Author: Lasse Collin +Date: Sat Oct 9 13:02:15 2010 +0300 + + lzmainfo: Add Windows resource file. + +commit 389d418445f1623593dfdbba55d52fbb6d1205f5 +Author: Lasse Collin +Date: Sat Oct 9 12:57:25 2010 +0300 + + Add missing public domain notice to lzmadec_w32res.rc. + +commit 6389c773a4912dd9f111256d74ba1605230a7957 +Author: Lasse Collin +Date: Sat Oct 9 12:52:12 2010 +0300 + + Windows: Update common_w32res.rc. + +commit 71275457ca24c9b01721f5cfc3638cf094daf454 +Author: Lasse Collin +Date: Sat Oct 9 12:27:08 2010 +0300 + + Windows: Make build.bash prefer MinGW-w32 over MinGW. + + This is simply for licensing reasons. The 64-bit version + will be built with MinGW-w64 anyway (at least for now), + so using it also for 32-bit build allows using the same + copyright notice about the MinGW-w64/w32 runtime. + + Note that using MinGW would require a copyright notice too, + because its runtime is not in the public domain either even + though MinGW's home page claims that it is public domain. + See . + +commit 3ac35719d8433af937af6491383d4a50e343099b +Author: Lasse Collin +Date: Sat Oct 9 11:33:21 2010 +0300 + + Windows: Copy COPYING-Windows.txt (if it exists) to the package. + + Also, put README-Windows.txt to the doc directory like + the other documentation files. + +commit 7b5db576fd7a4a67813b8437a9ccd4dbc94bbaae +Author: Lasse Collin +Date: Fri Oct 8 21:42:37 2010 +0300 + + Windows: Fix build.bash again. + + 630a8beda34af0ac153c8051b1bf01230558e422 wasn't good. + +commit d3cd7abe85ec7c2f46cf198b15c00d5d119df3dd +Author: Lasse Collin +Date: Fri Oct 8 16:53:20 2010 +0300 + + Use LZMA_VERSION_STRING instead of PACKAGE_VERSION. + + Those are the same thing, and the former makes it a bit + easier to build the code with other build systems, because + one doesn't need to update the version number into custom + config.h. + + This change affects only lzmainfo. Other tools were already + using LZMA_VERSION_STRING. + +commit 084c60d318f2dbaef4078d9b100b4a373d0c3a7f +Author: Lasse Collin +Date: Fri Oct 8 15:59:25 2010 +0300 + + configure.ac: Remove two unused defines. + +commit 11f51b6714357cb67ec7e56ed9575c199b5581fe +Author: Lasse Collin +Date: Fri Oct 8 15:32:29 2010 +0300 + + Make tests accommodate missing xz or xzdec. + +commit b1c7368f95e93ccdefdd0748e04398c26766f47f +Author: Lasse Collin +Date: Fri Oct 8 15:25:45 2010 +0300 + + Build: Add options to disable individual command line tools. + +commit 630a8beda34af0ac153c8051b1bf01230558e422 +Author: Lasse Collin +Date: Thu Oct 7 00:44:53 2010 +0300 + + Windows: Make build.bash work without --enable-dynamic=no. + +commit f9907503f882a745dce9d84c2968f6c175ba966a +Author: Lasse Collin +Date: Tue Oct 5 14:13:16 2010 +0300 + + Build: Remove the static/dynamic tricks. + + Most distros want xz linked against shared liblzma, so + it doesn't help much to require --enable-dynamic for that. + Those who want to avoid PIC on x86-32 to get better + performance, can still do it e.g. by using --disable-shared + to compile xz and then another pass to compile shared liblzma. + + Part of these static/dynamic tricks were needed for Windows + in the past. Nowadays we rely on GCC and binutils to do the + right thing with auto-import. If the Autotooled build system + needs to support some other toolchain on Windows in the future, + this may need some rethinking. + +commit fda4724d8114fccfa31c1839c15479f350c2fb4c +Author: Lasse Collin +Date: Tue Oct 5 12:18:58 2010 +0300 + + configure.ac: Silence a warning from Autoconf 2.68. + +commit 80b5675fa62c87426fe86f8fcd20feeabc4361b9 +Author: Lasse Collin +Date: Mon Oct 4 19:43:01 2010 +0300 + + A few more languages files to the xz man page. + + Thanks to Jonathan Nieder. + +commit f9722dbeca4dc4c43cfd15d122dafaac50b0a0bb +Author: Lasse Collin +Date: Sat Oct 2 12:07:33 2010 +0300 + + Update the FAQ. + +commit 61ae593661e8dc402394e84d567ca2044a51572b +Author: Lasse Collin +Date: Sat Oct 2 11:38:20 2010 +0300 + + liblzma: Small fixes to comments in the API headers. + +commit 9166682dc601fd42c1b9510572e3f917d18de504 +Author: Lasse Collin +Date: Tue Sep 28 11:40:12 2010 +0300 + + Create the PDF versions of the man pages better. + +commit 17d3c61edd35de8fa884944fc70d1db86daa5dd8 +Author: Lasse Collin +Date: Tue Sep 28 10:59:53 2010 +0300 + + Move version.sh to build-aux. + +commit 84af9d8770451339a692e9b70f96cf56156a6069 +Author: Lasse Collin +Date: Tue Sep 28 10:53:02 2010 +0300 + + Update .gitignore. + +commit 31575a449ac64c523da3bab8d0c0b522cdc7c780 +Author: Lasse Collin +Date: Tue Sep 28 01:17:14 2010 +0300 + + Fix accomodate -> accommodate on the xz man page. + +commit cec0ddc8ec4ce81685a51998b978e22167e461f9 +Author: Lasse Collin +Date: Mon Sep 27 23:29:34 2010 +0300 + + Major man page updates. + + Lots of content was updated on the xz man page. + + Technical improvements: + - Start a new sentence on a new line. + - Use fairly short lines. + - Use constant-width font for examples (where supported). + - Some minor cleanups. + + Thanks to Jonathan Nieder for some language fixes. + +commit 075257ab0416a0603be930082e31a5703e4ba345 +Author: Lasse Collin +Date: Sun Sep 26 18:10:31 2010 +0300 + + Fix the preset -3e. + + depth=0 was missing. + +commit 2577da9ebdba13fbe99ae5ee8bde35f7ed60f6d1 +Author: Lasse Collin +Date: Thu Sep 23 14:03:10 2010 +0300 + + Add translations.bash and translation notes to README. + + translations.bash prints some messages from xz, which + hopefully makes it a bit easier to test translations. + +commit a3c5997c57e5b1a20aae6d1071b584b4f17d0b23 +Author: Lasse Collin +Date: Fri Sep 17 22:14:30 2010 +0300 + + xz: Update the Czech translation. + + Thanks to Marek Černocký. + +commit a1766af582dc23fddd9da1eeb4b9d61e3eb4c2e6 +Author: Lasse Collin +Date: Thu Sep 16 23:40:41 2010 +0300 + + xz: Add Italian translation. + + Thanks to Milo Casagrande and Lorenzo De Liso. + +commit 21088018554e2b0e02914205377ceb6e34a090bd +Author: Lasse Collin +Date: Wed Sep 15 00:34:13 2010 +0300 + + xz: Edit a translators comment. + +commit be16e28ece1b492b8f93382b7fa1cc4da23c6ff6 +Author: Lasse Collin +Date: Tue Sep 14 22:47:14 2010 +0300 + + xz: Add German translation. + + Thanks to Andre Noll. + +commit e23ea74f3240e6b69683f9e69d1716e0f9e9092b +Author: Lasse Collin +Date: Fri Sep 10 14:30:25 2010 +0300 + + Updated README. + +commit 8dad2fd69336985adb9f774fa96dc9c0efcb5a71 +Author: Lasse Collin +Date: Fri Sep 10 14:30:07 2010 +0300 + + Updated INSTALL. + +commit 0b5f07fe3728c27cce416ddc40f7e4803ae96ac2 +Author: Lasse Collin +Date: Fri Sep 10 14:26:20 2010 +0300 + + Updated the git repository address in ChangeLog. + +commit a8760203f93a69bc39fd14520a6e9e7b7d70be06 +Author: Lasse Collin +Date: Fri Sep 10 14:09:33 2010 +0300 + + xz: Add a comment to translators about "literal context bits". + +commit bb0b1004f83cdc4d309e1471c2ecaf9f95ce60c5 +Author: Lasse Collin +Date: Fri Sep 10 10:30:33 2010 +0300 + + xz: Multiple fixes. + + The code assumed that printing numbers with thousand separators + and decimal points would always produce only US-ASCII characters. + This was used for buffer sizes (with snprintf(), no overflows) + and aligning columns of the progress indicator and --list. That + assumption was wrong (e.g. LC_ALL=fi_FI.UTF-8 with glibc), so + multibyte character support was added in this commit. The old + way is used if the operating system doesn't have enough multibyte + support (e.g. lacks wcwidth()). + + The sizes of buffers were increased to accomodate multibyte + characters. I don't know how big they should be exactly, but + they aren't used for anything critical, so it's not too bad. + If they still aren't big enough, I hopefully get a bug report. + snprintf() takes care of avoiding buffer overflows. + + Some static buffers were replaced with buffers allocated on + stack. double_to_str() was removed. uint64_to_str() and + uint64_to_nicestr() now share the static buffer and test + for thousand separator support. + + Integrity check names "None" and "Unknown-N" (2 <= N <= 15) + were marked to be translated. I had forgot these, plus they + wouldn't have worked correctly anyway before this commit, + because printing tables with multibyte strings didn't work. + + Thanks to Marek Černocký for reporting the bug about + misaligned table columns in --list output. + +commit 639f8e2af33cf8a184d59ba56b6df7c098679d61 +Author: Lasse Collin +Date: Wed Sep 8 08:49:22 2010 +0300 + + Update the Czech translation. + + Thanks to Marek Černocký. + +commit 41bc9956ebfd7c86777d33676acf34c45e7ca7c7 +Author: Lasse Collin +Date: Tue Sep 7 12:31:40 2010 +0300 + + xz: Add a note to translators. + +commit 77a7746616e555fc08028e883a56d06bf0088b81 +Author: Lasse Collin +Date: Tue Sep 7 10:42:13 2010 +0300 + + Fix use of N_() and ngettext(). + + I had somehow thought that N_() is usually used + as shorthand for ngettext(). + + This also fixes a missing \n from a call to ngettext(). + +commit e6ad39335842343e622ab51207d1d3cb9caad801 +Author: Lasse Collin +Date: Mon Sep 6 19:43:12 2010 +0300 + + Add missing files to POTFILES.in. + +commit 58f55131820d2e08a1a6beb9ec0ee2378044eb30 +Author: Lasse Collin +Date: Mon Sep 6 10:16:24 2010 +0300 + + xz: Improve a comment. + +commit bcb1b898341f7073f51660d7052d7ed6c5461a66 +Author: Lasse Collin +Date: Sun Sep 5 21:34:29 2010 +0300 + + xz: Update the comment about NetBSD in file_io.c. + + Thanks to Joerg Sonnenberger. + +commit da014d55972f5addbf6b4360d3d8ed2ef4282170 +Author: Lasse Collin +Date: Sun Sep 5 21:11:33 2010 +0300 + + xz: Use an array instead of pointer for stdin_filename. + + Thanks Joerg Sonnenberger. + +commit 8c7d3d1a0781c296c6b6e2465becaffd2132f7ee +Author: Lasse Collin +Date: Sun Sep 5 12:16:17 2010 +0300 + + xz: Hopefully ease translating the messages in list.c. + +commit ef840950ad99cf2955c754875af0e01acf125079 +Author: Lasse Collin +Date: Sat Sep 4 23:14:44 2010 +0300 + + xz: Fix grammar. + +commit c46afd6edc04ea140db6c59e8486f5707c810c13 +Author: Lasse Collin +Date: Sat Sep 4 23:12:20 2010 +0300 + + xz: Use lzma_lzma_preset() to initialize the options structure. + +commit 8fd3ac046d0b1416a2094fecc456d9e0f4d5d065 +Author: Lasse Collin +Date: Sat Sep 4 22:16:28 2010 +0300 + + Don't set lc=4 with --extreme. + + This should reduce the cases where --extreme makes + compression worse. On the other hand, some other + files may now benefit slightly less from --extreme. + +commit 474bac0c33e94aeaca8ada17ab19972b1424bc2b +Author: Lasse Collin +Date: Sat Sep 4 22:10:32 2010 +0300 + + xz: Minor improvements to --help and --long-help. + +commit 373ee26f955617295c5c537b04a153a1969140d2 +Author: Jonathan Nieder +Date: Fri Sep 3 16:49:15 2010 -0500 + + Adjust memory limits in test_compress.sh + + Testing compression at level -4 now requires 48 MiB of free store at + compression time and 5 MiB at decompression time. + + Signed-off-by: Jonathan Nieder + +commit 2fce9312f36727ea82f3430cc5d3a7d243c5f087 +Author: Lasse Collin +Date: Fri Sep 3 15:54:40 2010 +0300 + + xz: Make -vv show also decompressor memory usage. + +commit b4b1cbcb53624ab832f8b3189c74450dc7ea29b6 +Author: Lasse Collin +Date: Fri Sep 3 15:13:12 2010 +0300 + + Tweak the compression presets -0 .. -5. + + "Extreme" mode might need some further tweaking still. + Docs were not updated yet. + +commit 77fe5954cd3d10fb1837372684cbc133b56b6a87 +Author: Lasse Collin +Date: Fri Sep 3 12:28:41 2010 +0300 + + liblzma: Adjust default depth calculation for HC3 and HC4. + + It was 8 + nice_len / 4, now it is 4 + nice_len / 4. + This allows faster settings at lower nice_len values, + even though it seems that I won't use automatic depth + calcuation with HC3 and HC4 in the presets. + +commit fce69059cf901ce8075a78c7607d591f144a3b5a +Author: Lasse Collin +Date: Fri Sep 3 11:11:25 2010 +0300 + + xz: Make --help two lines shorter. + + At least for now, the --help option doesn't list any + options that take arguments, so "Mandatory arguments to..." + can be omitted. + +commit a848e47ced6e5e2a564b5c454b2f5a19c2f40298 +Author: Lasse Collin +Date: Thu Sep 2 19:22:35 2010 +0300 + + xz: Make setting a preset override a custom filter chain. + + This is more logical behavior than ignoring preset level + options once a custom filter chain has been specified. + +commit b3ff7ba044eaeab3e424d7b51fe914daf681b1a3 +Author: Lasse Collin +Date: Thu Sep 2 19:09:57 2010 +0300 + + xz: Always warn if adjusting dictionary size due to memlimit. + +commit d5653ba8a1ea9c00de4fddc617aba3c51e18139d +Author: Lasse Collin +Date: Tue Aug 10 11:04:30 2010 +0300 + + Fix test_compress.sh. + + It broke when --memory option was removed from xzdec. + + Thanks to Jonathan Nieder. + +commit 792331bdee706aa852a78b171040ebf814c6f3ae +Author: Lasse Collin +Date: Sat Aug 7 20:45:18 2010 +0300 + + Disable the memory usage limiter by default. + + For several people, the limiter causes bigger problems that + it solves, so it is better to have it disabled by default. + Those who want to have a limiter by default need to enable + it via the environment variable XZ_DEFAULTS. + + Support for environment variable XZ_DEFAULTS was added. It is + parsed before XZ_OPT and technically identical with it. The + intended uses differ quite a bit though; see the man page. + + The memory usage limit can now be set separately for + compression and decompression using --memlimit-compress and + --memlimit-decompress. To set both at once, -M or --memlimit + can be used. --memory was retained as a legacy alias for + --memlimit for backwards compatibility. + + The semantics of --info-memory were changed in backwards + incompatible way. Compatibility wasn't meaningful due to + changes in the memory usage limiter functionality. + + The memory usage limiter info is no longer shown at the + bottom of xz --long -help. + + The memory usage limiter support for removed completely from xzdec. + + xz's man page was updated to match the above changes. Various + unrelated fixes were also made to the man page. + +commit 4a45dd4c39f75d25c7a37b6400cb24d4010ca801 +Author: Lasse Collin +Date: Fri Aug 6 20:22:16 2010 +0300 + + Add missing const to a global constant in xz. + +commit 01aa4869cb220b7fdad6d1acbabb2233045daa8f +Author: Lasse Collin +Date: Wed Jul 28 11:44:55 2010 +0300 + + Language fixes for man pages. + + Thanks to A. Costa and Jonathan Nieder. + +commit ce1f0deafe8504e1492bf1b1efb3e3ec950b1a2b +Author: Lasse Collin +Date: Tue Jul 27 20:47:12 2010 +0300 + + Windows: Add a note about building a Git repository snapshot + +commit 507a4a4dea1e5462f12f7ed4b076c34e02054a38 +Author: Lasse Collin +Date: Tue Jul 27 20:45:03 2010 +0300 + + Windows: build.sh is a bash script so name it correctly. + +commit b1cbfd40f049a646a639eb78a3e41e9e3ef73339 +Author: Lasse Collin +Date: Tue Jul 27 20:27:32 2010 +0300 + + Windows: Don't strip liblzma.a too much. + +commit a540198ffb25fad36380c5e92ac20c2d28eec46a +Author: Lasse Collin +Date: Tue Jul 13 20:07:26 2010 +0300 + + Updated THANKS. + +commit bab0f01ed931f606b4675aa9f9331a17cec09bad +Author: Lasse Collin +Date: Tue Jul 13 19:55:50 2010 +0300 + + Add two simple example programs. + + Hopefully these help a bit when learning the basics + of liblzma API. I plan to write detailed examples about + both basic and advanced features with lots of comments, + but these two examples are good have right now. + + The examples were written by Daniel Mealha Cabrita. Thanks. + +commit c15c42abb3c8c6e77c778ef06c97a4a10b8b5d00 +Author: Lasse Collin +Date: Tue Jun 15 14:06:29 2010 +0300 + + Add --no-adjust. + +commit 2130926dd1c839280358172dfadd8d3054bde2b4 +Author: Lasse Collin +Date: Fri Jun 11 21:51:32 2010 +0300 + + Updated THANKS. + +commit bc612d0e0c9e4504c59d49168e87a7ae3e458443 +Author: Lasse Collin +Date: Fri Jun 11 21:48:32 2010 +0300 + + Clarify the description of the default memlimit in the man page. + + Thanks to Denis Excoffier. + +commit e1b6935d60a00405e6b5b455a3426d2248cc926c +Author: Lasse Collin +Date: Fri Jun 11 21:43:28 2010 +0300 + + Fix string to uint64_t conversion. + + Thanks to Denis Excoffier for the bug report. + +commit 3e49c8acb0f5312948eddb2342dbb5802d4571d0 +Author: Lasse Collin +Date: Fri Jun 11 10:40:28 2010 +0300 + + Put the git commit to the filename in mydist rule. + +commit d8b41eedce486d400f701b757b7b5e4e32276618 +Author: Lasse Collin +Date: Wed Jun 2 23:13:55 2010 +0300 + + Fix compiling with -Werror. + +commit b5fbab6123a39c9a55cd5d7af410e9aae067d5f8 +Author: Lasse Collin +Date: Wed Jun 2 23:09:22 2010 +0300 + + Silence a bogus Valgrind warning. + + When using -O2 with GCC, it liked to swap two comparisons + in one "if" statement. It's otherwise fine except that + the latter part, which is seemingly never executed, got + executed (nothing wrong with that) and then triggered + warning in Valgrind about conditional jump depending on + uninitialized variable. A few people find this annoying + so do things a bit differently to avoid the warning. + +commit 29a7b250e685852f2f97615493ec49acaf528623 +Author: Lasse Collin +Date: Wed Jun 2 21:32:12 2010 +0300 + + Fix a Windows-specific FIXME in signal handling code. + +commit e89d987056cee7d4e279be3ef3a6cc690bfc0e6d +Author: Lasse Collin +Date: Wed Jun 2 17:46:58 2010 +0300 + + Adjust SA_RESTART workaround. + + I want to get a bug report if something else than + DJGPP lacks SA_RESTART. + +commit e243145c84ab5c3be8259fd486ead0de5235b3f0 +Author: Lasse Collin +Date: Tue Jun 1 16:02:30 2010 +0300 + + xz man page updates. + + - Concatenating .xz files and padding + - List mode + - Robot mode + - A few examples (but many more are needed) + +commit ce6dc3c0a891f23a862f80ec08d3b6f0beb2a562 +Author: Lasse Collin +Date: Tue Jun 1 15:51:44 2010 +0300 + + Major update to xz --list. + +commit 905e54804a899e4ad526d38fdba7e803ab9b71bd +Author: Lasse Collin +Date: Tue Jun 1 14:13:03 2010 +0300 + + Rename message_filters_get() to message_filters_to_str(). + +commit 4b346ae8af20045027ae5efb068c6d69da3324d2 +Author: Lasse Collin +Date: Tue Jun 1 14:09:12 2010 +0300 + + Fix a comment. + +commit 07dc34f6da45c9ab757dad7fd5eef522ad27d296 +Author: Lasse Collin +Date: Thu May 27 16:17:42 2010 +0300 + + Fix lzma_block_compressed_size(). + +commit 44d70cb154225e47eebf15a3cfbdf3794cbb4593 +Author: Lasse Collin +Date: Thu May 27 14:32:51 2010 +0300 + + Take Cygwin into account in some #if lines. + + This change is no-op, but good to have just in case + for the future. + +commit a334348dc02803241cf4e0a539eecdc0e7ad2cc7 +Author: Lasse Collin +Date: Thu May 27 13:42:44 2010 +0300 + + Remove references to the Subblock filter in xz and tests. + + Thanks to Jonathan Nieder. + +commit 70e5e2f6a7084e6af909deee88ceac2f6efa7893 +Author: Lasse Collin +Date: Thu May 27 13:35:36 2010 +0300 + + Remove unused chunk_size.c. + + Thanks to Jonathan Nieder for the reminder. + +commit 01a414eaf4be6352c06b48001b041b47e8202faa +Author: Jonathan Nieder +Date: Thu May 27 02:31:33 2010 -0500 + + Use my_min() instead of MIN() in src/xz/list.c + + This should have been done in + 920a69a8d8e4203c5edddd829d932130eac188ea. + +commit 920a69a8d8e4203c5edddd829d932130eac188ea +Author: Lasse Collin +Date: Wed May 26 10:36:46 2010 +0300 + + Rename MIN() and MAX() to my_min() and my_max(). + + This should avoid some minor portability issues. + +commit 019ae27c24d0c694545a6a46f8b9fb552198b015 +Author: Lasse Collin +Date: Wed May 26 10:30:20 2010 +0300 + + Fix compilation of debug/known_sizes.c. + +commit 98a4856a6ea84f79c790057a6eb89a25bc45b074 +Author: Lasse Collin +Date: Wed May 26 10:28:54 2010 +0300 + + Remove references to Subblock filter in debug/sync_flush.c. + +commit 703d2c33c095c41ae0693ee8c27c45e3847e4535 +Author: Lasse Collin +Date: Wed May 26 10:16:57 2010 +0300 + + Better #error message. + +commit d8a55c48b39703dd83f11089ad01e1ff2ac102e0 +Author: Lasse Collin +Date: Wed May 26 09:55:47 2010 +0300 + + Remove the Subblock filter code for now. + + The spec isn't finished and the code didn't compile anymore. + It won't be included in XZ Utils 5.0.0. It's easy to get it + back once the spec is done. + +commit b6377fc990f9b8651149cae0fecb8b9c5904e26d +Author: Lasse Collin +Date: Sun May 16 18:42:22 2010 +0300 + + Split message_filters(). + + message_filters_to_str() converts the filter chain to + a string. message_filters_show() replaces the original + message_filters(). + + uint32_to_optstr() was also added to show the dictionary + size in nicer format when possible. + +commit d9986db782d6cf0f314342127280519339378fa0 +Author: Lasse Collin +Date: Fri May 14 23:17:20 2010 +0300 + + Omit lzma_restrict from the API headers. + + It isn't really useful so omitting it makes things + shorter and slightly more readable. + +commit 0d3489efca0a723dca0394809fa3e6170843af4b +Author: Lasse Collin +Date: Mon May 10 19:57:24 2010 +0300 + + Updated INSTALL. + +commit 3fb3d594a2b53886adee161b6261e92277f05f7c +Author: Lasse Collin +Date: Mon May 10 19:54:52 2010 +0300 + + Updated THANKS. + +commit 6548e304657e77d3a972053db3c41c5daf591113 +Author: Lasse Collin +Date: Mon May 10 19:54:15 2010 +0300 + + Updates to tuklib_physmem and tuklib_cpucores. + + Don't use #error to generate compile error, because some + compilers actually don't take it as an error. This fixes + tuklib_physmem on IRIX. + + Fix incorrect error check for sysconf() return values. + + Add AIX, HP-UX, and Tru64 specific code to detect the + amount RAM. + + Add HP-UX specific code to detect the number of CPU cores. + + Thanks a lot to Peter O'Gorman for initial patches, + testing, and debugging these fixes. + commit a290cfee3e23f046889c022aa96b4eca2016fdda Author: Lasse Collin Date: Mon Apr 12 21:55:56 2010 +0300 Added: vendor/xz/dist/FREEBSD-Xlist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/xz/dist/FREEBSD-Xlist Mon Oct 11 12:43:51 2010 (r213688) @@ -0,0 +1,37 @@ +$FreeBSD$ +*/*/*/Makefile.* +*/*/Makefile.* +*/.gitignore +*/Makefile.* +.git +.gitignore +ABOUT-NLS +COPYING.GPLv2 +COPYING.GPLv3 +COPYING.LGPLv2.1 +Doxyfile.in +INSTALL +INSTALL.generic +Makefile +Makefile.* +NEWS +PACKAGERS +aclocal.m4 +autogen.sh +build-aux/ +config.h.in +configure +configure.ac +debug/ +doc/ +dos/ +extra/ +lib/ +m4/ +makefile.am +src/*/*.rc +src/liblzma/liblzma.pc.in +src/scripts/ +tests/ +version.sh +windows/ Added: vendor/xz/dist/FREEBSD-upgrade ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/xz/dist/FREEBSD-upgrade Mon Oct 11 12:43:51 2010 (r213688) @@ -0,0 +1,28 @@ +$FreeBSD$ + +xz + +The source code is pulled with git: + + git clone git://ctrl.tukaani.org/xz.git xz + +ChangeLog is generated with: + + git log > ChangeLog + +For the import files and directories were pruned by: + +sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do rm -rf ./$F ; done' + +You may check if there are any new files that we don't need. + +The instructions for importing new release and merging to HEAD can be found +at FreeBSD wiki: + + http://wiki.freebsd.org/SubversionPrimer/VendorImports + +To make local changes to xz, simply patch and commit to the trunk +branch (aka HEAD). Never make local changes on the vendor branch. + +mm@FreeBSD.org +10-May-2010 Modified: vendor/xz/dist/README ============================================================================== --- vendor/xz/dist/README Mon Oct 11 11:25:37 2010 (r213687) +++ vendor/xz/dist/README Mon Oct 11 12:43:51 2010 (r213688) @@ -9,8 +9,9 @@ XZ Utils 1.3. Documentation for liblzma 2. Version numbering 3. Reporting bugs - 4. Other implementations of the .xz format - 5. Contact information + 4. Translating the xz tool + 5. Other implementations of the .xz format + 6. Contact information 0. Overview @@ -187,7 +188,94 @@ XZ Utils system. -4. Other implementations of the .xz format +4. Translating the xz tool +-------------------------- + + The messages from the xz tool have been translated into a few + languages. Before starting to translate into a new language, ask + the author that someone else hasn't already started working on it. + + Test your translation. Testing includes comparing the translated + output to the original English version by running the same commands + in both your target locale and with LC_ALL=C. Ask someone to + proof-read and test the translation. + + Testing can be done e.g. by installing xz into a temporary directory: + + ./configure --disable-shared --prefix=/tmp/xz-test + # + make -C po update-po + make install + bash debug/translations.bash | less + bash debug/translations.bash | less -S # For --list outputs + + Repeat the above as needed (no need to re-run configure though). + + Note especially the following: + + - The output of --help and --long-help must look nice on + a 80-column terminal. It's OK to add extra lines if needed. + + - In contrast, don't add extra lines to error messages and such. + They are often preceded with e.g. a filename on the same line, + so you have no way to predict where to put a \n. Let the terminal + do the wrapping even if it looks ugly. Adding new lines will be + even uglier in the generic case even if it looks nice in a few + limited examples. + + - Be careful with column alignment in tables and table-like output + (--list, --list --verbose --verbose, --info-memory, --help, and + --long-help): + + * All descriptions of options in --help should start in the + same column (but it doesn't need to be the same column as + in the English messages; just be consistent if you change it). + Check that both --help and --long-help look OK, since they + share several strings. + + * --list --verbose and --info-memory print lines that have + the format "Description: %s". If you need a longer + description, you can put extra space between the colon + and %s. Then you may need to add extra space to other + strings too so that the result as a whole looks good (all + values start at the same column). + + * The columns of the actual tables in --list --verbose --verbose + should be aligned properly. Abbreviate if necessary. It might + be good to keep at least 2 or 3 spaces between column headings + and avoid spaces in the headings so that the columns stand out + better, but this is a matter of opinion. Do what you think + looks best. + + - Be careful to put a period at the end of a sentence when the + original version has it, and don't put it when the original + doesn't have it. Similarly, be careful with \n characters + at the beginning and end of the strings. + + - Read the TRANSLATORS comments that have been extracted from the + source code and included in xz.pot. If they suggest testing the + translation with some type of command, do it. If testing needs + input files, use e.g. tests/files/good-*.xz. + + - When updating the translation, read the fuzzy (modified) strings + carefully, and don't mark them as updated before you actually + have updated them. Reading through the unchanged messages can be + good too; sometimes you may find a better wording for them. + + - If you find language problems in the original English strings, + feel free to suggest improvements. Ask if something is unclear. + + - The translated messages should be understandable (sometimes this + may be a problem with the original English messages too). Don't + make a direct word-by-word translation from English especially if + the result doesn't sound good in your language. + + In short, take your time and pay attention to the details. Making + a good translation is not a quick and trivial thing to do. The + translated xz should look as polished as the English version. + + +5. Other implementations of the .xz format ------------------------------------------ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Mon Oct 11 12:57:42 2010 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A9ED1065696; Mon, 11 Oct 2010 12:57:42 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0109D8FC17; Mon, 11 Oct 2010 12:57:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9BCvffx015880; Mon, 11 Oct 2010 12:57:41 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9BCvfFZ015879; Mon, 11 Oct 2010 12:57:41 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201010111257.o9BCvfFZ015879@svn.freebsd.org> From: Martin Matuska Date: Mon, 11 Oct 2010 12:57:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213689 - vendor/xz/20101010 X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Oct 2010 12:57:42 -0000 Author: mm Date: Mon Oct 11 12:57:41 2010 New Revision: 213689 URL: http://svn.freebsd.org/changeset/base/213689 Log: Tag xz code as 20101010 Git revision: d52b411716a614c202e89ba732492efb9916cd3f Approved by: delphij (mentor) Added: vendor/xz/20101010/ - copied from r213688, vendor/xz/dist/ From owner-svn-src-vendor@FreeBSD.ORG Mon Oct 11 20:34:36 2010 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41EDD10656A3; Mon, 11 Oct 2010 20:34:36 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 08DFD8FC2A; Mon, 11 Oct 2010 20:34:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9BKYZVf026698; Mon, 11 Oct 2010 20:34:35 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9BKYZIg026697; Mon, 11 Oct 2010 20:34:35 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201010112034.o9BKYZIg026697@svn.freebsd.org> From: Martin Matuska Date: Mon, 11 Oct 2010 20:34:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213699 - vendor/xz/dist X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Oct 2010 20:34:36 -0000 Author: mm Date: Mon Oct 11 20:34:35 2010 New Revision: 213699 URL: http://svn.freebsd.org/changeset/base/213699 Log: Remove two non-vendor files as recommended. Approved by: delphij (mentor) Deleted: vendor/xz/dist/FREEBSD-Xlist vendor/xz/dist/FREEBSD-upgrade From owner-svn-src-vendor@FreeBSD.ORG Wed Oct 13 20:35:34 2010 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7BBC106566B; Wed, 13 Oct 2010 20:35:34 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B273E8FC0A; Wed, 13 Oct 2010 20:35:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9DKZYkX099646; Wed, 13 Oct 2010 20:35:34 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9DKZY8f099630; Wed, 13 Oct 2010 20:35:34 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201010132035.o9DKZY8f099630@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 13 Oct 2010 20:35:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213800 - in vendor-sys/acpica/dist: . common compiler events include include/platform os_specific/service_layers tests/misc tools/acpiexec tools/acpisrc utilities X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2010 20:35:35 -0000 Author: jkim Date: Wed Oct 13 20:35:34 2010 New Revision: 213800 URL: http://svn.freebsd.org/changeset/base/213800 Log: Import ACPICA 20101013. Added: vendor-sys/acpica/dist/compiler/aslmessages.h (contents, props changed) vendor-sys/acpica/dist/tools/acpiexec/aetables.h (contents, props changed) Modified: vendor-sys/acpica/dist/changes.txt vendor-sys/acpica/dist/common/adisasm.c vendor-sys/acpica/dist/compiler/aslanalyze.c vendor-sys/acpica/dist/compiler/aslcodegen.c vendor-sys/acpica/dist/compiler/aslcompile.c vendor-sys/acpica/dist/compiler/aslcompiler.h vendor-sys/acpica/dist/compiler/asldefine.h vendor-sys/acpica/dist/compiler/aslmain.c vendor-sys/acpica/dist/compiler/aslresource.c vendor-sys/acpica/dist/compiler/aslrestype1.c vendor-sys/acpica/dist/compiler/aslrestype1i.c vendor-sys/acpica/dist/compiler/aslrestype2d.c vendor-sys/acpica/dist/compiler/aslrestype2e.c vendor-sys/acpica/dist/compiler/aslrestype2q.c vendor-sys/acpica/dist/compiler/aslrestype2w.c vendor-sys/acpica/dist/compiler/asltypes.h vendor-sys/acpica/dist/compiler/aslutils.c vendor-sys/acpica/dist/compiler/dtcompile.c vendor-sys/acpica/dist/compiler/dttemplate.c vendor-sys/acpica/dist/events/evxfregn.c vendor-sys/acpica/dist/include/acapps.h vendor-sys/acpica/dist/include/aclocal.h vendor-sys/acpica/dist/include/acpixf.h vendor-sys/acpica/dist/include/platform/acenv.h vendor-sys/acpica/dist/os_specific/service_layers/osunixdir.c vendor-sys/acpica/dist/os_specific/service_layers/osunixxf.c vendor-sys/acpica/dist/os_specific/service_layers/oswindir.c vendor-sys/acpica/dist/os_specific/service_layers/oswinxf.c vendor-sys/acpica/dist/osunixxf.c vendor-sys/acpica/dist/tests/misc/badcode.asl vendor-sys/acpica/dist/tools/acpiexec/Makefile vendor-sys/acpica/dist/tools/acpiexec/aemain.c vendor-sys/acpica/dist/tools/acpiexec/aetables.c vendor-sys/acpica/dist/tools/acpiexec/osunixdir.c vendor-sys/acpica/dist/tools/acpisrc/asmain.c vendor-sys/acpica/dist/tools/acpisrc/osunixdir.c vendor-sys/acpica/dist/utilities/utglobal.c vendor-sys/acpica/dist/utilities/utids.c vendor-sys/acpica/dist/utilities/utosi.c Modified: vendor-sys/acpica/dist/changes.txt ============================================================================== --- vendor-sys/acpica/dist/changes.txt Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/changes.txt Wed Oct 13 20:35:34 2010 (r213800) @@ -1,4 +1,64 @@ ---------------------------------------- +13 October 2010. Summary of changes for version 20101013: + +This release is available at www.acpica.org/downloads + +1) ACPI CA Core Subsystem: + +Added support to clear the PCIEXP_WAKE event. When clearing ACPI events, now +clear the PCIEXP_WAKE_STS bit in the ACPI PM1 Status Register, via +HwClearAcpiStatus. Original change from Colin King. ACPICA BZ 880. + +Changed the type of the predefined namespace object _TZ from ThermalZone to +Device. This was found to be confusing to the host software that processes +the various thermal zones, since _TZ is not really a ThermalZone. However, a +Notify() can still be performed on it. ACPICA BZ 876. Suggestion from Rui +Zhang. + +Added Windows Vista SP2 to the list of supported _OSI strings. The actual +string is "Windows 2006 SP2". + +Eliminated duplicate code in AcpiUtExecute* functions. Now that the nsrepair +code automatically repairs _HID-related strings, this type of code is no +longer needed in Execute_HID, Execute_CID, and Execute_UID. ACPICA BZ 878. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 89.9K Code, 19.0K Data, 108.9K Total + Debug Version: 166.3K Code, 52.1K Data, 218.4K Total + Current Release: + Non-Debug Version: 89.9K Code, 19.0K Data, 108.9K Total + Debug Version: 166.3K Code, 52.1K Data, 218.4K Total + +2) iASL Compiler/Disassembler and Tools: + +iASL: Implemented additional compile-time validation for _HID strings. The +non-hex prefix (such as "PNP" or "ACPI") must be uppercase, and the length of +the string must be exactly seven or eight characters. For both _HID and _CID +strings, all characters must be alphanumeric. ACPICA BZ 874. + +iASL: Allow certain "null" resource descriptors. Some BIOS code creates +descriptors that are mostly or all zeros, with the expectation that they will +be filled in at runtime. iASL now allows this as long as there is a "resource +tag" (name) associated with the descriptor, which gives the ASL a handle +needed to modify the descriptor. ACPICA BZ 873. + +Added single-thread support to the generic Unix application OSL. Primarily +for iASL support, this change removes the use of semaphores in the single- +threaded ACPICA tools/applications - increasing performance. The +_MULTI_THREADED option was replaced by the (reverse) ACPI_SINGLE_THREADED +option. ACPICA BZ 879. + +AcpiExec: several fixes for the 64-bit version. Adds XSDT support and support +for 64-bit DSDT/FACS addresses in the FADT. Lin Ming. + +iASL: Moved all compiler messages to a new file, aslmessages.h. + +---------------------------------------- 15 September 2010. Summary of changes for version 20100915: This release is available at www.acpica.org/downloads Modified: vendor-sys/acpica/dist/common/adisasm.c ============================================================================== --- vendor-sys/acpica/dist/common/adisasm.c Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/common/adisasm.c Wed Oct 13 20:35:34 2010 (r213800) @@ -612,10 +612,10 @@ AdDisassemblerHeader ( /* Header and input table info */ - AcpiOsPrintf ("/*\n * Intel ACPI Component Architecture\n"); - AcpiOsPrintf (" * AML Disassembler version %8.8X\n", ACPI_CA_VERSION); + AcpiOsPrintf ("/*\n"); + AcpiOsPrintf (ACPI_COMMON_HEADER ("AML Disassembler", " * ")); - AcpiOsPrintf (" *\n * Disassembly of %s, %s", Filename, ctime (&Timer)); + AcpiOsPrintf (" * Disassembly of %s, %s", Filename, ctime (&Timer)); AcpiOsPrintf (" *\n"); } Modified: vendor-sys/acpica/dist/compiler/aslanalyze.c ============================================================================== --- vendor-sys/acpica/dist/compiler/aslanalyze.c Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/compiler/aslanalyze.c Wed Oct 13 20:35:34 2010 (r213800) @@ -658,6 +658,95 @@ AnMapObjTypeToBtype ( /******************************************************************************* * + * FUNCTION: AnCheckId + * + * PARAMETERS: Op - Current parse op + * Type - HID or CID + * + * RETURN: None + * + * DESCRIPTION: Perform various checks on _HID and _CID strings. Only limited + * checks can be performed on _CID strings. + * + ******************************************************************************/ + +#define ASL_TYPE_HID 0 +#define ASL_TYPE_CID 1 +#include + +static void +AnCheckId ( + ACPI_PARSE_OBJECT *Op, + ACPI_NAME Type) +{ + UINT32 i; + ACPI_SIZE Length; + UINT32 AlphaPrefixLength; + + + if (Op->Asl.ParseOpcode != PARSEOP_STRING_LITERAL) + { + return; + } + + Length = strlen (Op->Asl.Value.String); + + /* + * If _HID/_CID is a string, all characters must be alphanumeric. + * One of the things we want to catch here is the use of + * a leading asterisk in the string -- an odd construct + * that certain platform manufacturers are fond of. + */ + for (i = 0; Op->Asl.Value.String[i]; i++) + { + if (!isalnum ((int) Op->Asl.Value.String[i])) + { + AslError (ASL_ERROR, ASL_MSG_ALPHANUMERIC_STRING, + Op, Op->Asl.Value.String); + break; + } + } + + if (Type == ASL_TYPE_CID) + { + /* _CID strings are bus-specific, no more checks can be performed */ + + return; + } + + /* _HID String must be of the form "XXX####" or "ACPI####" */ + + if ((Length < 7) || (Length > 8)) + { + AslError (ASL_ERROR, ASL_MSG_HID_LENGTH, + Op, Op->Asl.Value.String); + return; + } + + /* _HID Length is valid, now check for uppercase (first 3 or 4 chars) */ + + AlphaPrefixLength = 3; + if (Length >= 8) + { + AlphaPrefixLength = 4; + } + + /* Ensure the alphabetic prefix is all uppercase */ + + for (i = 0; (i < AlphaPrefixLength) && Op->Asl.Value.String[i]; i++) + { + if (!isupper ((int) Op->Asl.Value.String[i])) + { + AslError (ASL_ERROR, ASL_MSG_UPPER_CASE, + Op, &Op->Asl.Value.String[i]); + break; + } + } +} + + +/******************************************************************************* + * * FUNCTION: AnMethodAnalysisWalkBegin * * PARAMETERS: ASL_WALK_CALLBACK @@ -983,23 +1072,29 @@ AnMethodAnalysisWalkBegin ( if (!ACPI_STRCMP (METHOD_NAME__HID, Op->Asl.NameSeg)) { Next = Op->Asl.Child->Asl.Next; - if (Next->Asl.ParseOpcode == PARSEOP_STRING_LITERAL) + AnCheckId (Next, ASL_TYPE_HID); + } + + /* Special typechecking for _CID */ + + else if (!ACPI_STRCMP (METHOD_NAME__CID, Op->Asl.NameSeg)) + { + Next = Op->Asl.Child->Asl.Next; + + if ((Next->Asl.ParseOpcode == PARSEOP_PACKAGE) || + (Next->Asl.ParseOpcode == PARSEOP_VAR_PACKAGE)) { - /* - * _HID is a string, all characters must be alphanumeric. - * One of the things we want to catch here is the use of - * a leading asterisk in the string. - */ - for (i = 0; Next->Asl.Value.String[i]; i++) + Next = Next->Asl.Child; + while (Next) { - if (!isalnum ((int) Next->Asl.Value.String[i])) - { - AslError (ASL_ERROR, ASL_MSG_ALPHANUMERIC_STRING, - Next, Next->Asl.Value.String); - break; - } + AnCheckId (Next, ASL_TYPE_CID); + Next = Next->Asl.Next; } } + else + { + AnCheckId (Next, ASL_TYPE_CID); + } } break; Modified: vendor-sys/acpica/dist/compiler/aslcodegen.c ============================================================================== --- vendor-sys/acpica/dist/compiler/aslcodegen.c Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/compiler/aslcodegen.c Wed Oct 13 20:35:34 2010 (r213800) @@ -513,11 +513,11 @@ CgWriteTableHeader ( /* Compiler ID */ - strncpy (TableHeader.AslCompilerId, CompilerCreatorId, 4); + strncpy (TableHeader.AslCompilerId, ASL_CREATOR_ID, 4); /* Compiler version */ - TableHeader.AslCompilerRevision = CompilerCreatorRevision; + TableHeader.AslCompilerRevision = ASL_REVISION; /* Table length. Checksum zero for now, will rewrite later */ Modified: vendor-sys/acpica/dist/compiler/aslcompile.c ============================================================================== --- vendor-sys/acpica/dist/compiler/aslcompile.c Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/compiler/aslcompile.c Wed Oct 13 20:35:34 2010 (r213800) @@ -117,6 +117,7 @@ #include #include #include "aslcompiler.h" +#include #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslcompile") @@ -155,6 +156,7 @@ AslCompilerSignon ( UINT32 FileId) { char *Prefix = ""; + char *UtilityName; /* Set line prefix depending on the destination file type */ @@ -192,36 +194,21 @@ AslCompilerSignon ( break; } - /* - * Compiler signon with copyright - */ - FlPrintFile (FileId, - "%s\n%s%s\n%s", - Prefix, - Prefix, IntelAcpiCA, - Prefix); - /* Running compiler or disassembler? */ if (Gbl_DisasmFlag) { - FlPrintFile (FileId, - "%s", DisassemblerId); + UtilityName = AML_DISASSEMBLER_NAME; } else { - FlPrintFile (FileId, - "%s", CompilerId); + UtilityName = ASL_COMPILER_NAME; } - /* Version, build date, copyright, compliance */ + /* Compiler signon with copyright */ - FlPrintFile (FileId, - " version %X [%s]\n%s%s\n%s%s\n%s\n", - (UINT32) ACPI_CA_VERSION, __DATE__, - Prefix, CompilerCopyright, - Prefix, CompilerCompliance, - Prefix); + FlPrintFile (FileId, "%s\n", Prefix); + FlPrintFile (FileId, ACPI_COMMON_HEADER (UtilityName, Prefix)); } Modified: vendor-sys/acpica/dist/compiler/aslcompiler.h ============================================================================== --- vendor-sys/acpica/dist/compiler/aslcompiler.h Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/compiler/aslcompiler.h Wed Oct 13 20:35:34 2010 (r213800) @@ -147,6 +147,7 @@ #include "asldefine.h" #include "asltypes.h" +#include "aslmessages.h" #include "aslglobal.h" @@ -795,7 +796,8 @@ RsSmallAddressCheck ( ACPI_PARSE_OBJECT *MinOp, ACPI_PARSE_OBJECT *MaxOp, ACPI_PARSE_OBJECT *LengthOp, - ACPI_PARSE_OBJECT *AlignOp); + ACPI_PARSE_OBJECT *AlignOp, + ACPI_PARSE_OBJECT *Op); void RsLargeAddressCheck ( @@ -807,7 +809,8 @@ RsLargeAddressCheck ( ACPI_PARSE_OBJECT *MinOp, ACPI_PARSE_OBJECT *MaxOp, ACPI_PARSE_OBJECT *LengthOp, - ACPI_PARSE_OBJECT *GranOp); + ACPI_PARSE_OBJECT *GranOp, + ACPI_PARSE_OBJECT *Op); UINT16 RsGetStringDataLength ( Modified: vendor-sys/acpica/dist/compiler/asldefine.h ============================================================================== --- vendor-sys/acpica/dist/compiler/asldefine.h Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/compiler/asldefine.h Wed Oct 13 20:35:34 2010 (r213800) @@ -122,15 +122,13 @@ /* * Compiler versions and names */ -#define CompilerCreatorRevision ACPI_CA_VERSION +#define ASL_REVISION ACPI_CA_VERSION +#define ASL_COMPILER_NAME "ASL Optimizing Compiler" +#define AML_DISASSEMBLER_NAME "AML Disassembler" +#define ASL_INVOCATION_NAME "iasl" +#define ASL_CREATOR_ID "INTL" -#define IntelAcpiCA "Intel ACPI Component Architecture" -#define CompilerId "ASL Optimizing Compiler" -#define DisassemblerId "AML Disassembler" -#define CompilerCopyright "Copyright (c) 2000 - 2010 Intel Corporation" -#define CompilerCompliance "Supports ACPI Specification Revision 4.0a" -#define CompilerName "iasl" -#define CompilerCreatorId "INTL" +#define ASL_COMPLIANCE "Supports ACPI Specification Revision 4.0a" /* Configuration constants */ Modified: vendor-sys/acpica/dist/compiler/aslmain.c ============================================================================== --- vendor-sys/acpica/dist/compiler/aslmain.c Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/compiler/aslmain.c Wed Oct 13 20:35:34 2010 (r213800) @@ -296,7 +296,8 @@ Usage ( void) { - printf ("Usage: %s [Options] [Files]\n\n", CompilerName); + printf ("%s\n", ASL_COMPLIANCE); + printf ("Usage: %s [Options] [Files]\n\n", ASL_INVOCATION_NAME); Options (); } @@ -903,7 +904,7 @@ AslCommandLine ( if (argc < 2) { - AslCompilerSignon (ASL_FILE_STDOUT); + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); Usage (); exit (1); } @@ -934,7 +935,7 @@ AslCommandLine ( if (Gbl_DoSignon) { - AslCompilerSignon (ASL_FILE_STDOUT); + printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME)); } /* Abort if anything went wrong on the command line */ Added: vendor-sys/acpica/dist/compiler/aslmessages.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-sys/acpica/dist/compiler/aslmessages.h Wed Oct 13 20:35:34 2010 (r213800) @@ -0,0 +1,436 @@ + +/****************************************************************************** + * + * Module Name: aslmessages.h - Compiler error/warning messages + * + *****************************************************************************/ + +/****************************************************************************** + * + * 1. Copyright Notice + * + * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. + * All rights reserved. + * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + *****************************************************************************/ + + +#ifndef __ASLMESSAGES_H +#define __ASLMESSAGES_H + + +#define ASL_WARNING 0 +#define ASL_WARNING2 1 +#define ASL_WARNING3 2 +#define ASL_ERROR 3 +#define ASL_REMARK 4 +#define ASL_OPTIMIZATION 5 +#define ASL_NUM_REPORT_LEVELS 6 + + +/* Values for all compiler messages */ + +typedef enum +{ + ASL_MSG_RESERVED = 0, + ASL_MSG_ALPHANUMERIC_STRING, + ASL_MSG_AML_NOT_IMPLEMENTED, + ASL_MSG_ARG_COUNT_HI, + ASL_MSG_ARG_COUNT_LO, + ASL_MSG_ARG_INIT, + ASL_MSG_BACKWARDS_OFFSET, + ASL_MSG_BITS_TO_BYTES, + ASL_MSG_BUFFER_LENGTH, + ASL_MSG_BYTES_TO_BITS, + ASL_MSG_CLOSE, + ASL_MSG_COMPILER_INTERNAL, + ASL_MSG_CONSTANT_EVALUATION, + ASL_MSG_CONSTANT_FOLDED, + ASL_MSG_CORE_EXCEPTION, + ASL_MSG_DEBUG_FILE_OPEN, + ASL_MSG_DEBUG_FILENAME, + ASL_MSG_DEPENDENT_NESTING, + ASL_MSG_DMA_CHANNEL, + ASL_MSG_DMA_LIST, + ASL_MSG_DUPLICATE_CASE, + ASL_MSG_DUPLICATE_ITEM, + ASL_MSG_EARLY_EOF, + ASL_MSG_ENCODING_LENGTH, + ASL_MSG_EX_INTERRUPT_LIST, + ASL_MSG_EX_INTERRUPT_LIST_MIN, + ASL_MSG_EX_INTERRUPT_NUMBER, + ASL_MSG_FIELD_ACCESS_WIDTH, + ASL_MSG_FIELD_UNIT_ACCESS_WIDTH, + ASL_MSG_FIELD_UNIT_OFFSET, + ASL_MSG_INCLUDE_FILE_OPEN, + ASL_MSG_INPUT_FILE_OPEN, + ASL_MSG_INTEGER_LENGTH, + ASL_MSG_INTEGER_OPTIMIZATION, + ASL_MSG_INTERRUPT_LIST, + ASL_MSG_INTERRUPT_NUMBER, + ASL_MSG_INVALID_CONSTANT_OP, + ASL_MSG_INVALID_EISAID, + ASL_MSG_INVALID_ESCAPE, + ASL_MSG_INVALID_OPERAND, + ASL_MSG_INVALID_PERFORMANCE, + ASL_MSG_INVALID_PRIORITY, + ASL_MSG_INVALID_STRING, + ASL_MSG_INVALID_TARGET, + ASL_MSG_INVALID_TIME, + ASL_MSG_INVALID_TYPE, + ASL_MSG_INVALID_UUID, + ASL_MSG_LIST_LENGTH_LONG, + ASL_MSG_LIST_LENGTH_SHORT, + ASL_MSG_LISTING_FILE_OPEN, + ASL_MSG_LISTING_FILENAME, + ASL_MSG_LOCAL_INIT, + ASL_MSG_LONG_LINE, + ASL_MSG_MEMORY_ALLOCATION, + ASL_MSG_MISSING_ENDDEPENDENT, + ASL_MSG_MISSING_STARTDEPENDENT, + ASL_MSG_MULTIPLE_TYPES, + ASL_MSG_NAME_EXISTS, + ASL_MSG_NAME_OPTIMIZATION, + ASL_MSG_NESTED_COMMENT, + ASL_MSG_NO_CASES, + ASL_MSG_NO_RETVAL, + ASL_MSG_NO_WHILE, + ASL_MSG_NON_ASCII, + ASL_MSG_NOT_EXIST, + ASL_MSG_NOT_FOUND, + ASL_MSG_NOT_METHOD, + ASL_MSG_NOT_PARAMETER, + ASL_MSG_NOT_REACHABLE, + ASL_MSG_OPEN, + ASL_MSG_OUTPUT_FILE_OPEN, + ASL_MSG_OUTPUT_FILENAME, + ASL_MSG_PACKAGE_LENGTH, + ASL_MSG_READ, + ASL_MSG_RECURSION, + ASL_MSG_REGION_BUFFER_ACCESS, + ASL_MSG_REGION_BYTE_ACCESS, + ASL_MSG_RESERVED_ARG_COUNT_HI, + ASL_MSG_RESERVED_ARG_COUNT_LO, + ASL_MSG_RESERVED_METHOD, + ASL_MSG_RESERVED_OPERAND_TYPE, + ASL_MSG_RESERVED_RETURN_VALUE, + ASL_MSG_RESERVED_USE, + ASL_MSG_RESERVED_WORD, + ASL_MSG_RESOURCE_FIELD, + ASL_MSG_RESOURCE_INDEX, + ASL_MSG_RESOURCE_LIST, + ASL_MSG_RESOURCE_SOURCE, + ASL_MSG_RETURN_TYPES, + ASL_MSG_SCOPE_FWD_REF, + ASL_MSG_SCOPE_TYPE, + ASL_MSG_SEEK, + ASL_MSG_SINGLE_NAME_OPTIMIZATION, + ASL_MSG_SOME_NO_RETVAL, + ASL_MSG_SWITCH_TYPE, + ASL_MSG_SYNC_LEVEL, + ASL_MSG_SYNTAX, + ASL_MSG_TABLE_SIGNATURE, + ASL_MSG_TOO_MANY_TEMPS, + ASL_MSG_UNKNOWN_RESERVED_NAME, + ASL_MSG_UNREACHABLE_CODE, + ASL_MSG_UNSUPPORTED, + ASL_MSG_VENDOR_LIST, + ASL_MSG_WRITE, + ASL_MSG_MULTIPLE_DEFAULT, + ASL_MSG_TIMEOUT, + ASL_MSG_RESULT_NOT_USED, + ASL_MSG_NOT_REFERENCED, + ASL_MSG_NON_ZERO, + ASL_MSG_STRING_LENGTH, + ASL_MSG_SERIALIZED, + ASL_MSG_COMPILER_RESERVED, + ASL_MSG_NAMED_OBJECT_IN_WHILE, + ASL_MSG_LOCAL_OUTSIDE_METHOD, + ASL_MSG_ALIGNMENT, + ASL_MSG_ISA_ADDRESS, + ASL_MSG_INVALID_MIN_MAX, + ASL_MSG_INVALID_LENGTH, + ASL_MSG_INVALID_LENGTH_FIXED, + ASL_MSG_INVALID_GRANULARITY, + ASL_MSG_INVALID_GRAN_FIXED, + ASL_MSG_INVALID_ACCESS_SIZE, + ASL_MSG_INVALID_ADDR_FLAGS, + ASL_MSG_NULL_DESCRIPTOR, + ASL_MSG_UPPER_CASE, + ASL_MSG_HID_LENGTH, + ASL_MSG_INVALID_FIELD_NAME, + ASL_MSG_INTEGER_SIZE, + ASL_MSG_INVALID_HEX_INTEGER, + ASL_MSG_BUFFER_ELEMENT, + ASL_MSG_RESERVED_VALUE, + ASL_MSG_FLAG_VALUE, + ASL_MSG_ZERO_VALUE, + ASL_MSG_UNKNOWN_TABLE, + ASL_MSG_UNKNOWN_SUBTABLE, + ASL_MSG_OEM_TABLE + +} ASL_MESSAGE_IDS; + + +#ifdef ASL_EXCEPTIONS + +/* Actual message strings for each compiler message */ + +char *AslMessages [] = { +/* The zeroth message is reserved */ "", +/* ASL_MSG_ALPHANUMERIC_STRING */ "String must be entirely alphanumeric", +/* ASL_MSG_AML_NOT_IMPLEMENTED */ "Opcode is not implemented in compiler AML code generator", +/* ASL_MSG_ARG_COUNT_HI */ "Too many arguments", +/* ASL_MSG_ARG_COUNT_LO */ "Too few arguments", +/* ASL_MSG_ARG_INIT */ "Method argument is not initialized", +/* ASL_MSG_BACKWARDS_OFFSET */ "Invalid backwards offset", +/* ASL_MSG_BITS_TO_BYTES */ "Field offset is in bits, but a byte offset is required", +/* ASL_MSG_BUFFER_LENGTH */ "Effective AML buffer length is zero", +/* ASL_MSG_BYTES_TO_BITS */ "Field offset is in bytes, but a bit offset is required", +/* ASL_MSG_CLOSE */ "Could not close file", +/* ASL_MSG_COMPILER_INTERNAL */ "Internal compiler error", +/* ASL_MSG_CONSTANT_EVALUATION */ "Could not evaluate constant expression", +/* ASL_MSG_CONSTANT_FOLDED */ "Constant expression evaluated and reduced", +/* ASL_MSG_CORE_EXCEPTION */ "From ACPI CA Subsystem", +/* ASL_MSG_DEBUG_FILE_OPEN */ "Could not open debug file", +/* ASL_MSG_DEBUG_FILENAME */ "Could not create debug filename", +/* ASL_MSG_DEPENDENT_NESTING */ "Dependent function macros cannot be nested",\ +/* ASL_MSG_DMA_CHANNEL */ "Invalid DMA channel (must be 0-7)", +/* ASL_MSG_DMA_LIST */ "Too many DMA channels (8 max)", +/* ASL_MSG_DUPLICATE_CASE */ "Case value already specified", +/* ASL_MSG_DUPLICATE_ITEM */ "Duplicate value in list", +/* ASL_MSG_EARLY_EOF */ "Premature end-of-file reached", +/* ASL_MSG_ENCODING_LENGTH */ "Package length too long to encode", +/* ASL_MSG_EX_INTERRUPT_LIST */ "Too many interrupts (255 max)", +/* ASL_MSG_EX_INTERRUPT_LIST_MIN */ "Too few interrupts (1 minimum required)", +/* ASL_MSG_EX_INTERRUPT_NUMBER */ "Invalid interrupt number (must be 32 bits)", +/* ASL_MSG_FIELD_ACCESS_WIDTH */ "Access width is greater than region size", +/* ASL_MSG_FIELD_UNIT_ACCESS_WIDTH */ "Access width of Field Unit extends beyond region limit", +/* ASL_MSG_FIELD_UNIT_OFFSET */ "Field Unit extends beyond region limit", +/* ASL_MSG_INCLUDE_FILE_OPEN */ "Could not open include file", +/* ASL_MSG_INPUT_FILE_OPEN */ "Could not open input file", +/* ASL_MSG_INTEGER_LENGTH */ "64-bit integer in 32-bit table, truncating", +/* ASL_MSG_INTEGER_OPTIMIZATION */ "Integer optimized to single-byte AML opcode", +/* ASL_MSG_INTERRUPT_LIST */ "Too many interrupts (16 max)", +/* ASL_MSG_INTERRUPT_NUMBER */ "Invalid interrupt number (must be 0-15)", +/* ASL_MSG_INVALID_CONSTANT_OP */ "Invalid operator in constant expression (not type 3/4/5)", +/* ASL_MSG_INVALID_EISAID */ "EISAID string must be of the form \"UUUXXXX\" (3 uppercase, 4 hex digits)", +/* ASL_MSG_INVALID_ESCAPE */ "Invalid or unknown escape sequence", +/* ASL_MSG_INVALID_OPERAND */ "Invalid operand", +/* ASL_MSG_INVALID_PERFORMANCE */ "Invalid performance/robustness value", +/* ASL_MSG_INVALID_PRIORITY */ "Invalid priority value", +/* ASL_MSG_INVALID_STRING */ "Invalid Hex/Octal Escape - Non-ASCII or NULL", +/* ASL_MSG_INVALID_TARGET */ "Target operand not allowed in constant expression", +/* ASL_MSG_INVALID_TIME */ "Time parameter too long (255 max)", +/* ASL_MSG_INVALID_TYPE */ "Invalid type", +/* ASL_MSG_INVALID_UUID */ "UUID string must be of the form \"aabbccdd-eeff-gghh-iijj-kkllmmnnoopp\"", +/* ASL_MSG_LIST_LENGTH_LONG */ "Initializer list longer than declared package length", +/* ASL_MSG_LIST_LENGTH_SHORT */ "Initializer list shorter than declared package length", +/* ASL_MSG_LISTING_FILE_OPEN */ "Could not open listing file", +/* ASL_MSG_LISTING_FILENAME */ "Could not create listing filename", +/* ASL_MSG_LOCAL_INIT */ "Method local variable is not initialized", +/* ASL_MSG_LONG_LINE */ "Splitting long input line", +/* ASL_MSG_MEMORY_ALLOCATION */ "Memory allocation failure", +/* ASL_MSG_MISSING_ENDDEPENDENT */ "Missing EndDependentFn() macro in dependent resource list", +/* ASL_MSG_MISSING_STARTDEPENDENT */ "Missing StartDependentFn() macro in dependent resource list", +/* ASL_MSG_MULTIPLE_TYPES */ "Multiple types", +/* ASL_MSG_NAME_EXISTS */ "Name already exists in scope", +/* ASL_MSG_NAME_OPTIMIZATION */ "NamePath optimized", +/* ASL_MSG_NESTED_COMMENT */ "Nested comment found", +/* ASL_MSG_NO_CASES */ "No Case statements under Switch", +/* ASL_MSG_NO_RETVAL */ "Called method returns no value", +/* ASL_MSG_NO_WHILE */ "No enclosing While statement", +/* ASL_MSG_NON_ASCII */ "Invalid characters found in file", +/* ASL_MSG_NOT_EXIST */ "Object does not exist", +/* ASL_MSG_NOT_FOUND */ "Object not found or not accessible from scope", +/* ASL_MSG_NOT_METHOD */ "Not a control method, cannot invoke", +/* ASL_MSG_NOT_PARAMETER */ "Not a parameter, used as local only", +/* ASL_MSG_NOT_REACHABLE */ "Object is not accessible from this scope", +/* ASL_MSG_OPEN */ "Could not open file", +/* ASL_MSG_OUTPUT_FILE_OPEN */ "Could not open output AML file", +/* ASL_MSG_OUTPUT_FILENAME */ "Could not create output filename", +/* ASL_MSG_PACKAGE_LENGTH */ "Effective AML package length is zero", +/* ASL_MSG_READ */ "Could not read file", +/* ASL_MSG_RECURSION */ "Recursive method call", +/* ASL_MSG_REGION_BUFFER_ACCESS */ "Host Operation Region requires BufferAcc access", +/* ASL_MSG_REGION_BYTE_ACCESS */ "Host Operation Region requires ByteAcc access", +/* ASL_MSG_RESERVED_ARG_COUNT_HI */ "Reserved method has too many arguments", +/* ASL_MSG_RESERVED_ARG_COUNT_LO */ "Reserved method has too few arguments", +/* ASL_MSG_RESERVED_METHOD */ "Reserved name must be a control method", +/* ASL_MSG_RESERVED_OPERAND_TYPE */ "Invalid object type for reserved name", +/* ASL_MSG_RESERVED_RETURN_VALUE */ "Reserved method must return a value", +/* ASL_MSG_RESERVED_USE */ "Invalid use of reserved name", +/* ASL_MSG_RESERVED_WORD */ "Use of reserved name", +/* ASL_MSG_RESOURCE_FIELD */ "Resource field name cannot be used as a target", +/* ASL_MSG_RESOURCE_INDEX */ "Missing ResourceSourceIndex (required)", +/* ASL_MSG_RESOURCE_LIST */ "Too many resource items (internal error)", +/* ASL_MSG_RESOURCE_SOURCE */ "Missing ResourceSource string (required)", +/* ASL_MSG_RETURN_TYPES */ "Not all control paths return a value", +/* ASL_MSG_SCOPE_FWD_REF */ "Forward references from Scope operator not allowed", +/* ASL_MSG_SCOPE_TYPE */ "Existing object has invalid type for Scope operator", +/* ASL_MSG_SEEK */ "Could not seek file", +/* ASL_MSG_SINGLE_NAME_OPTIMIZATION */ "NamePath optimized to NameSeg (uses run-time search path)", +/* ASL_MSG_SOME_NO_RETVAL */ "Called method may not always return a value", +/* ASL_MSG_SWITCH_TYPE */ "Switch expression is not a static Integer/Buffer/String data type, defaulting to Integer", +/* ASL_MSG_SYNC_LEVEL */ "SyncLevel must be in the range 0-15", +/* ASL_MSG_SYNTAX */ "", +/* ASL_MSG_TABLE_SIGNATURE */ "Invalid Table Signature", +/* ASL_MSG_TOO_MANY_TEMPS */ "Method requires too many temporary variables (_T_x)", +/* ASL_MSG_UNKNOWN_RESERVED_NAME */ "Unknown reserved name", +/* ASL_MSG_UNREACHABLE_CODE */ "Statement is unreachable", +/* ASL_MSG_UNSUPPORTED */ "Unsupported feature", +/* ASL_MSG_VENDOR_LIST */ "Too many vendor data bytes (7 max)", +/* ASL_MSG_WRITE */ "Could not write file", +/* ASL_MSG_MULTIPLE_DEFAULT */ "More than one Default statement within Switch construct", +/* ASL_MSG_TIMEOUT */ "Possible operator timeout is ignored", +/* ASL_MSG_RESULT_NOT_USED */ "Result is not used, operator has no effect", +/* ASL_MSG_NOT_REFERENCED */ "Namespace object is not referenced", +/* ASL_MSG_NON_ZERO */ "Operand evaluates to zero", +/* ASL_MSG_STRING_LENGTH */ "String literal too long", +/* ASL_MSG_SERIALIZED */ "Control Method marked Serialized", +/* ASL_MSG_COMPILER_RESERVED */ "Use of compiler reserved name", +/* ASL_MSG_NAMED_OBJECT_IN_WHILE */ "Creating a named object in a While loop", +/* ASL_MSG_LOCAL_OUTSIDE_METHOD */ "Local or Arg used outside a control method", +/* ASL_MSG_ALIGNMENT */ "Must be a multiple of alignment/granularity value", +/* ASL_MSG_ISA_ADDRESS */ "Maximum 10-bit ISA address (0x3FF)", +/* ASL_MSG_INVALID_MIN_MAX */ "Address Min is greater than Address Max", +/* ASL_MSG_INVALID_LENGTH */ "Length is larger than Min/Max window", +/* ASL_MSG_INVALID_LENGTH_FIXED */ "Length is not equal to fixed Min/Max window", +/* ASL_MSG_INVALID_GRANULARITY */ "Granularity must be zero or a power of two minus one", +/* ASL_MSG_INVALID_GRAN_FIXED */ "Granularity must be zero for fixed Min/Max", +/* ASL_MSG_INVALID_ACCESS_SIZE */ "Invalid AccessSize (Maximum is 4 - QWord access)", +/* ASL_MSG_INVALID_ADDR_FLAGS */ "Invalid combination of Length and Min/Max fixed flags", +/* ASL_MSG_NULL_DESCRIPTOR */ "Min/Max/Length/Gran are all zero, but no resource tag", +/* ASL_MSG_UPPER_CASE */ "Non-hex letters must be upper case", +/* ASL_MSG_HID_LENGTH */ "_HID string must be exactly 7 or 8 characters", + +/* These messages are used by the data table compiler only */ + +/* ASL_MSG_INVALID_FIELD_NAME */ "Invalid Field Name", +/* ASL_MSG_INTEGER_SIZE */ "Integer too large for target", +/* ASL_MSG_INVALID_HEX_INTEGER */ "Invalid hex integer constant", +/* ASL_MSG_BUFFER_ELEMENT */ "Invalid element in buffer initializer list", +/* ASL_MSG_RESERVED_VALUE */ "Reserved field must be zero", +/* ASL_MSG_FLAG_VALUE */ "Flag value is too large", +/* ASL_MSG_ZERO_VALUE */ "Value must be non-zero", +/* ASL_MSG_UNKNOWN_TABLE */ "Unknown ACPI table signature", +/* ASL_MSG_UNKNOWN_SUBTABLE */ "Unknown subtable type", +/* ASL_MSG_OEM_TABLE */ "OEM table - unknown contents" + +}; + + +char *AslErrorLevel [ASL_NUM_REPORT_LEVELS] = { + "Warning ", + "Warning ", + "Warning ", + "Error ", + "Remark ", + "Optimize" +}; + +#define ASL_ERROR_LEVEL_LENGTH 8 /* Length of strings above */ + +#endif /* ASL_EXCEPTIONS */ + +#endif /* __ASLMESSAGES_H */ Modified: vendor-sys/acpica/dist/compiler/aslresource.c ============================================================================== --- vendor-sys/acpica/dist/compiler/aslresource.c Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/compiler/aslresource.c Wed Oct 13 20:35:34 2010 (r213800) @@ -139,6 +139,7 @@ * NULL, means "zero value for alignment is * OK, and means 64K alignment" (for * Memory24 descriptor) + * Op - Parent Op for entire construct * * RETURN: None. Adds error messages to error log if necessary * @@ -158,7 +159,8 @@ RsSmallAddressCheck ( ACPI_PARSE_OBJECT *MinOp, ACPI_PARSE_OBJECT *MaxOp, ACPI_PARSE_OBJECT *LengthOp, - ACPI_PARSE_OBJECT *AlignOp) + ACPI_PARSE_OBJECT *AlignOp, + ACPI_PARSE_OBJECT *Op) { if (Gbl_NoResourceChecking) @@ -166,6 +168,34 @@ RsSmallAddressCheck ( return; } + /* + * Check for a so-called "null descriptor". These are descriptors that are + * created with most fields set to zero. The intent is that the descriptor + * will be updated/completed at runtime via a BufferField. + * + * If the descriptor does NOT have a resource tag, it cannot be referenced + * by a BufferField and we will flag this as an error. Conversely, if + * the descriptor has a resource tag, we will assume that a BufferField + * will be used to dynamically update it, so no error. + * + * A possible enhancement to this check would be to verify that in fact + * a BufferField is created using the resource tag, and perhaps even + * verify that a Store is performed to the BufferField. + * + * Note: for these descriptors, Alignment is allowed to be zero + */ + if (!Minimum && !Maximum && !Length) + { + if (!Op->Asl.ExternalName) + { + /* No resource tag. Descriptor is fixed and is also illegal */ + + AslError (ASL_ERROR, ASL_MSG_NULL_DESCRIPTOR, Op, NULL); + } + + return; + } + /* Special case for Memory24, values are compressed */ if (Type == ACPI_RESOURCE_NAME_MEMORY24) @@ -230,6 +260,7 @@ RsSmallAddressCheck ( * MaxOp - Original Op for Address Max * LengthOp - Original Op for address range * GranOp - Original Op for address granularity + * Op - Parent Op for entire construct * * RETURN: None. Adds error messages to error log if necessary * @@ -259,7 +290,8 @@ RsLargeAddressCheck ( ACPI_PARSE_OBJECT *MinOp, ACPI_PARSE_OBJECT *MaxOp, ACPI_PARSE_OBJECT *LengthOp, - ACPI_PARSE_OBJECT *GranOp) + ACPI_PARSE_OBJECT *GranOp, + ACPI_PARSE_OBJECT *Op) { if (Gbl_NoResourceChecking) @@ -267,6 +299,32 @@ RsLargeAddressCheck ( return; } + /* + * Check for a so-called "null descriptor". These are descriptors that are + * created with most fields set to zero. The intent is that the descriptor + * will be updated/completed at runtime via a BufferField. + * + * If the descriptor does NOT have a resource tag, it cannot be referenced + * by a BufferField and we will flag this as an error. Conversely, if + * the descriptor has a resource tag, we will assume that a BufferField + * will be used to dynamically update it, so no error. + * + * A possible enhancement to this check would be to verify that in fact + * a BufferField is created using the resource tag, and perhaps even + * verify that a Store is performed to the BufferField. + */ + if (!Minimum && !Maximum && !Length && !Granularity) + { + if (!Op->Asl.ExternalName) + { + /* No resource tag. Descriptor is fixed and is also illegal */ + + AslError (ASL_ERROR, ASL_MSG_NULL_DESCRIPTOR, Op, NULL); + } + + return; + } + /* Basic checks on Min/Max/Length */ if (Minimum > Maximum) Modified: vendor-sys/acpica/dist/compiler/aslrestype1.c ============================================================================== --- vendor-sys/acpica/dist/compiler/aslrestype1.c Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/compiler/aslrestype1.c Wed Oct 13 20:35:34 2010 (r213800) @@ -300,7 +300,7 @@ RsDoMemory24Descriptor ( Descriptor->Memory24.Maximum, Descriptor->Memory24.AddressLength, Descriptor->Memory24.Alignment, - MinOp, MaxOp, LengthOp, NULL); + MinOp, MaxOp, LengthOp, NULL, Op); return (Rnode); } @@ -408,7 +408,7 @@ RsDoMemory32Descriptor ( Descriptor->Memory32.Maximum, Descriptor->Memory32.AddressLength, Descriptor->Memory32.Alignment, - MinOp, MaxOp, LengthOp, AlignOp); + MinOp, MaxOp, LengthOp, AlignOp, Op); return (Rnode); } Modified: vendor-sys/acpica/dist/compiler/aslrestype1i.c ============================================================================== --- vendor-sys/acpica/dist/compiler/aslrestype1i.c Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/compiler/aslrestype1i.c Wed Oct 13 20:35:34 2010 (r213800) @@ -439,7 +439,7 @@ RsDoIoDescriptor ( Descriptor->Io.Maximum, Descriptor->Io.AddressLength, Descriptor->Io.Alignment, - MinOp, MaxOp, LengthOp, AlignOp); + MinOp, MaxOp, LengthOp, AlignOp, Op); return (Rnode); } Modified: vendor-sys/acpica/dist/compiler/aslrestype2d.c ============================================================================== --- vendor-sys/acpica/dist/compiler/aslrestype2d.c Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/compiler/aslrestype2d.c Wed Oct 13 20:35:34 2010 (r213800) @@ -352,7 +352,7 @@ RsDoDwordIoDescriptor ( (UINT64) Descriptor->Address32.AddressLength, (UINT64) Descriptor->Address32.Granularity, Descriptor->Address32.Flags, - MinOp, MaxOp, LengthOp, GranOp); + MinOp, MaxOp, LengthOp, GranOp, Op); Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; @@ -588,7 +588,7 @@ RsDoDwordMemoryDescriptor ( (UINT64) Descriptor->Address32.AddressLength, (UINT64) Descriptor->Address32.Granularity, Descriptor->Address32.Flags, - MinOp, MaxOp, LengthOp, GranOp); + MinOp, MaxOp, LengthOp, GranOp, Op); Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; @@ -806,7 +806,7 @@ RsDoDwordSpaceDescriptor ( (UINT64) Descriptor->Address32.AddressLength, (UINT64) Descriptor->Address32.Granularity, Descriptor->Address32.Flags, - MinOp, MaxOp, LengthOp, GranOp); + MinOp, MaxOp, LengthOp, GranOp, Op); Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; Modified: vendor-sys/acpica/dist/compiler/aslrestype2e.c ============================================================================== --- vendor-sys/acpica/dist/compiler/aslrestype2e.c Wed Oct 13 20:08:02 2010 (r213799) +++ vendor-sys/acpica/dist/compiler/aslrestype2e.c Wed Oct 13 20:35:34 2010 (r213800) @@ -294,7 +294,7 @@ RsDoExtendedIoDescriptor ( Descriptor->ExtAddress64.AddressLength, Descriptor->ExtAddress64.Granularity, Descriptor->ExtAddress64.Flags, - MinOp, MaxOp, LengthOp, GranOp); + MinOp, MaxOp, LengthOp, GranOp, Op); Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; return (Rnode); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Wed Oct 13 20:36:43 2010 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05FEE1065694; Wed, 13 Oct 2010 20:36:43 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CEE298FC0A; Wed, 13 Oct 2010 20:36:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9DKagvv099711; Wed, 13 Oct 2010 20:36:42 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9DKag8w099710; Wed, 13 Oct 2010 20:36:42 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201010132036.o9DKag8w099710@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 13 Oct 2010 20:36:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213801 - vendor-sys/acpica/20101013 X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2010 20:36:43 -0000 Author: jkim Date: Wed Oct 13 20:36:42 2010 New Revision: 213801 URL: http://svn.freebsd.org/changeset/base/213801 Log: Tag ACPICA 20101013. Added: vendor-sys/acpica/20101013/ - copied from r213800, vendor-sys/acpica/dist/