[xiph-commits] r13925 - in trunk/theora: examples lib/dec lib/enc
lib/enc/x86_32 lib/enc/x86_32_vs lib/enc/x86_64 win32
win32/VS2003/libtheora win32/VS2005 win32/VS2005/dump_video
win32/VS2005/encoder_example win32/VS2005/libtheora
sping at svn.xiph.org
sping at svn.xiph.org
Wed Oct 3 11:51:06 PDT 2007
Author: sping
Date: 2007-10-03 11:51:06 -0700 (Wed, 03 Oct 2007)
New Revision: 13925
Modified:
trunk/theora/examples/png2theora.c
trunk/theora/lib/dec/apiwrapper.c
trunk/theora/lib/dec/apiwrapper.h
trunk/theora/lib/dec/decapiwrapper.c
trunk/theora/lib/enc/dsp.c
trunk/theora/lib/enc/dsp.h
trunk/theora/lib/enc/x86_32/dct_decode_mmx.c
trunk/theora/lib/enc/x86_32/idct_mmx.c
trunk/theora/lib/enc/x86_32_vs/fdct_mmx.c
trunk/theora/lib/enc/x86_32_vs/recon_mmx.c
trunk/theora/lib/enc/x86_64/dct_decode_mmx.c
trunk/theora/lib/enc/x86_64/idct_mmx.c
trunk/theora/win32/VS2003/libtheora/libtheora.vcproj
trunk/theora/win32/VS2005/dump_video/dump_video.vcproj
trunk/theora/win32/VS2005/encoder_example/encoder_example.vcproj
trunk/theora/win32/VS2005/libtheora/libtheora.vcproj
trunk/theora/win32/VS2005/theora.sln
trunk/theora/win32/build_theora_static.bat
trunk/theora/win32/build_theora_static_debug.bat
trunk/theora/win32/getopt.c
trunk/theora/win32/getopt1.c
trunk/theora/win32/getopt_win.h
Log:
Line ending properties: *.{c,h} to native, *.{vcproj,sln,bat} to CRLF
Property changes on: trunk/theora/examples/png2theora.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/theora/lib/dec/apiwrapper.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/theora/lib/dec/apiwrapper.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/theora/lib/dec/decapiwrapper.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/theora/lib/enc/dsp.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/theora/lib/enc/dsp.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/theora/lib/enc/x86_32/dct_decode_mmx.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/theora/lib/enc/x86_32/idct_mmx.c
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/theora/lib/enc/x86_32_vs/fdct_mmx.c
===================================================================
--- trunk/theora/lib/enc/x86_32_vs/fdct_mmx.c 2007-10-03 01:50:11 UTC (rev 13924)
+++ trunk/theora/lib/enc/x86_32_vs/fdct_mmx.c 2007-10-03 18:51:06 UTC (rev 13925)
@@ -1,334 +1,334 @@
-;//==========================================================================
-;//
-;// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY
-;// KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-;// IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR
-;// PURPOSE.
-;//
-;// Copyright (c) 1999 - 2001 On2 Technologies Inc. All Rights Reserved.
-;//
-;//--------------------------------------------------------------------------
-
-#include "theora/theora.h"
-#include "codec_internal.h"
-#include "dsp.h"
-
-
-static const ogg_int64_t xC1S7 = 0x0fb15fb15fb15fb15LL;
-static const ogg_int64_t xC2S6 = 0x0ec83ec83ec83ec83LL;
-static const ogg_int64_t xC3S5 = 0x0d4dbd4dbd4dbd4dbLL;
-static const ogg_int64_t xC4S4 = 0x0b505b505b505b505LL;
-static const ogg_int64_t xC5S3 = 0x08e3a8e3a8e3a8e3aLL;
-static const ogg_int64_t xC6S2 = 0x061f861f861f861f8LL;
-static const ogg_int64_t xC7S1 = 0x031f131f131f131f1LL;
-
-
-static __inline void Transpose_mmx( ogg_int16_t *InputData1, ogg_int16_t *OutputData1,
- ogg_int16_t *InputData2, ogg_int16_t *OutputData2)
-{
-
- __asm {
- align 16
- mov eax, InputData1
- mov ebx, InputData2
- mov ecx, OutputData1
- mov edx, OutputData2
-
-
- movq mm0, [eax] ; /* mm0 = a0 a1 a2 a3 */
- movq mm4, [ebx] ; /* mm4 = e4 e5 e6 e7 */
- movq mm1, [16 + eax] ; /* mm1 = b0 b1 b2 b3 */
- movq mm5, [16 + ebx] ; /* mm5 = f4 f5 f6 f7 */
- movq mm2, [32 + eax] ; /* mm2 = c0 c1 c2 c3 */
- movq mm6, [32 + ebx] ; /* mm6 = g4 g5 g6 g7 */
- movq mm3, [48 + eax] ; /* mm3 = d0 d1 d2 d3 */
- movq [16 + ecx], mm1 ; /* save b0 b1 b2 b3 */
- movq mm7, [48 + ebx] ; /* mm7 = h0 h1 h2 h3 */
- ; /* Transpose 2x8 block */
- movq mm1, mm4 ; /* mm1 = e3 e2 e1 e0 */
- punpcklwd mm4, mm5 ; /* mm4 = f1 e1 f0 e0 */
- movq [ecx], mm0 ; /* save a3 a2 a1 a0 */
- punpckhwd mm1, mm5 ; /* mm1 = f3 e3 f2 e2 */
- movq mm0, mm6 ; /* mm0 = g3 g2 g1 g0 */
- punpcklwd mm6, mm7 ; /* mm6 = h1 g1 h0 g0 */
- movq mm5, mm4 ; /* mm5 = f1 e1 f0 e0 */
- punpckldq mm4, mm6 ; /* mm4 = h0 g0 f0 e0 = MM4 */
- punpckhdq mm5, mm6 ; /* mm5 = h1 g1 f1 e1 = MM5 */
- movq mm6, mm1 ; /* mm6 = f3 e3 f2 e2 */
- movq [edx], mm4 ;
- punpckhwd mm0, mm7 ; /* mm0 = h3 g3 h2 g2 */
- movq [16 + edx], mm5 ;
- punpckhdq mm6, mm0 ; /* mm6 = h3 g3 f3 e3 = MM7 */
- movq mm4, [ecx] ; /* mm4 = a3 a2 a1 a0 */
- punpckldq mm1, mm0 ; /* mm1 = h2 g2 f2 e2 = MM6 */
- movq mm5, [16 + ecx] ; /* mm5 = b3 b2 b1 b0 */
- movq mm0, mm4 ; /* mm0 = a3 a2 a1 a0 */
- movq [48 + edx], mm6 ;
- punpcklwd mm0, mm5 ; /* mm0 = b1 a1 b0 a0 */
- movq [32 + edx], mm1 ;
- punpckhwd mm4, mm5 ; /* mm4 = b3 a3 b2 a2 */
- movq mm5, mm2 ; /* mm5 = c3 c2 c1 c0 */
- punpcklwd mm2, mm3 ; /* mm2 = d1 c1 d0 c0 */
- movq mm1, mm0 ; /* mm1 = b1 a1 b0 a0 */
- punpckldq mm0, mm2 ; /* mm0 = d0 c0 b0 a0 = MM0 */
- punpckhdq mm1, mm2 ; /* mm1 = d1 c1 b1 a1 = MM1 */
- movq mm2, mm4 ; /* mm2 = b3 a3 b2 a2 */
- movq [ecx], mm0 ;
- punpckhwd mm5, mm3 ; /* mm5 = d3 c3 d2 c2 */
- movq [16 + ecx], mm1 ;
- punpckhdq mm4, mm5 ; /* mm4 = d3 c3 b3 a3 = MM3 */
- punpckldq mm2, mm5 ; /* mm2 = d2 c2 b2 a2 = MM2 */
- movq [48 + ecx], mm4 ;
- movq [32 + ecx], mm2 ;
-
- };
-
-
-}
-
-static __inline void Fdct_mmx( ogg_int16_t *InputData1, ogg_int16_t *InputData2, ogg_int16_t *temp)
-{
-
- __asm {
- align 16
-
-
- mov eax, InputData1
- mov ebx, InputData2
- mov ecx, temp
- movq mm0, [eax] ;
- movq mm1, [16 + eax] ;
- movq mm2, [48 + eax] ;
- movq mm3, [16 + ebx] ;
- movq mm4, mm0 ;
- movq mm5, mm1 ;
- movq mm6, mm2 ;
- movq mm7, mm3 ;
- ;
- paddsw mm0, [48 + ebx] ; /* mm0 = ip0 + ip7 = is07 */
- paddsw mm1, [32 + eax] ; /* mm1 = ip1 + ip2 = is12 */
- paddsw mm2, [ebx] ; /* mm2 = ip3 + ip4 = is34 */
- paddsw mm3, [32 + ebx] ; /* mm3 = ip5 + ip6 = is56 */
- psubsw mm4, [48 + ebx] ; /* mm4 = ip0 - ip7 = id07 */
- psubsw mm5, [32 + eax] ; /* mm5 = ip1 - ip2 = id12 */
- ;
- psubsw mm0, mm2 ; /* mm0 = is07 - is34 */
- ;
- paddsw mm2, mm2 ;
- ;
- psubsw mm6, [ebx] ; /* mm6 = ip3 - ip4 = id34 */
- ;
- paddsw mm2, mm0 ; /* mm2 = is07 + is34 = is0734 */
- psubsw mm1, mm3 ; /* mm1 = is12 - is56 */
- movq [ecx], mm0 ; /* Save is07 - is34 to free mm0; */
- paddsw mm3, mm3 ;
- paddsw mm3, mm1 ; /* mm3 = is12 + 1s56 = is1256 */
- ;
- psubsw mm7, [32 + ebx] ; /* mm7 = ip5 - ip6 = id56 */
- ; /* ------------------------------------------------------------------- */
- psubsw mm5, mm7 ; /* mm5 = id12 - id56 */
- paddsw mm7, mm7 ;
- paddsw mm7, mm5 ; /* mm7 = id12 + id56 */
- ; /* ------------------------------------------------------------------- */
- psubsw mm2, mm3 ; /* mm2 = is0734 - is1256 */
- paddsw mm3, mm3 ;
- ;
- movq mm0, mm2 ; /* make a copy */
- paddsw mm3, mm2 ; /* mm3 = is0734 + is1256 */
- ;
- pmulhw mm0, xC4S4 ; /* mm0 = xC4S4 * ( is0734 - is1256 ) - ( is0734 - is1256 ) */
- paddw mm0, mm2 ; /* mm0 = xC4S4 * ( is0734 - is1256 ) */
- psrlw mm2, 15 ;
- paddw mm0, mm2 ; /* Truncate mm0, now it is op[4] */
- ;
- movq mm2, mm3 ;
- movq [ebx], mm0 ; /* save ip4, now mm0,mm2 are free */
- ;
- movq mm0, mm3 ;
- pmulhw mm3, xC4S4 ; /* mm3 = xC4S4 * ( is0734 +is1256 ) - ( is0734 +is1256 ) */
- ;
- psrlw mm2, 15 ;
- paddw mm3, mm0 ; /* mm3 = xC4S4 * ( is0734 +is1256 ) */
- paddw mm3, mm2 ; /* Truncate mm3, now it is op[0] */
- ;
- movq [eax], mm3 ;
- ; /* ------------------------------------------------------------------- */
- movq mm3, [ecx] ; /* mm3 = irot_input_y */
- pmulhw mm3, xC2S6 ; /* mm3 = xC2S6 * irot_input_y - irot_input_y */
- ;
- movq mm2, [ecx] ;
- movq mm0, mm2 ;
- ;
- psrlw mm2, 15 ; /* mm3 = xC2S6 * irot_input_y */
- paddw mm3, mm0 ;
- ;
- paddw mm3, mm2 ; /* Truncated */
- movq mm0, mm5 ;
- ;
- movq mm2, mm5 ;
- pmulhw mm0, xC6S2 ; /* mm0 = xC6S2 * irot_input_x */
- ;
- psrlw mm2, 15 ;
- paddw mm0, mm2 ; /* Truncated */
- ;
- paddsw mm3, mm0 ; /* ip[2] */
- movq [32 + eax], mm3 ; /* Save ip2 */
- ;
- movq mm0, mm5 ;
- movq mm2, mm5 ;
- ;
- pmulhw mm5, xC2S6 ; /* mm5 = xC2S6 * irot_input_x - irot_input_x */
- psrlw mm2, 15 ;
- ;
- movq mm3, [ecx] ;
- paddw mm5, mm0 ; /* mm5 = xC2S6 * irot_input_x */
- ;
- paddw mm5, mm2 ; /* Truncated */
- movq mm2, mm3 ;
- ;
- pmulhw mm3, xC6S2 ; /* mm3 = xC6S2 * irot_input_y */
- psrlw mm2, 15 ;
- ;
- paddw mm3, mm2 ; /* Truncated */
- psubsw mm3, mm5 ;
- ;
- movq [32 + ebx], mm3 ;
- ; /* ------------------------------------------------------------------- */
- movq mm0, xC4S4 ;
- movq mm2, mm1 ;
- movq mm3, mm1 ;
- ;
- pmulhw mm1, mm0 ; /* mm0 = xC4S4 * ( is12 - is56 ) - ( is12 - is56 ) */
- psrlw mm2, 15 ;
- ;
- paddw mm1, mm3 ; /* mm0 = xC4S4 * ( is12 - is56 ) */
- paddw mm1, mm2 ; /* Truncate mm1, now it is icommon_product1 */
- ;
- movq mm2, mm7 ;
- movq mm3, mm7 ;
- ;
- pmulhw mm7, mm0 ; /* mm7 = xC4S4 * ( id12 + id56 ) - ( id12 + id56 ) */
- psrlw mm2, 15 ;
- ;
- paddw mm7, mm3 ; /* mm7 = xC4S4 * ( id12 + id56 ) */
- paddw mm7, mm2 ; /* Truncate mm7, now it is icommon_product2 */
- ; /* ------------------------------------------------------------------- */
- pxor mm0, mm0 ; /* Clear mm0 */
- psubsw mm0, mm6 ; /* mm0 = - id34 */
- ;
- psubsw mm0, mm7 ; /* mm0 = - ( id34 + idcommon_product2 ) */
- paddsw mm6, mm6 ;
- paddsw mm6, mm0 ; /* mm6 = id34 - icommon_product2 */
- ;
- psubsw mm4, mm1 ; /* mm4 = id07 - icommon_product1 */
- paddsw mm1, mm1 ;
- paddsw mm1, mm4 ; /* mm1 = id07 + icommon_product1 */
- ; /* ------------------------------------------------------------------- */
- movq mm7, xC1S7 ;
- movq mm2, mm1 ;
- ;
- movq mm3, mm1 ;
- pmulhw mm1, mm7 ; /* mm1 = xC1S7 * irot_input_x - irot_input_x */
- ;
- movq mm7, xC7S1 ;
- psrlw mm2, 15 ;
- ;
- paddw mm1, mm3 ; /* mm1 = xC1S7 * irot_input_x */
- paddw mm1, mm2 ; /* Trucated */
- ;
- pmulhw mm3, mm7 ; /* mm3 = xC7S1 * irot_input_x */
- paddw mm3, mm2 ; /* Truncated */
- ;
- movq mm5, mm0 ;
- movq mm2, mm0 ;
- ;
- movq mm7, xC1S7 ;
- pmulhw mm0, mm7 ; /* mm0 = xC1S7 * irot_input_y - irot_input_y */
- ;
- movq mm7, xC7S1 ;
- psrlw mm2, 15 ;
- ;
- paddw mm0, mm5 ; /* mm0 = xC1S7 * irot_input_y */
- paddw mm0, mm2 ; /* Truncated */
- ;
- pmulhw mm5, mm7 ; /* mm5 = xC7S1 * irot_input_y */
- paddw mm5, mm2 ; /* Truncated */
- ;
- psubsw mm1, mm5 ; /* mm1 = xC1S7 * irot_input_x - xC7S1 * irot_input_y = ip1 */
- paddsw mm3, mm0 ; /* mm3 = xC7S1 * irot_input_x - xC1S7 * irot_input_y = ip7 */
- ;
- movq [16 + eax], mm1 ;
- movq [48 + ebx], mm3 ;
- ; /* ------------------------------------------------------------------- */
- movq mm0, xC3S5 ;
- movq mm1, xC5S3 ;
- ;
- movq mm5, mm6 ;
- movq mm7, mm6 ;
- ;
- movq mm2, mm4 ;
- movq mm3, mm4 ;
- ;
- pmulhw mm4, mm0 ; /* mm4 = xC3S5 * irot_input_x - irot_input_x */
- pmulhw mm6, mm1 ; /* mm6 = xC5S3 * irot_input_y - irot_input_y */
- ;
- psrlw mm2, 15 ;
- psrlw mm5, 15 ;
- ;
- paddw mm4, mm3 ; /* mm4 = xC3S5 * irot_input_x */
- paddw mm6, mm7 ; /* mm6 = xC5S3 * irot_input_y */
- ;
- paddw mm4, mm2 ; /* Truncated */
- paddw mm6, mm5 ; /* Truncated */
- ;
- psubsw mm4, mm6 ; /* ip3 */
- movq [48 + eax], mm4 ;
- ;
- movq mm4, mm3 ;
- movq mm6, mm7 ;
- ;
- pmulhw mm3, mm1 ; /* mm3 = xC5S3 * irot_input_x - irot_input_x */
- pmulhw mm7, mm0 ; /* mm7 = xC3S5 * irot_input_y - irot_input_y */
- ;
- paddw mm4, mm2 ;
- paddw mm6, mm5 ;
- ;
- paddw mm3, mm4 ; /* mm3 = xC5S3 * irot_input_x */
- paddw mm7, mm6 ; /* mm7 = xC3S5 * irot_input_y */
- ;
- paddw mm3, mm7 ; /* ip5 */
- movq [16 + ebx], mm3 ;
-
-};
-
-}
-
-
-static void fdct_short__mmx ( ogg_int16_t *InputData, ogg_int16_t *OutputData)
-{
-
- static ogg_int16_t tmp[32];
- ogg_int16_t* align_tmp = (ogg_int16_t*)((unsigned char*)tmp + (16 - ((int)tmp)&15));
-
-
- Transpose_mmx(InputData, OutputData, InputData + 4, OutputData + 4);
- Fdct_mmx(OutputData, OutputData + 4, align_tmp);
-
- Transpose_mmx(InputData + 32, OutputData + 32, InputData + 36, OutputData + 36);
- Fdct_mmx(OutputData+32, OutputData + 36, align_tmp);
-
- Transpose_mmx(OutputData, OutputData, OutputData + 32, OutputData + 32);
- Fdct_mmx(OutputData, OutputData + 32, align_tmp);
-
- Transpose_mmx(OutputData + 4, OutputData + 4, OutputData + 36, OutputData + 36);
- Fdct_mmx(OutputData + 4, OutputData + 36, align_tmp);
-
- __asm emms
-
-}
-
-void dsp_mmx_fdct_init(DspFunctions *funcs)
-{
- TH_DEBUG("enabling accelerated x86_32 mmx fdct function.\n");
- funcs->fdct_short = fdct_short__mmx;
-}
+;//==========================================================================
+;//
+;// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY
+;// KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+;// IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR
+;// PURPOSE.
+;//
+;// Copyright (c) 1999 - 2001 On2 Technologies Inc. All Rights Reserved.
+;//
+;//--------------------------------------------------------------------------
+
+#include "theora/theora.h"
+#include "codec_internal.h"
+#include "dsp.h"
+
+
+static const ogg_int64_t xC1S7 = 0x0fb15fb15fb15fb15LL;
+static const ogg_int64_t xC2S6 = 0x0ec83ec83ec83ec83LL;
+static const ogg_int64_t xC3S5 = 0x0d4dbd4dbd4dbd4dbLL;
+static const ogg_int64_t xC4S4 = 0x0b505b505b505b505LL;
+static const ogg_int64_t xC5S3 = 0x08e3a8e3a8e3a8e3aLL;
+static const ogg_int64_t xC6S2 = 0x061f861f861f861f8LL;
+static const ogg_int64_t xC7S1 = 0x031f131f131f131f1LL;
+
+
+static __inline void Transpose_mmx( ogg_int16_t *InputData1, ogg_int16_t *OutputData1,
+ ogg_int16_t *InputData2, ogg_int16_t *OutputData2)
+{
+
+ __asm {
+ align 16
+ mov eax, InputData1
+ mov ebx, InputData2
+ mov ecx, OutputData1
+ mov edx, OutputData2
+
+
+ movq mm0, [eax] ; /* mm0 = a0 a1 a2 a3 */
+ movq mm4, [ebx] ; /* mm4 = e4 e5 e6 e7 */
+ movq mm1, [16 + eax] ; /* mm1 = b0 b1 b2 b3 */
+ movq mm5, [16 + ebx] ; /* mm5 = f4 f5 f6 f7 */
+ movq mm2, [32 + eax] ; /* mm2 = c0 c1 c2 c3 */
+ movq mm6, [32 + ebx] ; /* mm6 = g4 g5 g6 g7 */
+ movq mm3, [48 + eax] ; /* mm3 = d0 d1 d2 d3 */
+ movq [16 + ecx], mm1 ; /* save b0 b1 b2 b3 */
+ movq mm7, [48 + ebx] ; /* mm7 = h0 h1 h2 h3 */
+ ; /* Transpose 2x8 block */
+ movq mm1, mm4 ; /* mm1 = e3 e2 e1 e0 */
+ punpcklwd mm4, mm5 ; /* mm4 = f1 e1 f0 e0 */
+ movq [ecx], mm0 ; /* save a3 a2 a1 a0 */
+ punpckhwd mm1, mm5 ; /* mm1 = f3 e3 f2 e2 */
+ movq mm0, mm6 ; /* mm0 = g3 g2 g1 g0 */
+ punpcklwd mm6, mm7 ; /* mm6 = h1 g1 h0 g0 */
+ movq mm5, mm4 ; /* mm5 = f1 e1 f0 e0 */
+ punpckldq mm4, mm6 ; /* mm4 = h0 g0 f0 e0 = MM4 */
+ punpckhdq mm5, mm6 ; /* mm5 = h1 g1 f1 e1 = MM5 */
+ movq mm6, mm1 ; /* mm6 = f3 e3 f2 e2 */
+ movq [edx], mm4 ;
+ punpckhwd mm0, mm7 ; /* mm0 = h3 g3 h2 g2 */
+ movq [16 + edx], mm5 ;
+ punpckhdq mm6, mm0 ; /* mm6 = h3 g3 f3 e3 = MM7 */
+ movq mm4, [ecx] ; /* mm4 = a3 a2 a1 a0 */
+ punpckldq mm1, mm0 ; /* mm1 = h2 g2 f2 e2 = MM6 */
+ movq mm5, [16 + ecx] ; /* mm5 = b3 b2 b1 b0 */
+ movq mm0, mm4 ; /* mm0 = a3 a2 a1 a0 */
+ movq [48 + edx], mm6 ;
+ punpcklwd mm0, mm5 ; /* mm0 = b1 a1 b0 a0 */
+ movq [32 + edx], mm1 ;
+ punpckhwd mm4, mm5 ; /* mm4 = b3 a3 b2 a2 */
+ movq mm5, mm2 ; /* mm5 = c3 c2 c1 c0 */
+ punpcklwd mm2, mm3 ; /* mm2 = d1 c1 d0 c0 */
+ movq mm1, mm0 ; /* mm1 = b1 a1 b0 a0 */
+ punpckldq mm0, mm2 ; /* mm0 = d0 c0 b0 a0 = MM0 */
+ punpckhdq mm1, mm2 ; /* mm1 = d1 c1 b1 a1 = MM1 */
+ movq mm2, mm4 ; /* mm2 = b3 a3 b2 a2 */
+ movq [ecx], mm0 ;
+ punpckhwd mm5, mm3 ; /* mm5 = d3 c3 d2 c2 */
+ movq [16 + ecx], mm1 ;
+ punpckhdq mm4, mm5 ; /* mm4 = d3 c3 b3 a3 = MM3 */
+ punpckldq mm2, mm5 ; /* mm2 = d2 c2 b2 a2 = MM2 */
+ movq [48 + ecx], mm4 ;
+ movq [32 + ecx], mm2 ;
+
+ };
+
+
+}
+
+static __inline void Fdct_mmx( ogg_int16_t *InputData1, ogg_int16_t *InputData2, ogg_int16_t *temp)
+{
+
+ __asm {
+ align 16
+
+
+ mov eax, InputData1
+ mov ebx, InputData2
+ mov ecx, temp
+ movq mm0, [eax] ;
+ movq mm1, [16 + eax] ;
+ movq mm2, [48 + eax] ;
+ movq mm3, [16 + ebx] ;
+ movq mm4, mm0 ;
+ movq mm5, mm1 ;
+ movq mm6, mm2 ;
+ movq mm7, mm3 ;
+ ;
+ paddsw mm0, [48 + ebx] ; /* mm0 = ip0 + ip7 = is07 */
+ paddsw mm1, [32 + eax] ; /* mm1 = ip1 + ip2 = is12 */
+ paddsw mm2, [ebx] ; /* mm2 = ip3 + ip4 = is34 */
+ paddsw mm3, [32 + ebx] ; /* mm3 = ip5 + ip6 = is56 */
+ psubsw mm4, [48 + ebx] ; /* mm4 = ip0 - ip7 = id07 */
+ psubsw mm5, [32 + eax] ; /* mm5 = ip1 - ip2 = id12 */
+ ;
+ psubsw mm0, mm2 ; /* mm0 = is07 - is34 */
+ ;
+ paddsw mm2, mm2 ;
+ ;
+ psubsw mm6, [ebx] ; /* mm6 = ip3 - ip4 = id34 */
+ ;
+ paddsw mm2, mm0 ; /* mm2 = is07 + is34 = is0734 */
+ psubsw mm1, mm3 ; /* mm1 = is12 - is56 */
+ movq [ecx], mm0 ; /* Save is07 - is34 to free mm0; */
+ paddsw mm3, mm3 ;
+ paddsw mm3, mm1 ; /* mm3 = is12 + 1s56 = is1256 */
+ ;
+ psubsw mm7, [32 + ebx] ; /* mm7 = ip5 - ip6 = id56 */
+ ; /* ------------------------------------------------------------------- */
+ psubsw mm5, mm7 ; /* mm5 = id12 - id56 */
+ paddsw mm7, mm7 ;
+ paddsw mm7, mm5 ; /* mm7 = id12 + id56 */
+ ; /* ------------------------------------------------------------------- */
+ psubsw mm2, mm3 ; /* mm2 = is0734 - is1256 */
+ paddsw mm3, mm3 ;
+ ;
+ movq mm0, mm2 ; /* make a copy */
+ paddsw mm3, mm2 ; /* mm3 = is0734 + is1256 */
+ ;
+ pmulhw mm0, xC4S4 ; /* mm0 = xC4S4 * ( is0734 - is1256 ) - ( is0734 - is1256 ) */
+ paddw mm0, mm2 ; /* mm0 = xC4S4 * ( is0734 - is1256 ) */
+ psrlw mm2, 15 ;
+ paddw mm0, mm2 ; /* Truncate mm0, now it is op[4] */
+ ;
+ movq mm2, mm3 ;
+ movq [ebx], mm0 ; /* save ip4, now mm0,mm2 are free */
+ ;
+ movq mm0, mm3 ;
+ pmulhw mm3, xC4S4 ; /* mm3 = xC4S4 * ( is0734 +is1256 ) - ( is0734 +is1256 ) */
+ ;
+ psrlw mm2, 15 ;
+ paddw mm3, mm0 ; /* mm3 = xC4S4 * ( is0734 +is1256 ) */
+ paddw mm3, mm2 ; /* Truncate mm3, now it is op[0] */
+ ;
+ movq [eax], mm3 ;
+ ; /* ------------------------------------------------------------------- */
+ movq mm3, [ecx] ; /* mm3 = irot_input_y */
+ pmulhw mm3, xC2S6 ; /* mm3 = xC2S6 * irot_input_y - irot_input_y */
+ ;
+ movq mm2, [ecx] ;
+ movq mm0, mm2 ;
+ ;
+ psrlw mm2, 15 ; /* mm3 = xC2S6 * irot_input_y */
+ paddw mm3, mm0 ;
+ ;
+ paddw mm3, mm2 ; /* Truncated */
+ movq mm0, mm5 ;
+ ;
+ movq mm2, mm5 ;
+ pmulhw mm0, xC6S2 ; /* mm0 = xC6S2 * irot_input_x */
+ ;
+ psrlw mm2, 15 ;
+ paddw mm0, mm2 ; /* Truncated */
+ ;
+ paddsw mm3, mm0 ; /* ip[2] */
+ movq [32 + eax], mm3 ; /* Save ip2 */
+ ;
+ movq mm0, mm5 ;
+ movq mm2, mm5 ;
+ ;
+ pmulhw mm5, xC2S6 ; /* mm5 = xC2S6 * irot_input_x - irot_input_x */
+ psrlw mm2, 15 ;
+ ;
+ movq mm3, [ecx] ;
+ paddw mm5, mm0 ; /* mm5 = xC2S6 * irot_input_x */
+ ;
+ paddw mm5, mm2 ; /* Truncated */
+ movq mm2, mm3 ;
+ ;
+ pmulhw mm3, xC6S2 ; /* mm3 = xC6S2 * irot_input_y */
+ psrlw mm2, 15 ;
+ ;
+ paddw mm3, mm2 ; /* Truncated */
+ psubsw mm3, mm5 ;
+ ;
+ movq [32 + ebx], mm3 ;
+ ; /* ------------------------------------------------------------------- */
+ movq mm0, xC4S4 ;
+ movq mm2, mm1 ;
+ movq mm3, mm1 ;
+ ;
+ pmulhw mm1, mm0 ; /* mm0 = xC4S4 * ( is12 - is56 ) - ( is12 - is56 ) */
+ psrlw mm2, 15 ;
+ ;
+ paddw mm1, mm3 ; /* mm0 = xC4S4 * ( is12 - is56 ) */
+ paddw mm1, mm2 ; /* Truncate mm1, now it is icommon_product1 */
+ ;
+ movq mm2, mm7 ;
+ movq mm3, mm7 ;
+ ;
+ pmulhw mm7, mm0 ; /* mm7 = xC4S4 * ( id12 + id56 ) - ( id12 + id56 ) */
+ psrlw mm2, 15 ;
+ ;
+ paddw mm7, mm3 ; /* mm7 = xC4S4 * ( id12 + id56 ) */
+ paddw mm7, mm2 ; /* Truncate mm7, now it is icommon_product2 */
+ ; /* ------------------------------------------------------------------- */
+ pxor mm0, mm0 ; /* Clear mm0 */
+ psubsw mm0, mm6 ; /* mm0 = - id34 */
+ ;
+ psubsw mm0, mm7 ; /* mm0 = - ( id34 + idcommon_product2 ) */
+ paddsw mm6, mm6 ;
+ paddsw mm6, mm0 ; /* mm6 = id34 - icommon_product2 */
+ ;
+ psubsw mm4, mm1 ; /* mm4 = id07 - icommon_product1 */
+ paddsw mm1, mm1 ;
+ paddsw mm1, mm4 ; /* mm1 = id07 + icommon_product1 */
+ ; /* ------------------------------------------------------------------- */
+ movq mm7, xC1S7 ;
+ movq mm2, mm1 ;
+ ;
+ movq mm3, mm1 ;
+ pmulhw mm1, mm7 ; /* mm1 = xC1S7 * irot_input_x - irot_input_x */
+ ;
+ movq mm7, xC7S1 ;
+ psrlw mm2, 15 ;
+ ;
+ paddw mm1, mm3 ; /* mm1 = xC1S7 * irot_input_x */
+ paddw mm1, mm2 ; /* Trucated */
+ ;
+ pmulhw mm3, mm7 ; /* mm3 = xC7S1 * irot_input_x */
+ paddw mm3, mm2 ; /* Truncated */
+ ;
+ movq mm5, mm0 ;
+ movq mm2, mm0 ;
+ ;
+ movq mm7, xC1S7 ;
+ pmulhw mm0, mm7 ; /* mm0 = xC1S7 * irot_input_y - irot_input_y */
+ ;
+ movq mm7, xC7S1 ;
+ psrlw mm2, 15 ;
+ ;
+ paddw mm0, mm5 ; /* mm0 = xC1S7 * irot_input_y */
+ paddw mm0, mm2 ; /* Truncated */
+ ;
+ pmulhw mm5, mm7 ; /* mm5 = xC7S1 * irot_input_y */
+ paddw mm5, mm2 ; /* Truncated */
+ ;
+ psubsw mm1, mm5 ; /* mm1 = xC1S7 * irot_input_x - xC7S1 * irot_input_y = ip1 */
+ paddsw mm3, mm0 ; /* mm3 = xC7S1 * irot_input_x - xC1S7 * irot_input_y = ip7 */
+ ;
+ movq [16 + eax], mm1 ;
+ movq [48 + ebx], mm3 ;
+ ; /* ------------------------------------------------------------------- */
+ movq mm0, xC3S5 ;
+ movq mm1, xC5S3 ;
+ ;
+ movq mm5, mm6 ;
+ movq mm7, mm6 ;
+ ;
+ movq mm2, mm4 ;
+ movq mm3, mm4 ;
+ ;
+ pmulhw mm4, mm0 ; /* mm4 = xC3S5 * irot_input_x - irot_input_x */
+ pmulhw mm6, mm1 ; /* mm6 = xC5S3 * irot_input_y - irot_input_y */
+ ;
+ psrlw mm2, 15 ;
+ psrlw mm5, 15 ;
+ ;
+ paddw mm4, mm3 ; /* mm4 = xC3S5 * irot_input_x */
+ paddw mm6, mm7 ; /* mm6 = xC5S3 * irot_input_y */
+ ;
+ paddw mm4, mm2 ; /* Truncated */
+ paddw mm6, mm5 ; /* Truncated */
+ ;
+ psubsw mm4, mm6 ; /* ip3 */
+ movq [48 + eax], mm4 ;
+ ;
+ movq mm4, mm3 ;
+ movq mm6, mm7 ;
+ ;
+ pmulhw mm3, mm1 ; /* mm3 = xC5S3 * irot_input_x - irot_input_x */
+ pmulhw mm7, mm0 ; /* mm7 = xC3S5 * irot_input_y - irot_input_y */
+ ;
+ paddw mm4, mm2 ;
+ paddw mm6, mm5 ;
+ ;
+ paddw mm3, mm4 ; /* mm3 = xC5S3 * irot_input_x */
+ paddw mm7, mm6 ; /* mm7 = xC3S5 * irot_input_y */
+ ;
+ paddw mm3, mm7 ; /* ip5 */
+ movq [16 + ebx], mm3 ;
+
+};
+
+}
+
+
+static void fdct_short__mmx ( ogg_int16_t *InputData, ogg_int16_t *OutputData)
+{
+
+ static ogg_int16_t tmp[32];
+ ogg_int16_t* align_tmp = (ogg_int16_t*)((unsigned char*)tmp + (16 - ((int)tmp)&15));
+
+
+ Transpose_mmx(InputData, OutputData, InputData + 4, OutputData + 4);
+ Fdct_mmx(OutputData, OutputData + 4, align_tmp);
+
+ Transpose_mmx(InputData + 32, OutputData + 32, InputData + 36, OutputData + 36);
+ Fdct_mmx(OutputData+32, OutputData + 36, align_tmp);
+
+ Transpose_mmx(OutputData, OutputData, OutputData + 32, OutputData + 32);
+ Fdct_mmx(OutputData, OutputData + 32, align_tmp);
+
+ Transpose_mmx(OutputData + 4, OutputData + 4, OutputData + 36, OutputData + 36);
+ Fdct_mmx(OutputData + 4, OutputData + 36, align_tmp);
+
+ __asm emms
+
+}
+
+void dsp_mmx_fdct_init(DspFunctions *funcs)
+{
+ TH_DEBUG("enabling accelerated x86_32 mmx fdct function.\n");
+ funcs->fdct_short = fdct_short__mmx;
+}
Property changes on: trunk/theora/lib/enc/x86_32_vs/fdct_mmx.c
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/theora/lib/enc/x86_32_vs/recon_mmx.c
===================================================================
--- trunk/theora/lib/enc/x86_32_vs/recon_mmx.c 2007-10-03 01:50:11 UTC (rev 13924)
+++ trunk/theora/lib/enc/x86_32_vs/recon_mmx.c 2007-10-03 18:51:06 UTC (rev 13925)
@@ -1,198 +1,198 @@
-/********************************************************************
- * *
- * THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
- * *
- * THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2007 *
- * by the Xiph.Org Foundation http://www.xiph.org/ *
- * *
- ********************************************************************
-
- function:
- last mod: $Id: reconstruct.c,v 1.6 2003/12/03 08:59:41 arc Exp $
-
- ********************************************************************/
-
-#include "codec_internal.h"
-
-
-static const unsigned __int64 V128 = 0x8080808080808080LL;
-
-static void copy8x8__mmx (unsigned char *src,
- unsigned char *dest,
- unsigned int stride)
-{
-
- //Is this even the fastest way to do this?
- __asm {
- align 16
-
- mov eax, src
- mov ebx, dest
- mov ecx, stride
-
- lea edi, [ecx + ecx * 2]
- movq mm0, [eax]
- movq mm1, [eax + ecx]
- movq mm2, [eax + ecx * 2]
- movq mm3, [eax + edi]
- lea eax, [eax + ecx * 4]
- movq [ebx], mm0
- movq [ebx + ecx], mm1
- movq [ebx + ecx * 2], mm2
- movq [ebx + edi], mm3
- lea ebx, [ebx + ecx * 4]
- movq mm0, [eax]
- movq mm1, [eax + ecx]
- movq mm2, [eax + ecx * 2]
- movq mm3, [eax + edi]
- movq [ebx], mm0
- movq [ebx + ecx], mm1
- movq [ebx + ecx * 2], mm2
- movq [ebx + edi], mm3
-
- };
-
-}
-
-static void recon_intra8x8__mmx (unsigned char *ReconPtr, ogg_int16_t *ChangePtr,
- ogg_uint32_t LineStep)
-{
-
- __asm {
- align 16
-
- mov eax, ReconPtr
- mov ebx, ChangePtr
- mov ecx, LineStep
-
- movq mm0, V128
-
- lea edi, [128 + ebx]
- loop_start:
- movq mm2, [ebx]
-
- packsswb mm2, [8 + ebx]
- por mm0, mm0
- pxor mm2, mm0
- lea ebx, [16 + ebx]
- cmp ebx, edi
-
- movq [eax], mm2
-
-
-
- lea eax, [eax + ecx]
- jc loop_start
-
-
- };
-
-}
-
-
-
-
-
-static void recon_inter8x8__mmx (unsigned char *ReconPtr, unsigned char *RefPtr,
- ogg_int16_t *ChangePtr, ogg_uint32_t LineStep)
-{
-
- __asm {
-
- align 16
-
- mov eax, ReconPtr
- mov ebx, ChangePtr
- mov ecx, LineStep
- mov edx, RefPtr
-
- pxor mm0, mm0
- lea edi, [128 + ebx]
-
- loop_start:
- movq mm2, [edx]
-
- movq mm4, [ebx]
- movq mm3, mm2
- movq mm5, [8 + ebx]
- punpcklbw mm2, mm0
- paddsw mm2, mm4
- punpckhbw mm3, mm0
- paddsw mm3, mm5
- add edx, ecx
- packuswb mm2, mm3
- lea ebx, [16 + ebx]
- cmp ebx, edi
-
- movq [eax], mm2
-
- lea eax, [eax + ecx]
- jc loop_start
-
- };
-}
-
-
-
-
-static void recon_inter8x8_half__mmx (unsigned char *ReconPtr, unsigned char *RefPtr1,
- unsigned char *RefPtr2, ogg_int16_t *ChangePtr,
- ogg_uint32_t LineStep)
-{
- __asm {
- align 16
-
- mov eax, ReconPtr
- mov ebx, ChangePtr
- mov ecx, RefPtr1
- mov edx, RefPtr2
-
- pxor mm0, mm0
- lea edi, [128 + ebx]
-
- loop_start:
- movq mm2, [ecx]
- movq mm4, [edx]
-
- movq mm3, mm2
- punpcklbw mm2, mm0
- movq mm5, mm4
- movq mm6, [ebx]
- punpckhbw mm3, mm0
- movq mm7, [8 + ebx]
- punpcklbw mm4, mm0
- punpckhbw mm5, mm0
- paddw mm2, mm4
- paddw mm3, mm5
- psrlw mm2, 1
- psrlw mm3, 1
- paddw mm2, mm6
- paddw mm3, mm7
- lea ebx, [16 + ebx]
- packuswb mm2, mm3
- add ecx, LineStep
- add edx, LineStep
- movq [eax], mm2
- add eax, LineStep
- cmp ebx, edi
- jc loop_start
-
- };
-
-}
-
-
-
-
-void dsp_mmx_recon_init(DspFunctions *funcs)
-{
- TH_DEBUG("enabling accelerated x86_32 mmx recon functions.\n");
- funcs->copy8x8 = copy8x8__mmx;
- funcs->recon_intra8x8 = recon_intra8x8__mmx;
- funcs->recon_inter8x8 = recon_inter8x8__mmx;
- funcs->recon_inter8x8_half = recon_inter8x8_half__mmx;
-}
-
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2007 *
+ * by the Xiph.Org Foundation http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function:
+ last mod: $Id: reconstruct.c,v 1.6 2003/12/03 08:59:41 arc Exp $
+
+ ********************************************************************/
+
+#include "codec_internal.h"
+
+
+static const unsigned __int64 V128 = 0x8080808080808080LL;
+
+static void copy8x8__mmx (unsigned char *src,
+ unsigned char *dest,
+ unsigned int stride)
+{
+
+ //Is this even the fastest way to do this?
+ __asm {
+ align 16
+
+ mov eax, src
+ mov ebx, dest
+ mov ecx, stride
+
+ lea edi, [ecx + ecx * 2]
+ movq mm0, [eax]
+ movq mm1, [eax + ecx]
+ movq mm2, [eax + ecx * 2]
+ movq mm3, [eax + edi]
+ lea eax, [eax + ecx * 4]
+ movq [ebx], mm0
+ movq [ebx + ecx], mm1
+ movq [ebx + ecx * 2], mm2
+ movq [ebx + edi], mm3
+ lea ebx, [ebx + ecx * 4]
+ movq mm0, [eax]
+ movq mm1, [eax + ecx]
+ movq mm2, [eax + ecx * 2]
+ movq mm3, [eax + edi]
+ movq [ebx], mm0
+ movq [ebx + ecx], mm1
+ movq [ebx + ecx * 2], mm2
+ movq [ebx + edi], mm3
+
+ };
+
+}
+
+static void recon_intra8x8__mmx (unsigned char *ReconPtr, ogg_int16_t *ChangePtr,
+ ogg_uint32_t LineStep)
+{
+
+ __asm {
+ align 16
+
+ mov eax, ReconPtr
+ mov ebx, ChangePtr
+ mov ecx, LineStep
+
+ movq mm0, V128
+
+ lea edi, [128 + ebx]
+ loop_start:
+ movq mm2, [ebx]
+
+ packsswb mm2, [8 + ebx]
+ por mm0, mm0
+ pxor mm2, mm0
+ lea ebx, [16 + ebx]
+ cmp ebx, edi
+
+ movq [eax], mm2
+
+
+
+ lea eax, [eax + ecx]
+ jc loop_start
+
+
+ };
+
+}
+
+
+
+
+
+static void recon_inter8x8__mmx (unsigned char *ReconPtr, unsigned char *RefPtr,
+ ogg_int16_t *ChangePtr, ogg_uint32_t LineStep)
+{
+
+ __asm {
+
+ align 16
+
+ mov eax, ReconPtr
+ mov ebx, ChangePtr
+ mov ecx, LineStep
+ mov edx, RefPtr
+
+ pxor mm0, mm0
+ lea edi, [128 + ebx]
+
+ loop_start:
+ movq mm2, [edx]
+
+ movq mm4, [ebx]
+ movq mm3, mm2
+ movq mm5, [8 + ebx]
+ punpcklbw mm2, mm0
+ paddsw mm2, mm4
+ punpckhbw mm3, mm0
+ paddsw mm3, mm5
+ add edx, ecx
+ packuswb mm2, mm3
+ lea ebx, [16 + ebx]
+ cmp ebx, edi
+
+ movq [eax], mm2
+
+ lea eax, [eax + ecx]
+ jc loop_start
+
+ };
+}
+
+
+
+
+static void recon_inter8x8_half__mmx (unsigned char *ReconPtr, unsigned char *RefPtr1,
+ unsigned char *RefPtr2, ogg_int16_t *ChangePtr,
+ ogg_uint32_t LineStep)
+{
+ __asm {
+ align 16
+
+ mov eax, ReconPtr
+ mov ebx, ChangePtr
+ mov ecx, RefPtr1
+ mov edx, RefPtr2
+
+ pxor mm0, mm0
+ lea edi, [128 + ebx]
+
+ loop_start:
+ movq mm2, [ecx]
+ movq mm4, [edx]
+
+ movq mm3, mm2
+ punpcklbw mm2, mm0
+ movq mm5, mm4
+ movq mm6, [ebx]
+ punpckhbw mm3, mm0
+ movq mm7, [8 + ebx]
+ punpcklbw mm4, mm0
+ punpckhbw mm5, mm0
+ paddw mm2, mm4
+ paddw mm3, mm5
+ psrlw mm2, 1
+ psrlw mm3, 1
+ paddw mm2, mm6
+ paddw mm3, mm7
+ lea ebx, [16 + ebx]
+ packuswb mm2, mm3
+ add ecx, LineStep
+ add edx, LineStep
+ movq [eax], mm2
+ add eax, LineStep
+ cmp ebx, edi
+ jc loop_start
+
+ };
+
+}
+
+
+
+
+void dsp_mmx_recon_init(DspFunctions *funcs)
+{
+ TH_DEBUG("enabling accelerated x86_32 mmx recon functions.\n");
+ funcs->copy8x8 = copy8x8__mmx;
+ funcs->recon_intra8x8 = recon_intra8x8__mmx;
+ funcs->recon_inter8x8 = recon_inter8x8__mmx;
+ funcs->recon_inter8x8_half = recon_inter8x8_half__mmx;
+}
+
Property changes on: trunk/theora/lib/enc/x86_32_vs/recon_mmx.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/theora/lib/enc/x86_64/dct_decode_mmx.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/theora/lib/enc/x86_64/idct_mmx.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/theora/win32/VS2003/libtheora/libtheora.vcproj
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Property changes on: trunk/theora/win32/VS2005/dump_video/dump_video.vcproj
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Property changes on: trunk/theora/win32/VS2005/encoder_example/encoder_example.vcproj
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Property changes on: trunk/theora/win32/VS2005/libtheora/libtheora.vcproj
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Property changes on: trunk/theora/win32/VS2005/theora.sln
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Modified: trunk/theora/win32/build_theora_static.bat
===================================================================
--- trunk/theora/win32/build_theora_static.bat 2007-10-03 01:50:11 UTC (rev 13924)
+++ trunk/theora/win32/build_theora_static.bat 2007-10-03 18:51:06 UTC (rev 13925)
@@ -1,18 +1,18 @@
- at echo off
-echo ---+++--- Building Theora (Static) ---+++---
-
-if .%SRCROOT%==. set SRCROOT=D:\xiph
-
-set OLDPATH=%PATH%
-set OLDINCLUDE=%INCLUDE%
-set OLDLIB=%LIB%
-
-call "c:\program files\microsoft visual studio\vc98\bin\vcvars32.bat"
-echo Setting include paths for Theora
-set INCLUDE=%INCLUDE%;%SRCROOT%\ogg\include;%SRCROOT%\theora\include
-echo Compiling...
-msdev theora_static.dsp /useenv /make "theora_static - Win32 Release" /rebuild
-
-set PATH=%OLDPATH%
-set INCLUDE=%OLDINCLUDE%
-set LIB=%OLDLIB%
+ at echo off
+echo ---+++--- Building Theora (Static) ---+++---
+
+if .%SRCROOT%==. set SRCROOT=D:\xiph
+
+set OLDPATH=%PATH%
+set OLDINCLUDE=%INCLUDE%
+set OLDLIB=%LIB%
+
+call "c:\program files\microsoft visual studio\vc98\bin\vcvars32.bat"
+echo Setting include paths for Theora
+set INCLUDE=%INCLUDE%;%SRCROOT%\ogg\include;%SRCROOT%\theora\include
+echo Compiling...
+msdev theora_static.dsp /useenv /make "theora_static - Win32 Release" /rebuild
+
+set PATH=%OLDPATH%
+set INCLUDE=%OLDINCLUDE%
+set LIB=%OLDLIB%
Property changes on: trunk/theora/win32/build_theora_static.bat
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Modified: trunk/theora/win32/build_theora_static_debug.bat
===================================================================
--- trunk/theora/win32/build_theora_static_debug.bat 2007-10-03 01:50:11 UTC (rev 13924)
+++ trunk/theora/win32/build_theora_static_debug.bat 2007-10-03 18:51:06 UTC (rev 13925)
@@ -1,18 +1,18 @@
- at echo off
-echo ---+++--- Building Theora (Static) ---+++---
-
-if .%SRCROOT%==. set SRCROOT=D:\xiph
-
-set OLDPATH=%PATH%
-set OLDINCLUDE=%INCLUDE%
-set OLDLIB=%LIB%
-
-call "c:\program files\microsoft visual studio\vc98\bin\vcvars32.bat"
-echo Setting include paths for Theora
-set INCLUDE=%INCLUDE%;%SRCROOT%\ogg\include;%SRCROOT%\theora\include
-echo Compiling...
-msdev theora_static.dsp /useenv /make "theora_static - Win32 Debug" /rebuild
-
-set PATH=%OLDPATH%
-set INCLUDE=%OLDINCLUDE%
-set LIB=%OLDLIB%
+ at echo off
+echo ---+++--- Building Theora (Static) ---+++---
+
+if .%SRCROOT%==. set SRCROOT=D:\xiph
+
+set OLDPATH=%PATH%
+set OLDINCLUDE=%INCLUDE%
+set OLDLIB=%LIB%
+
+call "c:\program files\microsoft visual studio\vc98\bin\vcvars32.bat"
+echo Setting include paths for Theora
+set INCLUDE=%INCLUDE%;%SRCROOT%\ogg\include;%SRCROOT%\theora\include
+echo Compiling...
+msdev theora_static.dsp /useenv /make "theora_static - Win32 Debug" /rebuild
+
+set PATH=%OLDPATH%
+set INCLUDE=%OLDINCLUDE%
+set LIB=%OLDLIB%
Property changes on: trunk/theora/win32/build_theora_static_debug.bat
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Modified: trunk/theora/win32/getopt.c
===================================================================
--- trunk/theora/win32/getopt.c 2007-10-03 01:50:11 UTC (rev 13924)
+++ trunk/theora/win32/getopt.c 2007-10-03 18:51:06 UTC (rev 13925)
@@ -1,1047 +1,1047 @@
-/* Getopt for GNU.
- NOTE: getopt is now part of the C library, so if you don't know what
- "Keep this file name-space clean" means, talk to drepper at gnu.org
- before changing it!
-
- Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
- Free Software Foundation, Inc.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
- Ditto for AIX 3.2 and <stdlib.h>. */
-#ifndef _NO_PROTO
-# define _NO_PROTO
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
-# ifndef const
-# define const
-# endif
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
- Library, but also included in many other GNU distributions. Compiling
- and linking in this code is a waste when using the GNU C library
- (especially if it is a shared library). Rather than having every GNU
- program understand `configure --with-gnu-libc' and omit the object files,
- it is simpler to just do this in the source for each such file. */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
-# include <gnu-versions.h>
-# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-# define ELIDE_CODE
-# endif
-#endif
-
-#ifndef ELIDE_CODE
-
-
-/* This needs to come after some library #include
- to get __GNU_LIBRARY__ defined. */
-#ifdef __GNU_LIBRARY__
-/* Don't include stdlib.h for non-GNU C libraries because some of them
- contain conflicting prototypes for getopt. */
-# include <stdlib.h>
-# include <unistd.h>
-#endif /* GNU C library. */
-
-#ifdef VMS
-# include <unixlib.h>
-# if HAVE_STRING_H - 0
-# include <string.h>
-# endif
-#endif
-
-#ifndef _
-/* This is for other GNU distributions with internationalized messages.
- When compiling libc, the _ macro is predefined. */
-# ifdef HAVE_LIBINTL_H
-# include <libintl.h>
-# define _(msgid) gettext (msgid)
-# else
-# define _(msgid) (msgid)
-# endif
-#endif
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
- but it behaves differently for the user, since it allows the user
- to intersperse the options with the other arguments.
-
- As `getopt' works, it permutes the elements of ARGV so that,
- when it is done, all the options precede everything else. Thus
- all application programs are extended to handle flexible argument order.
-
- Setting the environment variable POSIXLY_CORRECT disables permutation.
- Then the behavior is completely standard.
-
- GNU application programs can use a third alternative mode in which
- they can distinguish the relative order of options and other arguments. */
-
-#include "getopt_win.h"
-
-/* For communication from `getopt' to the caller.
- When `getopt' finds an option that takes an argument,
- the argument value is returned here.
- Also, when `ordering' is RETURN_IN_ORDER,
- each non-option ARGV-element is returned here. */
-
-char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
- This is used for communication to and from the caller
- and for communication between successive calls to `getopt'.
-
- On entry to `getopt', zero means this is the first call; initialize.
-
- When `getopt' returns -1, this is the index of the first of the
- non-option elements that the caller should itself scan.
-
- Otherwise, `optind' communicates from one call to the next
- how much of ARGV has been scanned so far. */
-
-/* 1003.2 says this must be 1 before any call. */
-int optind = 1;
-
-/* Formerly, initialization of getopt depended on optind==0, which
- causes problems with re-calling getopt as programs generally don't
- know that. */
-
-int __getopt_initialized;
-
-/* The next char to be scanned in the option-element
- in which the last option character we returned was found.
- This allows us to pick up the scan where we left off.
-
- If this is zero, or a null string, it means resume the scan
- by advancing to the next ARGV-element. */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
- for unrecognized options. */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
- This must be initialized on some systems to avoid linking in the
- system's own getopt implementation. */
-
-int optopt = '?';
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
- If the caller did not specify anything,
- the default is REQUIRE_ORDER if the environment variable
- POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
- REQUIRE_ORDER means don't recognize them as options;
- stop option processing when the first non-option is seen.
- This is what Unix does.
- This mode of operation is selected by either setting the environment
- variable POSIXLY_CORRECT, or using `+' as the first character
- of the list of option characters.
-
- PERMUTE is the default. We permute the contents of ARGV as we scan,
- so that eventually all the non-options are at the end. This allows options
- to be given in any order, even with programs that were not written to
- expect this.
-
- RETURN_IN_ORDER is an option available to programs that were written
- to expect options and other ARGV-elements in any order and that care about
- the ordering of the two. We describe each non-option ARGV-element
- as if it were the argument of an option with character code 1.
- Using `-' as the first character of the list of option characters
- selects this mode of operation.
-
- The special argument `--' forces an end of option-scanning regardless
- of the value of `ordering'. In the case of RETURN_IN_ORDER, only
- `--' can cause `getopt' to return -1 with `optind' != ARGC. */
-
-static enum
-{
- REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-/* Value of POSIXLY_CORRECT environment variable. */
-static char *posixly_correct;
-
-#ifdef __GNU_LIBRARY__
-/* We want to avoid inclusion of string.h with non-GNU libraries
- because there are many ways it can cause trouble.
- On some systems, it contains special magic macros that don't work
- in GCC. */
-# include <string.h>
-# define my_index strchr
-#else
-
-#include <string.h>
-
-/* Avoid depending on library functions or files
- whose names are inconsistent. */
-
-#ifndef getenv
-extern char *getenv ();
-#endif
-
-static char *
-my_index (str, chr)
- const char *str;
- int chr;
-{
- while (*str)
- {
- if (*str == chr)
- return (char *) str;
- str++;
- }
- return 0;
-}
-
-/* If using GCC, we can safely declare strlen this way.
- If not using GCC, it is ok not to declare it. */
-#ifdef __GNUC__
-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
- That was relevant to code that was here before. */
-# if (!defined __STDC__ || !__STDC__) && !defined strlen
-/* gcc with -traditional declares the built-in strlen to return int,
- and has done so at least since version 2.4.5. -- rms. */
-extern int strlen (const char *);
-# endif /* not __STDC__ */
-#endif /* __GNUC__ */
-
-#endif /* not __GNU_LIBRARY__ */
-
-/* Handle permutation of arguments. */
-
-/* Describe the part of ARGV that contains non-options that have
- been skipped. `first_nonopt' is the index in ARGV of the first of them;
- `last_nonopt' is the index after the last of them. */
-
-static int first_nonopt;
-static int last_nonopt;
-
-#ifdef _LIBC
-/* Bash 2.0 gives us an environment variable containing flags
- indicating ARGV elements that should not be considered arguments. */
-
-/* Defined in getopt_init.c */
-extern char *__getopt_nonoption_flags;
-
-static int nonoption_flags_max_len;
-static int nonoption_flags_len;
-
-static int original_argc;
-static char *const *original_argv;
-
-/* Make sure the environment variable bash 2.0 puts in the environment
- is valid for the getopt call we must make sure that the ARGV passed
- to getopt is that one passed to the process. */
-static void
-__attribute__ ((unused))
-store_args_and_env (int argc, char *const *argv)
-{
- /* XXX This is no good solution. We should rather copy the args so
- that we can compare them later. But we must not use malloc(3). */
- original_argc = argc;
- original_argv = argv;
-}
-# ifdef text_set_element
-text_set_element (__libc_subinit, store_args_and_env);
-# endif /* text_set_element */
-
-# define SWAP_FLAGS(ch1, ch2) \
- if (nonoption_flags_len > 0) \
- { \
- char __tmp = __getopt_nonoption_flags[ch1]; \
- __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \
- __getopt_nonoption_flags[ch2] = __tmp; \
- }
-#else /* !_LIBC */
-# define SWAP_FLAGS(ch1, ch2)
-#endif /* _LIBC */
-
-/* Exchange two adjacent subsequences of ARGV.
- One subsequence is elements [first_nonopt,last_nonopt)
- which contains all the non-options that have been skipped so far.
- The other is elements [last_nonopt,optind), which contains all
- the options processed since those non-options were skipped.
-
- `first_nonopt' and `last_nonopt' are relocated so that they describe
- the new indices of the non-options in ARGV after they are moved. */
-
-#if defined __STDC__ && __STDC__
-static void exchange (char **);
-#endif
-
-static void
-exchange (argv)
- char **argv;
-{
- int bottom = first_nonopt;
- int middle = last_nonopt;
- int top = optind;
- char *tem;
-
- /* Exchange the shorter segment with the far end of the longer segment.
- That puts the shorter segment into the right place.
- It leaves the longer segment in the right place overall,
- but it consists of two parts that need to be swapped next. */
-
-#ifdef _LIBC
- /* First make sure the handling of the `__getopt_nonoption_flags'
- string can work normally. Our top argument must be in the range
- of the string. */
- if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
- {
- /* We must extend the array. The user plays games with us and
- presents new arguments. */
- char *new_str = malloc (top + 1);
- if (new_str == NULL)
- nonoption_flags_len = nonoption_flags_max_len = 0;
- else
- {
- memset (__mempcpy (new_str, __getopt_nonoption_flags,
- nonoption_flags_max_len),
- '\0', top + 1 - nonoption_flags_max_len);
- nonoption_flags_max_len = top + 1;
- __getopt_nonoption_flags = new_str;
- }
- }
-#endif
-
- while (top > middle && middle > bottom)
- {
- if (top - middle > middle - bottom)
- {
- /* Bottom segment is the short one. */
- int len = middle - bottom;
- register int i;
-
- /* Swap it with the top part of the top segment. */
- for (i = 0; i < len; i++)
- {
- tem = argv[bottom + i];
- argv[bottom + i] = argv[top - (middle - bottom) + i];
- argv[top - (middle - bottom) + i] = tem;
- SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
- }
- /* Exclude the moved bottom segment from further swapping. */
- top -= len;
- }
- else
- {
- /* Top segment is the short one. */
- int len = top - middle;
- register int i;
-
- /* Swap it with the bottom part of the bottom segment. */
- for (i = 0; i < len; i++)
- {
- tem = argv[bottom + i];
- argv[bottom + i] = argv[middle + i];
- argv[middle + i] = tem;
- SWAP_FLAGS (bottom + i, middle + i);
- }
- /* Exclude the moved top segment from further swapping. */
- bottom += len;
- }
- }
-
- /* Update records for the slots the non-options now occupy. */
-
- first_nonopt += (optind - last_nonopt);
- last_nonopt = optind;
-}
-
-/* Initialize the internal data when the first call is made. */
-
-#if defined __STDC__ && __STDC__
-static const char *_getopt_initialize (int, char *const *, const char *);
-#endif
-static const char *
-_getopt_initialize (argc, argv, optstring)
- int argc;
- char *const *argv;
- const char *optstring;
-{
- /* Start processing options with ARGV-element 1 (since ARGV-element 0
- is the program name); the sequence of previously skipped
- non-option ARGV-elements is empty. */
-
- first_nonopt = last_nonopt = optind;
-
- nextchar = NULL;
-
- posixly_correct = getenv ("POSIXLY_CORRECT");
-
- /* Determine how to handle the ordering of options and nonoptions. */
-
- if (optstring[0] == '-')
- {
- ordering = RETURN_IN_ORDER;
- ++optstring;
- }
- else if (optstring[0] == '+')
- {
- ordering = REQUIRE_ORDER;
- ++optstring;
- }
- else if (posixly_correct != NULL)
- ordering = REQUIRE_ORDER;
- else
- ordering = PERMUTE;
-
-#ifdef _LIBC
- if (posixly_correct == NULL
- && argc == original_argc && argv == original_argv)
- {
- if (nonoption_flags_max_len == 0)
- {
- if (__getopt_nonoption_flags == NULL
- || __getopt_nonoption_flags[0] == '\0')
- nonoption_flags_max_len = -1;
- else
- {
- const char *orig_str = __getopt_nonoption_flags;
- int len = nonoption_flags_max_len = strlen (orig_str);
- if (nonoption_flags_max_len < argc)
- nonoption_flags_max_len = argc;
- __getopt_nonoption_flags =
- (char *) malloc (nonoption_flags_max_len);
- if (__getopt_nonoption_flags == NULL)
- nonoption_flags_max_len = -1;
- else
- memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
- '\0', nonoption_flags_max_len - len);
- }
- }
- nonoption_flags_len = nonoption_flags_max_len;
- }
- else
- nonoption_flags_len = 0;
-#endif
-
- return optstring;
-}
-
-/* Scan elements of ARGV (whose length is ARGC) for option characters
- given in OPTSTRING.
-
- If an element of ARGV starts with '-', and is not exactly "-" or "--",
- then it is an option element. The characters of this element
- (aside from the initial '-') are option characters. If `getopt'
- is called repeatedly, it returns successively each of the option characters
- from each of the option elements.
-
- If `getopt' finds another option character, it returns that character,
- updating `optind' and `nextchar' so that the next call to `getopt' can
- resume the scan with the following option character or ARGV-element.
-
- If there are no more option characters, `getopt' returns -1.
- Then `optind' is the index in ARGV of the first ARGV-element
- that is not an option. (The ARGV-elements have been permuted
- so that those that are not options now come last.)
-
- OPTSTRING is a string containing the legitimate option characters.
- If an option character is seen that is not listed in OPTSTRING,
- return '?' after printing an error message. If you set `opterr' to
- zero, the error message is suppressed but we still return '?'.
-
- If a char in OPTSTRING is followed by a colon, that means it wants an arg,
- so the following text in the same ARGV-element, or the text of the following
- ARGV-element, is returned in `optarg'. Two colons mean an option that
- wants an optional arg; if there is text in the current ARGV-element,
- it is returned in `optarg', otherwise `optarg' is set to zero.
-
- If OPTSTRING starts with `-' or `+', it requests different methods of
- handling the non-option ARGV-elements.
- See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-
- Long-named options begin with `--' instead of `-'.
- Their names may be abbreviated as long as the abbreviation is unique
- or is an exact match for some defined option. If they have an
- argument, it follows the option name in the same ARGV-element, separated
- from the option name by a `=', or else the in next ARGV-element.
- When `getopt' finds a long-named option, it returns 0 if that option's
- `flag' field is nonzero, the value of the option's `val' field
- if the `flag' field is zero.
-
- The elements of ARGV aren't really const, because we permute them.
- But we pretend they're const in the prototype to be compatible
- with other systems.
-
- LONGOPTS is a vector of `struct option' terminated by an
- element containing a name which is zero.
-
- LONGIND returns the index in LONGOPT of the long-named option found.
- It is only valid when a long-named option has been found by the most
- recent call.
-
- If LONG_ONLY is nonzero, '-' as well as '--' can introduce
- long-named options. */
-
-int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
- int argc;
- char *const *argv;
- const char *optstring;
- const struct option *longopts;
- int *longind;
- int long_only;
-{
- optarg = NULL;
-
- if (optind == 0 || !__getopt_initialized)
- {
- if (optind == 0)
- optind = 1; /* Don't scan ARGV[0], the program name. */
- optstring = _getopt_initialize (argc, argv, optstring);
- __getopt_initialized = 1;
- }
-
- /* Test whether ARGV[optind] points to a non-option argument.
- Either it does not have option syntax, or there is an environment flag
- from the shell indicating it is not an option. The later information
- is only used when the used in the GNU libc. */
-#ifdef _LIBC
-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \
- || (optind < nonoption_flags_len \
- && __getopt_nonoption_flags[optind] == '1'))
-#else
-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
-#endif
-
- if (nextchar == NULL || *nextchar == '\0')
- {
- /* Advance to the next ARGV-element. */
-
- /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
- moved back by the user (who may also have changed the arguments). */
- if (last_nonopt > optind)
- last_nonopt = optind;
- if (first_nonopt > optind)
- first_nonopt = optind;
-
- if (ordering == PERMUTE)
- {
- /* If we have just processed some options following some non-options,
- exchange them so that the options come first. */
-
- if (first_nonopt != last_nonopt && last_nonopt != optind)
- exchange ((char **) argv);
- else if (last_nonopt != optind)
- first_nonopt = optind;
-
- /* Skip any additional non-options
- and extend the range of non-options previously skipped. */
-
- while (optind < argc && NONOPTION_P)
- optind++;
- last_nonopt = optind;
- }
-
- /* The special ARGV-element `--' means premature end of options.
- Skip it like a null option,
- then exchange with previous non-options as if it were an option,
- then skip everything else like a non-option. */
-
- if (optind != argc && !strcmp (argv[optind], "--"))
- {
- optind++;
-
- if (first_nonopt != last_nonopt && last_nonopt != optind)
- exchange ((char **) argv);
- else if (first_nonopt == last_nonopt)
- first_nonopt = optind;
- last_nonopt = argc;
-
- optind = argc;
- }
-
- /* If we have done all the ARGV-elements, stop the scan
- and back over any non-options that we skipped and permuted. */
-
- if (optind == argc)
- {
- /* Set the next-arg-index to point at the non-options
- that we previously skipped, so the caller will digest them. */
- if (first_nonopt != last_nonopt)
- optind = first_nonopt;
- return -1;
- }
-
- /* If we have come to a non-option and did not permute it,
- either stop the scan or describe it to the caller and pass it by. */
-
- if (NONOPTION_P)
- {
- if (ordering == REQUIRE_ORDER)
- return -1;
- optarg = argv[optind++];
- return 1;
- }
-
- /* We have found another option-ARGV-element.
- Skip the initial punctuation. */
-
- nextchar = (argv[optind] + 1
- + (longopts != NULL && argv[optind][1] == '-'));
- }
-
- /* Decode the current option-ARGV-element. */
-
- /* Check whether the ARGV-element is a long option.
-
- If long_only and the ARGV-element has the form "-f", where f is
- a valid short option, don't consider it an abbreviated form of
- a long option that starts with f. Otherwise there would be no
- way to give the -f short option.
-
- On the other hand, if there's a long option "fubar" and
- the ARGV-element is "-fu", do consider that an abbreviation of
- the long option, just like "--fu", and not "-f" with arg "u".
-
- This distinction seems to be the most useful approach. */
-
- if (longopts != NULL
- && (argv[optind][1] == '-'
- || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
- {
- char *nameend;
- const struct option *p;
- const struct option *pfound = NULL;
- int exact = 0;
- int ambig = 0;
- int indfound = -1;
- int option_index;
-
- for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
- /* Do nothing. */ ;
-
- /* Test all long options for either exact match
- or abbreviated matches. */
- for (p = longopts, option_index = 0; p->name; p++, option_index++)
- if (!strncmp (p->name, nextchar, nameend - nextchar))
- {
- if ((unsigned int) (nameend - nextchar)
- == (unsigned int) strlen (p->name))
- {
- /* Exact match found. */
- pfound = p;
- indfound = option_index;
- exact = 1;
- break;
- }
- else if (pfound == NULL)
- {
- /* First nonexact match found. */
- pfound = p;
- indfound = option_index;
- }
- else
- /* Second or later nonexact match found. */
- ambig = 1;
- }
-
- if (ambig && !exact)
- {
- if (opterr)
- fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
- argv[0], argv[optind]);
- nextchar += strlen (nextchar);
- optind++;
- optopt = 0;
- return '?';
- }
-
- if (pfound != NULL)
- {
- option_index = indfound;
- optind++;
- if (*nameend)
- {
- /* Don't test has_arg with >, because some C compilers don't
- allow it to be used on enums. */
- if (pfound->has_arg)
- optarg = nameend + 1;
- else
- {
- if (opterr)
- {
- if (argv[optind - 1][1] == '-')
- /* --option */
- fprintf (stderr,
- _("%s: option `--%s' doesn't allow an argument\n"),
- argv[0], pfound->name);
- else
- /* +option or -option */
- fprintf (stderr,
- _("%s: option `%c%s' doesn't allow an argument\n"),
- argv[0], argv[optind - 1][0], pfound->name);
- }
-
- nextchar += strlen (nextchar);
-
- optopt = pfound->val;
- return '?';
- }
- }
- else if (pfound->has_arg == 1)
- {
- if (optind < argc)
- optarg = argv[optind++];
- else
- {
- if (opterr)
- fprintf (stderr,
- _("%s: option `%s' requires an argument\n"),
- argv[0], argv[optind - 1]);
- nextchar += strlen (nextchar);
- optopt = pfound->val;
- return optstring[0] == ':' ? ':' : '?';
- }
- }
- nextchar += strlen (nextchar);
- if (longind != NULL)
- *longind = option_index;
- if (pfound->flag)
- {
- *(pfound->flag) = pfound->val;
- return 0;
- }
- return pfound->val;
- }
-
- /* Can't find it as a long option. If this is not getopt_long_only,
- or the option starts with '--' or is not a valid short
- option, then it's an error.
- Otherwise interpret it as a short option. */
- if (!long_only || argv[optind][1] == '-'
- || my_index (optstring, *nextchar) == NULL)
- {
- if (opterr)
- {
- if (argv[optind][1] == '-')
- /* --option */
- fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
- argv[0], nextchar);
- else
- /* +option or -option */
- fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
- argv[0], argv[optind][0], nextchar);
- }
- nextchar = (char *) "";
- optind++;
- optopt = 0;
- return '?';
- }
- }
-
- /* Look at and handle the next short option-character. */
-
- {
- char c = *nextchar++;
- char *temp = my_index (optstring, c);
-
- /* Increment `optind' when we start to process its last character. */
- if (*nextchar == '\0')
- ++optind;
-
- if (temp == NULL || c == ':')
- {
- if (opterr)
- {
- if (posixly_correct)
- /* 1003.2 specifies the format of this message. */
- fprintf (stderr, _("%s: illegal option -- %c\n"),
- argv[0], c);
- else
- fprintf (stderr, _("%s: invalid option -- %c\n"),
- argv[0], c);
- }
- optopt = c;
- return '?';
- }
- /* Convenience. Treat POSIX -W foo same as long option --foo */
- if (temp[0] == 'W' && temp[1] == ';')
- {
- char *nameend;
- const struct option *p;
- const struct option *pfound = NULL;
- int exact = 0;
- int ambig = 0;
- int indfound = 0;
- int option_index;
-
- /* This is an option that requires an argument. */
- if (*nextchar != '\0')
- {
- optarg = nextchar;
- /* If we end this ARGV-element by taking the rest as an arg,
- we must advance to the next element now. */
- optind++;
- }
- else if (optind == argc)
- {
- if (opterr)
- {
- /* 1003.2 specifies the format of this message. */
- fprintf (stderr, _("%s: option requires an argument -- %c\n"),
- argv[0], c);
- }
- optopt = c;
- if (optstring[0] == ':')
- c = ':';
- else
- c = '?';
- return c;
- }
- else
- /* We already incremented `optind' once;
- increment it again when taking next ARGV-elt as argument. */
- optarg = argv[optind++];
-
- /* optarg is now the argument, see if it's in the
- table of longopts. */
-
- for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
- /* Do nothing. */ ;
-
- /* Test all long options for either exact match
- or abbreviated matches. */
- for (p = longopts, option_index = 0; p->name; p++, option_index++)
- if (!strncmp (p->name, nextchar, nameend - nextchar))
- {
- if ((unsigned int) (nameend - nextchar) == strlen (p->name))
- {
- /* Exact match found. */
- pfound = p;
- indfound = option_index;
- exact = 1;
- break;
- }
- else if (pfound == NULL)
- {
- /* First nonexact match found. */
- pfound = p;
- indfound = option_index;
- }
- else
- /* Second or later nonexact match found. */
- ambig = 1;
- }
- if (ambig && !exact)
- {
- if (opterr)
- fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
- argv[0], argv[optind]);
- nextchar += strlen (nextchar);
- optind++;
- return '?';
- }
- if (pfound != NULL)
- {
- option_index = indfound;
- if (*nameend)
- {
- /* Don't test has_arg with >, because some C compilers don't
- allow it to be used on enums. */
- if (pfound->has_arg)
- optarg = nameend + 1;
- else
- {
- if (opterr)
- fprintf (stderr, _("\
-%s: option `-W %s' doesn't allow an argument\n"),
- argv[0], pfound->name);
-
- nextchar += strlen (nextchar);
- return '?';
- }
- }
- else if (pfound->has_arg == 1)
- {
- if (optind < argc)
- optarg = argv[optind++];
- else
- {
- if (opterr)
- fprintf (stderr,
- _("%s: option `%s' requires an argument\n"),
- argv[0], argv[optind - 1]);
- nextchar += strlen (nextchar);
- return optstring[0] == ':' ? ':' : '?';
- }
- }
- nextchar += strlen (nextchar);
- if (longind != NULL)
- *longind = option_index;
- if (pfound->flag)
- {
- *(pfound->flag) = pfound->val;
- return 0;
- }
- return pfound->val;
- }
- nextchar = NULL;
- return 'W'; /* Let the application handle it. */
- }
- if (temp[1] == ':')
- {
- if (temp[2] == ':')
- {
- /* This is an option that accepts an argument optionally. */
- if (*nextchar != '\0')
- {
- optarg = nextchar;
- optind++;
- }
- else
- optarg = NULL;
- nextchar = NULL;
- }
- else
- {
- /* This is an option that requires an argument. */
- if (*nextchar != '\0')
- {
- optarg = nextchar;
- /* If we end this ARGV-element by taking the rest as an arg,
- we must advance to the next element now. */
- optind++;
- }
- else if (optind == argc)
- {
- if (opterr)
- {
- /* 1003.2 specifies the format of this message. */
- fprintf (stderr,
- _("%s: option requires an argument -- %c\n"),
- argv[0], c);
- }
- optopt = c;
- if (optstring[0] == ':')
- c = ':';
- else
- c = '?';
- }
- else
- /* We already incremented `optind' once;
- increment it again when taking next ARGV-elt as argument. */
- optarg = argv[optind++];
- nextchar = NULL;
- }
- }
- return c;
- }
-}
-
-int
-getopt (argc, argv, optstring)
- int argc;
- char *const *argv;
- const char *optstring;
-{
- return _getopt_internal (argc, argv, optstring,
- (const struct option *) 0,
- (int *) 0,
- 0);
-}
-
-#endif /* Not ELIDE_CODE. */
-
-#ifdef TEST
-
-/* Compile with -DTEST to make an executable for use in testing
- the above definition of `getopt'. */
-
-int
-main (argc, argv)
- int argc;
- char **argv;
-{
- int c;
- int digit_optind = 0;
-
- while (1)
- {
- int this_option_optind = optind ? optind : 1;
-
- c = getopt (argc, argv, "abc:d:0123456789");
- if (c == -1)
- break;
-
- switch (c)
- {
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- if (digit_optind != 0 && digit_optind != this_option_optind)
- printf ("digits occur in two different argv-elements.\n");
- digit_optind = this_option_optind;
- printf ("option %c\n", c);
- break;
-
- case 'a':
- printf ("option a\n");
- break;
-
- case 'b':
- printf ("option b\n");
- break;
-
- case 'c':
- printf ("option c with value `%s'\n", optarg);
- break;
-
- case '?':
- break;
-
- default:
- printf ("?? getopt returned character code 0%o ??\n", c);
- }
- }
-
- if (optind < argc)
- {
- printf ("non-option ARGV-elements: ");
- while (optind < argc)
- printf ("%s ", argv[optind++]);
- printf ("\n");
- }
-
- exit (0);
-}
-
-#endif /* TEST */
+/* Getopt for GNU.
+ NOTE: getopt is now part of the C library, so if you don't know what
+ "Keep this file name-space clean" means, talk to drepper at gnu.org
+ before changing it!
+
+ Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
+ Free Software Foundation, Inc.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
+ Ditto for AIX 3.2 and <stdlib.h>. */
+#ifndef _NO_PROTO
+# define _NO_PROTO
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#if !defined __STDC__ || !__STDC__
+/* This is a separate conditional since some stdc systems
+ reject `defined (const)'. */
+# ifndef const
+# define const
+# endif
+#endif
+
+#include <stdio.h>
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+ actually compiling the library itself. This code is part of the GNU C
+ Library, but also included in many other GNU distributions. Compiling
+ and linking in this code is a waste when using the GNU C library
+ (especially if it is a shared library). Rather than having every GNU
+ program understand `configure --with-gnu-libc' and omit the object files,
+ it is simpler to just do this in the source for each such file. */
+
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+# include <gnu-versions.h>
+# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+# define ELIDE_CODE
+# endif
+#endif
+
+#ifndef ELIDE_CODE
+
+
+/* This needs to come after some library #include
+ to get __GNU_LIBRARY__ defined. */
+#ifdef __GNU_LIBRARY__
+/* Don't include stdlib.h for non-GNU C libraries because some of them
+ contain conflicting prototypes for getopt. */
+# include <stdlib.h>
+# include <unistd.h>
+#endif /* GNU C library. */
+
+#ifdef VMS
+# include <unixlib.h>
+# if HAVE_STRING_H - 0
+# include <string.h>
+# endif
+#endif
+
+#ifndef _
+/* This is for other GNU distributions with internationalized messages.
+ When compiling libc, the _ macro is predefined. */
+# ifdef HAVE_LIBINTL_H
+# include <libintl.h>
+# define _(msgid) gettext (msgid)
+# else
+# define _(msgid) (msgid)
+# endif
+#endif
+
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
+ but it behaves differently for the user, since it allows the user
+ to intersperse the options with the other arguments.
+
+ As `getopt' works, it permutes the elements of ARGV so that,
+ when it is done, all the options precede everything else. Thus
+ all application programs are extended to handle flexible argument order.
+
+ Setting the environment variable POSIXLY_CORRECT disables permutation.
+ Then the behavior is completely standard.
+
+ GNU application programs can use a third alternative mode in which
+ they can distinguish the relative order of options and other arguments. */
+
+#include "getopt_win.h"
+
+/* For communication from `getopt' to the caller.
+ When `getopt' finds an option that takes an argument,
+ the argument value is returned here.
+ Also, when `ordering' is RETURN_IN_ORDER,
+ each non-option ARGV-element is returned here. */
+
+char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+ This is used for communication to and from the caller
+ and for communication between successive calls to `getopt'.
+
+ On entry to `getopt', zero means this is the first call; initialize.
+
+ When `getopt' returns -1, this is the index of the first of the
+ non-option elements that the caller should itself scan.
+
+ Otherwise, `optind' communicates from one call to the next
+ how much of ARGV has been scanned so far. */
+
+/* 1003.2 says this must be 1 before any call. */
+int optind = 1;
+
+/* Formerly, initialization of getopt depended on optind==0, which
+ causes problems with re-calling getopt as programs generally don't
+ know that. */
+
+int __getopt_initialized;
+
+/* The next char to be scanned in the option-element
+ in which the last option character we returned was found.
+ This allows us to pick up the scan where we left off.
+
+ If this is zero, or a null string, it means resume the scan
+ by advancing to the next ARGV-element. */
+
+static char *nextchar;
+
+/* Callers store zero here to inhibit the error message
+ for unrecognized options. */
+
+int opterr = 1;
+
+/* Set to an option character which was unrecognized.
+ This must be initialized on some systems to avoid linking in the
+ system's own getopt implementation. */
+
+int optopt = '?';
+
+/* Describe how to deal with options that follow non-option ARGV-elements.
+
+ If the caller did not specify anything,
+ the default is REQUIRE_ORDER if the environment variable
+ POSIXLY_CORRECT is defined, PERMUTE otherwise.
+
+ REQUIRE_ORDER means don't recognize them as options;
+ stop option processing when the first non-option is seen.
+ This is what Unix does.
+ This mode of operation is selected by either setting the environment
+ variable POSIXLY_CORRECT, or using `+' as the first character
+ of the list of option characters.
+
+ PERMUTE is the default. We permute the contents of ARGV as we scan,
+ so that eventually all the non-options are at the end. This allows options
+ to be given in any order, even with programs that were not written to
+ expect this.
+
+ RETURN_IN_ORDER is an option available to programs that were written
+ to expect options and other ARGV-elements in any order and that care about
+ the ordering of the two. We describe each non-option ARGV-element
+ as if it were the argument of an option with character code 1.
+ Using `-' as the first character of the list of option characters
+ selects this mode of operation.
+
+ The special argument `--' forces an end of option-scanning regardless
+ of the value of `ordering'. In the case of RETURN_IN_ORDER, only
+ `--' can cause `getopt' to return -1 with `optind' != ARGC. */
+
+static enum
+{
+ REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+} ordering;
+
+/* Value of POSIXLY_CORRECT environment variable. */
+static char *posixly_correct;
+
+#ifdef __GNU_LIBRARY__
+/* We want to avoid inclusion of string.h with non-GNU libraries
+ because there are many ways it can cause trouble.
+ On some systems, it contains special magic macros that don't work
+ in GCC. */
+# include <string.h>
+# define my_index strchr
+#else
+
+#include <string.h>
+
+/* Avoid depending on library functions or files
+ whose names are inconsistent. */
+
+#ifndef getenv
+extern char *getenv ();
+#endif
+
+static char *
+my_index (str, chr)
+ const char *str;
+ int chr;
+{
+ while (*str)
+ {
+ if (*str == chr)
+ return (char *) str;
+ str++;
+ }
+ return 0;
+}
+
+/* If using GCC, we can safely declare strlen this way.
+ If not using GCC, it is ok not to declare it. */
+#ifdef __GNUC__
+/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
+ That was relevant to code that was here before. */
+# if (!defined __STDC__ || !__STDC__) && !defined strlen
+/* gcc with -traditional declares the built-in strlen to return int,
+ and has done so at least since version 2.4.5. -- rms. */
+extern int strlen (const char *);
+# endif /* not __STDC__ */
+#endif /* __GNUC__ */
+
+#endif /* not __GNU_LIBRARY__ */
+
+/* Handle permutation of arguments. */
+
+/* Describe the part of ARGV that contains non-options that have
+ been skipped. `first_nonopt' is the index in ARGV of the first of them;
+ `last_nonopt' is the index after the last of them. */
+
+static int first_nonopt;
+static int last_nonopt;
+
+#ifdef _LIBC
+/* Bash 2.0 gives us an environment variable containing flags
+ indicating ARGV elements that should not be considered arguments. */
+
+/* Defined in getopt_init.c */
+extern char *__getopt_nonoption_flags;
+
+static int nonoption_flags_max_len;
+static int nonoption_flags_len;
+
+static int original_argc;
+static char *const *original_argv;
+
+/* Make sure the environment variable bash 2.0 puts in the environment
+ is valid for the getopt call we must make sure that the ARGV passed
+ to getopt is that one passed to the process. */
+static void
+__attribute__ ((unused))
+store_args_and_env (int argc, char *const *argv)
+{
+ /* XXX This is no good solution. We should rather copy the args so
+ that we can compare them later. But we must not use malloc(3). */
+ original_argc = argc;
+ original_argv = argv;
+}
+# ifdef text_set_element
+text_set_element (__libc_subinit, store_args_and_env);
+# endif /* text_set_element */
+
+# define SWAP_FLAGS(ch1, ch2) \
+ if (nonoption_flags_len > 0) \
+ { \
+ char __tmp = __getopt_nonoption_flags[ch1]; \
+ __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \
+ __getopt_nonoption_flags[ch2] = __tmp; \
+ }
+#else /* !_LIBC */
+# define SWAP_FLAGS(ch1, ch2)
+#endif /* _LIBC */
+
+/* Exchange two adjacent subsequences of ARGV.
+ One subsequence is elements [first_nonopt,last_nonopt)
+ which contains all the non-options that have been skipped so far.
+ The other is elements [last_nonopt,optind), which contains all
+ the options processed since those non-options were skipped.
+
+ `first_nonopt' and `last_nonopt' are relocated so that they describe
+ the new indices of the non-options in ARGV after they are moved. */
+
+#if defined __STDC__ && __STDC__
+static void exchange (char **);
+#endif
+
+static void
+exchange (argv)
+ char **argv;
+{
+ int bottom = first_nonopt;
+ int middle = last_nonopt;
+ int top = optind;
+ char *tem;
+
+ /* Exchange the shorter segment with the far end of the longer segment.
+ That puts the shorter segment into the right place.
+ It leaves the longer segment in the right place overall,
+ but it consists of two parts that need to be swapped next. */
+
+#ifdef _LIBC
+ /* First make sure the handling of the `__getopt_nonoption_flags'
+ string can work normally. Our top argument must be in the range
+ of the string. */
+ if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
+ {
+ /* We must extend the array. The user plays games with us and
+ presents new arguments. */
+ char *new_str = malloc (top + 1);
+ if (new_str == NULL)
+ nonoption_flags_len = nonoption_flags_max_len = 0;
+ else
+ {
+ memset (__mempcpy (new_str, __getopt_nonoption_flags,
+ nonoption_flags_max_len),
+ '\0', top + 1 - nonoption_flags_max_len);
+ nonoption_flags_max_len = top + 1;
+ __getopt_nonoption_flags = new_str;
+ }
+ }
+#endif
+
+ while (top > middle && middle > bottom)
+ {
+ if (top - middle > middle - bottom)
+ {
+ /* Bottom segment is the short one. */
+ int len = middle - bottom;
+ register int i;
+
+ /* Swap it with the top part of the top segment. */
+ for (i = 0; i < len; i++)
+ {
+ tem = argv[bottom + i];
+ argv[bottom + i] = argv[top - (middle - bottom) + i];
+ argv[top - (middle - bottom) + i] = tem;
+ SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
+ }
+ /* Exclude the moved bottom segment from further swapping. */
+ top -= len;
+ }
+ else
+ {
+ /* Top segment is the short one. */
+ int len = top - middle;
+ register int i;
+
+ /* Swap it with the bottom part of the bottom segment. */
+ for (i = 0; i < len; i++)
+ {
+ tem = argv[bottom + i];
+ argv[bottom + i] = argv[middle + i];
+ argv[middle + i] = tem;
+ SWAP_FLAGS (bottom + i, middle + i);
+ }
+ /* Exclude the moved top segment from further swapping. */
+ bottom += len;
+ }
+ }
+
+ /* Update records for the slots the non-options now occupy. */
+
+ first_nonopt += (optind - last_nonopt);
+ last_nonopt = optind;
+}
+
+/* Initialize the internal data when the first call is made. */
+
+#if defined __STDC__ && __STDC__
+static const char *_getopt_initialize (int, char *const *, const char *);
+#endif
+static const char *
+_getopt_initialize (argc, argv, optstring)
+ int argc;
+ char *const *argv;
+ const char *optstring;
+{
+ /* Start processing options with ARGV-element 1 (since ARGV-element 0
+ is the program name); the sequence of previously skipped
+ non-option ARGV-elements is empty. */
+
+ first_nonopt = last_nonopt = optind;
+
+ nextchar = NULL;
+
+ posixly_correct = getenv ("POSIXLY_CORRECT");
+
+ /* Determine how to handle the ordering of options and nonoptions. */
+
+ if (optstring[0] == '-')
+ {
+ ordering = RETURN_IN_ORDER;
+ ++optstring;
+ }
+ else if (optstring[0] == '+')
+ {
+ ordering = REQUIRE_ORDER;
+ ++optstring;
+ }
+ else if (posixly_correct != NULL)
+ ordering = REQUIRE_ORDER;
+ else
+ ordering = PERMUTE;
+
+#ifdef _LIBC
+ if (posixly_correct == NULL
+ && argc == original_argc && argv == original_argv)
+ {
+ if (nonoption_flags_max_len == 0)
+ {
+ if (__getopt_nonoption_flags == NULL
+ || __getopt_nonoption_flags[0] == '\0')
+ nonoption_flags_max_len = -1;
+ else
+ {
+ const char *orig_str = __getopt_nonoption_flags;
+ int len = nonoption_flags_max_len = strlen (orig_str);
+ if (nonoption_flags_max_len < argc)
+ nonoption_flags_max_len = argc;
+ __getopt_nonoption_flags =
+ (char *) malloc (nonoption_flags_max_len);
+ if (__getopt_nonoption_flags == NULL)
+ nonoption_flags_max_len = -1;
+ else
+ memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+ '\0', nonoption_flags_max_len - len);
+ }
+ }
+ nonoption_flags_len = nonoption_flags_max_len;
+ }
+ else
+ nonoption_flags_len = 0;
+#endif
+
+ return optstring;
+}
+
+/* Scan elements of ARGV (whose length is ARGC) for option characters
+ given in OPTSTRING.
+
+ If an element of ARGV starts with '-', and is not exactly "-" or "--",
+ then it is an option element. The characters of this element
+ (aside from the initial '-') are option characters. If `getopt'
+ is called repeatedly, it returns successively each of the option characters
+ from each of the option elements.
+
+ If `getopt' finds another option character, it returns that character,
+ updating `optind' and `nextchar' so that the next call to `getopt' can
+ resume the scan with the following option character or ARGV-element.
+
+ If there are no more option characters, `getopt' returns -1.
+ Then `optind' is the index in ARGV of the first ARGV-element
+ that is not an option. (The ARGV-elements have been permuted
+ so that those that are not options now come last.)
+
+ OPTSTRING is a string containing the legitimate option characters.
+ If an option character is seen that is not listed in OPTSTRING,
+ return '?' after printing an error message. If you set `opterr' to
+ zero, the error message is suppressed but we still return '?'.
+
+ If a char in OPTSTRING is followed by a colon, that means it wants an arg,
+ so the following text in the same ARGV-element, or the text of the following
+ ARGV-element, is returned in `optarg'. Two colons mean an option that
+ wants an optional arg; if there is text in the current ARGV-element,
+ it is returned in `optarg', otherwise `optarg' is set to zero.
+
+ If OPTSTRING starts with `-' or `+', it requests different methods of
+ handling the non-option ARGV-elements.
+ See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
+
+ Long-named options begin with `--' instead of `-'.
+ Their names may be abbreviated as long as the abbreviation is unique
+ or is an exact match for some defined option. If they have an
+ argument, it follows the option name in the same ARGV-element, separated
+ from the option name by a `=', or else the in next ARGV-element.
+ When `getopt' finds a long-named option, it returns 0 if that option's
+ `flag' field is nonzero, the value of the option's `val' field
+ if the `flag' field is zero.
+
+ The elements of ARGV aren't really const, because we permute them.
+ But we pretend they're const in the prototype to be compatible
+ with other systems.
+
+ LONGOPTS is a vector of `struct option' terminated by an
+ element containing a name which is zero.
+
+ LONGIND returns the index in LONGOPT of the long-named option found.
+ It is only valid when a long-named option has been found by the most
+ recent call.
+
+ If LONG_ONLY is nonzero, '-' as well as '--' can introduce
+ long-named options. */
+
+int
+_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
+ int argc;
+ char *const *argv;
+ const char *optstring;
+ const struct option *longopts;
+ int *longind;
+ int long_only;
+{
+ optarg = NULL;
+
+ if (optind == 0 || !__getopt_initialized)
+ {
+ if (optind == 0)
+ optind = 1; /* Don't scan ARGV[0], the program name. */
+ optstring = _getopt_initialize (argc, argv, optstring);
+ __getopt_initialized = 1;
+ }
+
+ /* Test whether ARGV[optind] points to a non-option argument.
+ Either it does not have option syntax, or there is an environment flag
+ from the shell indicating it is not an option. The later information
+ is only used when the used in the GNU libc. */
+#ifdef _LIBC
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \
+ || (optind < nonoption_flags_len \
+ && __getopt_nonoption_flags[optind] == '1'))
+#else
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
+#endif
+
+ if (nextchar == NULL || *nextchar == '\0')
+ {
+ /* Advance to the next ARGV-element. */
+
+ /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
+ moved back by the user (who may also have changed the arguments). */
+ if (last_nonopt > optind)
+ last_nonopt = optind;
+ if (first_nonopt > optind)
+ first_nonopt = optind;
+
+ if (ordering == PERMUTE)
+ {
+ /* If we have just processed some options following some non-options,
+ exchange them so that the options come first. */
+
+ if (first_nonopt != last_nonopt && last_nonopt != optind)
+ exchange ((char **) argv);
+ else if (last_nonopt != optind)
+ first_nonopt = optind;
+
+ /* Skip any additional non-options
+ and extend the range of non-options previously skipped. */
+
+ while (optind < argc && NONOPTION_P)
+ optind++;
+ last_nonopt = optind;
+ }
+
+ /* The special ARGV-element `--' means premature end of options.
+ Skip it like a null option,
+ then exchange with previous non-options as if it were an option,
+ then skip everything else like a non-option. */
+
+ if (optind != argc && !strcmp (argv[optind], "--"))
+ {
+ optind++;
+
+ if (first_nonopt != last_nonopt && last_nonopt != optind)
+ exchange ((char **) argv);
+ else if (first_nonopt == last_nonopt)
+ first_nonopt = optind;
+ last_nonopt = argc;
+
+ optind = argc;
+ }
+
+ /* If we have done all the ARGV-elements, stop the scan
+ and back over any non-options that we skipped and permuted. */
+
+ if (optind == argc)
+ {
+ /* Set the next-arg-index to point at the non-options
+ that we previously skipped, so the caller will digest them. */
+ if (first_nonopt != last_nonopt)
+ optind = first_nonopt;
+ return -1;
+ }
+
+ /* If we have come to a non-option and did not permute it,
+ either stop the scan or describe it to the caller and pass it by. */
+
+ if (NONOPTION_P)
+ {
+ if (ordering == REQUIRE_ORDER)
+ return -1;
+ optarg = argv[optind++];
+ return 1;
+ }
+
+ /* We have found another option-ARGV-element.
+ Skip the initial punctuation. */
+
+ nextchar = (argv[optind] + 1
+ + (longopts != NULL && argv[optind][1] == '-'));
+ }
+
+ /* Decode the current option-ARGV-element. */
+
+ /* Check whether the ARGV-element is a long option.
+
+ If long_only and the ARGV-element has the form "-f", where f is
+ a valid short option, don't consider it an abbreviated form of
+ a long option that starts with f. Otherwise there would be no
+ way to give the -f short option.
+
+ On the other hand, if there's a long option "fubar" and
+ the ARGV-element is "-fu", do consider that an abbreviation of
+ the long option, just like "--fu", and not "-f" with arg "u".
+
+ This distinction seems to be the most useful approach. */
+
+ if (longopts != NULL
+ && (argv[optind][1] == '-'
+ || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
+ {
+ char *nameend;
+ const struct option *p;
+ const struct option *pfound = NULL;
+ int exact = 0;
+ int ambig = 0;
+ int indfound = -1;
+ int option_index;
+
+ for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
+ /* Do nothing. */ ;
+
+ /* Test all long options for either exact match
+ or abbreviated matches. */
+ for (p = longopts, option_index = 0; p->name; p++, option_index++)
+ if (!strncmp (p->name, nextchar, nameend - nextchar))
+ {
+ if ((unsigned int) (nameend - nextchar)
+ == (unsigned int) strlen (p->name))
+ {
+ /* Exact match found. */
+ pfound = p;
+ indfound = option_index;
+ exact = 1;
+ break;
+ }
+ else if (pfound == NULL)
+ {
+ /* First nonexact match found. */
+ pfound = p;
+ indfound = option_index;
+ }
+ else
+ /* Second or later nonexact match found. */
+ ambig = 1;
+ }
+
+ if (ambig && !exact)
+ {
+ if (opterr)
+ fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+ argv[0], argv[optind]);
+ nextchar += strlen (nextchar);
+ optind++;
+ optopt = 0;
+ return '?';
+ }
+
+ if (pfound != NULL)
+ {
+ option_index = indfound;
+ optind++;
+ if (*nameend)
+ {
+ /* Don't test has_arg with >, because some C compilers don't
+ allow it to be used on enums. */
+ if (pfound->has_arg)
+ optarg = nameend + 1;
+ else
+ {
+ if (opterr)
+ {
+ if (argv[optind - 1][1] == '-')
+ /* --option */
+ fprintf (stderr,
+ _("%s: option `--%s' doesn't allow an argument\n"),
+ argv[0], pfound->name);
+ else
+ /* +option or -option */
+ fprintf (stderr,
+ _("%s: option `%c%s' doesn't allow an argument\n"),
+ argv[0], argv[optind - 1][0], pfound->name);
+ }
+
+ nextchar += strlen (nextchar);
+
+ optopt = pfound->val;
+ return '?';
+ }
+ }
+ else if (pfound->has_arg == 1)
+ {
+ if (optind < argc)
+ optarg = argv[optind++];
+ else
+ {
+ if (opterr)
+ fprintf (stderr,
+ _("%s: option `%s' requires an argument\n"),
+ argv[0], argv[optind - 1]);
+ nextchar += strlen (nextchar);
+ optopt = pfound->val;
+ return optstring[0] == ':' ? ':' : '?';
+ }
+ }
+ nextchar += strlen (nextchar);
+ if (longind != NULL)
+ *longind = option_index;
+ if (pfound->flag)
+ {
+ *(pfound->flag) = pfound->val;
+ return 0;
+ }
+ return pfound->val;
+ }
+
+ /* Can't find it as a long option. If this is not getopt_long_only,
+ or the option starts with '--' or is not a valid short
+ option, then it's an error.
+ Otherwise interpret it as a short option. */
+ if (!long_only || argv[optind][1] == '-'
+ || my_index (optstring, *nextchar) == NULL)
+ {
+ if (opterr)
+ {
+ if (argv[optind][1] == '-')
+ /* --option */
+ fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+ argv[0], nextchar);
+ else
+ /* +option or -option */
+ fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+ argv[0], argv[optind][0], nextchar);
+ }
+ nextchar = (char *) "";
+ optind++;
+ optopt = 0;
+ return '?';
+ }
+ }
+
+ /* Look at and handle the next short option-character. */
+
+ {
+ char c = *nextchar++;
+ char *temp = my_index (optstring, c);
+
+ /* Increment `optind' when we start to process its last character. */
+ if (*nextchar == '\0')
+ ++optind;
+
+ if (temp == NULL || c == ':')
+ {
+ if (opterr)
+ {
+ if (posixly_correct)
+ /* 1003.2 specifies the format of this message. */
+ fprintf (stderr, _("%s: illegal option -- %c\n"),
+ argv[0], c);
+ else
+ fprintf (stderr, _("%s: invalid option -- %c\n"),
+ argv[0], c);
+ }
+ optopt = c;
+ return '?';
+ }
+ /* Convenience. Treat POSIX -W foo same as long option --foo */
+ if (temp[0] == 'W' && temp[1] == ';')
+ {
+ char *nameend;
+ const struct option *p;
+ const struct option *pfound = NULL;
+ int exact = 0;
+ int ambig = 0;
+ int indfound = 0;
+ int option_index;
+
+ /* This is an option that requires an argument. */
+ if (*nextchar != '\0')
+ {
+ optarg = nextchar;
+ /* If we end this ARGV-element by taking the rest as an arg,
+ we must advance to the next element now. */
+ optind++;
+ }
+ else if (optind == argc)
+ {
+ if (opterr)
+ {
+ /* 1003.2 specifies the format of this message. */
+ fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+ argv[0], c);
+ }
+ optopt = c;
+ if (optstring[0] == ':')
+ c = ':';
+ else
+ c = '?';
+ return c;
+ }
+ else
+ /* We already incremented `optind' once;
+ increment it again when taking next ARGV-elt as argument. */
+ optarg = argv[optind++];
+
+ /* optarg is now the argument, see if it's in the
+ table of longopts. */
+
+ for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
+ /* Do nothing. */ ;
+
+ /* Test all long options for either exact match
+ or abbreviated matches. */
+ for (p = longopts, option_index = 0; p->name; p++, option_index++)
+ if (!strncmp (p->name, nextchar, nameend - nextchar))
+ {
+ if ((unsigned int) (nameend - nextchar) == strlen (p->name))
+ {
+ /* Exact match found. */
+ pfound = p;
+ indfound = option_index;
+ exact = 1;
+ break;
+ }
+ else if (pfound == NULL)
+ {
+ /* First nonexact match found. */
+ pfound = p;
+ indfound = option_index;
+ }
+ else
+ /* Second or later nonexact match found. */
+ ambig = 1;
+ }
+ if (ambig && !exact)
+ {
+ if (opterr)
+ fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+ argv[0], argv[optind]);
+ nextchar += strlen (nextchar);
+ optind++;
+ return '?';
+ }
+ if (pfound != NULL)
+ {
+ option_index = indfound;
+ if (*nameend)
+ {
+ /* Don't test has_arg with >, because some C compilers don't
+ allow it to be used on enums. */
+ if (pfound->has_arg)
+ optarg = nameend + 1;
+ else
+ {
+ if (opterr)
+ fprintf (stderr, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+ argv[0], pfound->name);
+
+ nextchar += strlen (nextchar);
+ return '?';
+ }
+ }
+ else if (pfound->has_arg == 1)
+ {
+ if (optind < argc)
+ optarg = argv[optind++];
+ else
+ {
+ if (opterr)
+ fprintf (stderr,
+ _("%s: option `%s' requires an argument\n"),
+ argv[0], argv[optind - 1]);
+ nextchar += strlen (nextchar);
+ return optstring[0] == ':' ? ':' : '?';
+ }
+ }
+ nextchar += strlen (nextchar);
+ if (longind != NULL)
+ *longind = option_index;
+ if (pfound->flag)
+ {
+ *(pfound->flag) = pfound->val;
+ return 0;
+ }
+ return pfound->val;
+ }
+ nextchar = NULL;
+ return 'W'; /* Let the application handle it. */
+ }
+ if (temp[1] == ':')
+ {
+ if (temp[2] == ':')
+ {
+ /* This is an option that accepts an argument optionally. */
+ if (*nextchar != '\0')
+ {
+ optarg = nextchar;
+ optind++;
+ }
+ else
+ optarg = NULL;
+ nextchar = NULL;
+ }
+ else
+ {
+ /* This is an option that requires an argument. */
+ if (*nextchar != '\0')
+ {
+ optarg = nextchar;
+ /* If we end this ARGV-element by taking the rest as an arg,
+ we must advance to the next element now. */
+ optind++;
+ }
+ else if (optind == argc)
+ {
+ if (opterr)
+ {
+ /* 1003.2 specifies the format of this message. */
+ fprintf (stderr,
+ _("%s: option requires an argument -- %c\n"),
+ argv[0], c);
+ }
+ optopt = c;
+ if (optstring[0] == ':')
+ c = ':';
+ else
+ c = '?';
+ }
+ else
+ /* We already incremented `optind' once;
+ increment it again when taking next ARGV-elt as argument. */
+ optarg = argv[optind++];
+ nextchar = NULL;
+ }
+ }
+ return c;
+ }
+}
+
+int
+getopt (argc, argv, optstring)
+ int argc;
+ char *const *argv;
+ const char *optstring;
+{
+ return _getopt_internal (argc, argv, optstring,
+ (const struct option *) 0,
+ (int *) 0,
+ 0);
+}
+
+#endif /* Not ELIDE_CODE. */
+
+#ifdef TEST
+
+/* Compile with -DTEST to make an executable for use in testing
+ the above definition of `getopt'. */
+
+int
+main (argc, argv)
+ int argc;
+ char **argv;
+{
+ int c;
+ int digit_optind = 0;
+
+ while (1)
+ {
+ int this_option_optind = optind ? optind : 1;
+
+ c = getopt (argc, argv, "abc:d:0123456789");
+ if (c == -1)
+ break;
+
+ switch (c)
+ {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ if (digit_optind != 0 && digit_optind != this_option_optind)
+ printf ("digits occur in two different argv-elements.\n");
+ digit_optind = this_option_optind;
+ printf ("option %c\n", c);
+ break;
+
+ case 'a':
+ printf ("option a\n");
+ break;
+
+ case 'b':
+ printf ("option b\n");
+ break;
+
+ case 'c':
+ printf ("option c with value `%s'\n", optarg);
+ break;
+
+ case '?':
+ break;
+
+ default:
+ printf ("?? getopt returned character code 0%o ??\n", c);
+ }
+ }
+
+ if (optind < argc)
+ {
+ printf ("non-option ARGV-elements: ");
+ while (optind < argc)
+ printf ("%s ", argv[optind++]);
+ printf ("\n");
+ }
+
+ exit (0);
+}
+
+#endif /* TEST */
Property changes on: trunk/theora/win32/getopt.c
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/theora/win32/getopt1.c
===================================================================
--- trunk/theora/win32/getopt1.c 2007-10-03 01:50:11 UTC (rev 13924)
+++ trunk/theora/win32/getopt1.c 2007-10-03 18:51:06 UTC (rev 13925)
@@ -1,188 +1,188 @@
-/* getopt_long and getopt_long_only entry points for GNU getopt.
- Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
- Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "getopt_win.h"
-
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
-#ifndef const
-#define const
-#endif
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
- Library, but also included in many other GNU distributions. Compiling
- and linking in this code is a waste when using the GNU C library
- (especially if it is a shared library). Rather than having every GNU
- program understand `configure --with-gnu-libc' and omit the object files,
- it is simpler to just do this in the source for each such file. */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
-#include <gnu-versions.h>
-#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-#define ELIDE_CODE
-#endif
-#endif
-
-#ifndef ELIDE_CODE
-
-
-/* This needs to come after some library #include
- to get __GNU_LIBRARY__ defined. */
-#ifdef __GNU_LIBRARY__
-#include <stdlib.h>
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-int
-getopt_long (argc, argv, options, long_options, opt_index)
- int argc;
- char *const *argv;
- const char *options;
- const struct option *long_options;
- int *opt_index;
-{
- return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
-}
-
-/* Like getopt_long, but '-' as well as '--' can indicate a long option.
- If an option that starts with '-' (not '--') doesn't match a long option,
- but does match a short option, it is parsed as a short option
- instead. */
-
-int
-getopt_long_only (argc, argv, options, long_options, opt_index)
- int argc;
- char *const *argv;
- const char *options;
- const struct option *long_options;
- int *opt_index;
-{
- return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
-}
-
-
-#endif /* Not ELIDE_CODE. */
-
-#ifdef TEST
-
-#include <stdio.h>
-
-int
-main (argc, argv)
- int argc;
- char **argv;
-{
- int c;
- int digit_optind = 0;
-
- while (1)
- {
- int this_option_optind = optind ? optind : 1;
- int option_index = 0;
- static struct option long_options[] =
- {
- {"add", 1, 0, 0},
- {"append", 0, 0, 0},
- {"delete", 1, 0, 0},
- {"verbose", 0, 0, 0},
- {"create", 0, 0, 0},
- {"file", 1, 0, 0},
- {0, 0, 0, 0}
- };
-
- c = getopt_long (argc, argv, "abc:d:0123456789",
- long_options, &option_index);
- if (c == -1)
- break;
-
- switch (c)
- {
- case 0:
- printf ("option %s", long_options[option_index].name);
- if (optarg)
- printf (" with arg %s", optarg);
- printf ("\n");
- break;
-
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- if (digit_optind != 0 && digit_optind != this_option_optind)
- printf ("digits occur in two different argv-elements.\n");
- digit_optind = this_option_optind;
- printf ("option %c\n", c);
- break;
-
- case 'a':
- printf ("option a\n");
- break;
-
- case 'b':
- printf ("option b\n");
- break;
-
- case 'c':
- printf ("option c with value `%s'\n", optarg);
- break;
-
- case 'd':
- printf ("option d with value `%s'\n", optarg);
- break;
-
- case '?':
- break;
-
- default:
- printf ("?? getopt returned character code 0%o ??\n", c);
- }
- }
-
- if (optind < argc)
- {
- printf ("non-option ARGV-elements: ");
- while (optind < argc)
- printf ("%s ", argv[optind++]);
- printf ("\n");
- }
-
- exit (0);
-}
-
-#endif /* TEST */
+/* getopt_long and getopt_long_only entry points for GNU getopt.
+ Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
+ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "getopt_win.h"
+
+#if !defined __STDC__ || !__STDC__
+/* This is a separate conditional since some stdc systems
+ reject `defined (const)'. */
+#ifndef const
+#define const
+#endif
+#endif
+
+#include <stdio.h>
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+ actually compiling the library itself. This code is part of the GNU C
+ Library, but also included in many other GNU distributions. Compiling
+ and linking in this code is a waste when using the GNU C library
+ (especially if it is a shared library). Rather than having every GNU
+ program understand `configure --with-gnu-libc' and omit the object files,
+ it is simpler to just do this in the source for each such file. */
+
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+#include <gnu-versions.h>
+#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+#define ELIDE_CODE
+#endif
+#endif
+
+#ifndef ELIDE_CODE
+
+
+/* This needs to come after some library #include
+ to get __GNU_LIBRARY__ defined. */
+#ifdef __GNU_LIBRARY__
+#include <stdlib.h>
+#endif
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+int
+getopt_long (argc, argv, options, long_options, opt_index)
+ int argc;
+ char *const *argv;
+ const char *options;
+ const struct option *long_options;
+ int *opt_index;
+{
+ return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
+}
+
+/* Like getopt_long, but '-' as well as '--' can indicate a long option.
+ If an option that starts with '-' (not '--') doesn't match a long option,
+ but does match a short option, it is parsed as a short option
+ instead. */
+
+int
+getopt_long_only (argc, argv, options, long_options, opt_index)
+ int argc;
+ char *const *argv;
+ const char *options;
+ const struct option *long_options;
+ int *opt_index;
+{
+ return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
+}
+
+
+#endif /* Not ELIDE_CODE. */
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int
+main (argc, argv)
+ int argc;
+ char **argv;
+{
+ int c;
+ int digit_optind = 0;
+
+ while (1)
+ {
+ int this_option_optind = optind ? optind : 1;
+ int option_index = 0;
+ static struct option long_options[] =
+ {
+ {"add", 1, 0, 0},
+ {"append", 0, 0, 0},
+ {"delete", 1, 0, 0},
+ {"verbose", 0, 0, 0},
+ {"create", 0, 0, 0},
+ {"file", 1, 0, 0},
+ {0, 0, 0, 0}
+ };
+
+ c = getopt_long (argc, argv, "abc:d:0123456789",
+ long_options, &option_index);
+ if (c == -1)
+ break;
+
+ switch (c)
+ {
+ case 0:
+ printf ("option %s", long_options[option_index].name);
+ if (optarg)
+ printf (" with arg %s", optarg);
+ printf ("\n");
+ break;
+
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ if (digit_optind != 0 && digit_optind != this_option_optind)
+ printf ("digits occur in two different argv-elements.\n");
+ digit_optind = this_option_optind;
+ printf ("option %c\n", c);
+ break;
+
+ case 'a':
+ printf ("option a\n");
+ break;
+
+ case 'b':
+ printf ("option b\n");
+ break;
+
+ case 'c':
+ printf ("option c with value `%s'\n", optarg);
+ break;
+
+ case 'd':
+ printf ("option d with value `%s'\n", optarg);
+ break;
+
+ case '?':
+ break;
+
+ default:
+ printf ("?? getopt returned character code 0%o ??\n", c);
+ }
+ }
+
+ if (optind < argc)
+ {
+ printf ("non-option ARGV-elements: ");
+ while (optind < argc)
+ printf ("%s ", argv[optind++]);
+ printf ("\n");
+ }
+
+ exit (0);
+}
+
+#endif /* TEST */
Property changes on: trunk/theora/win32/getopt1.c
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/theora/win32/getopt_win.h
===================================================================
--- trunk/theora/win32/getopt_win.h 2007-10-03 01:50:11 UTC (rev 13924)
+++ trunk/theora/win32/getopt_win.h 2007-10-03 18:51:06 UTC (rev 13925)
@@ -1,169 +1,169 @@
-/* Declarations for getopt.
- Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#ifndef _GETOPT_H
-
-#ifndef __need_getopt
-# define _GETOPT_H 1
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* For communication from `getopt' to the caller.
- When `getopt' finds an option that takes an argument,
- the argument value is returned here.
- Also, when `ordering' is RETURN_IN_ORDER,
- each non-option ARGV-element is returned here. */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
- This is used for communication to and from the caller
- and for communication between successive calls to `getopt'.
-
- On entry to `getopt', zero means this is the first call; initialize.
-
- When `getopt' returns -1, this is the index of the first of the
- non-option elements that the caller should itself scan.
-
- Otherwise, `optind' communicates from one call to the next
- how much of ARGV has been scanned so far. */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
- for unrecognized options. */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized. */
-
-extern int optopt;
-
-#ifndef __need_getopt
-/* Describe the long-named options requested by the application.
- The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
- of `struct option' terminated by an element containing a name which is
- zero.
-
- The field `has_arg' is:
- no_argument (or 0) if the option does not take an argument,
- required_argument (or 1) if the option requires an argument,
- optional_argument (or 2) if the option takes an optional argument.
-
- If the field `flag' is not NULL, it points to a variable that is set
- to the value given in the field `val' when the option is found, but
- left unchanged if the option is not found.
-
- To have a long-named option do something other than set an `int' to
- a compiled-in constant, such as set a value from `optarg', set the
- option's `flag' field to zero and its `val' field to a nonzero
- value (the equivalent single-letter option character, if there is
- one). For long options that have a zero `flag' field, `getopt'
- returns the contents of the `val' field. */
-
-struct option
-{
-# if defined __STDC__ && __STDC__
- const char *name;
-# else
- char *name;
-# endif
- /* has_arg can't be an enum because some compilers complain about
- type mismatches in all the code that assumes it is an int. */
- int has_arg;
- int *flag;
- int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'. */
-
-# define no_argument 0
-# define required_argument 1
-# define optional_argument 2
-#endif /* need getopt */
-
-
-/* Get definitions and prototypes for functions to process the
- arguments in ARGV (ARGC of them, minus the program name) for
- options given in OPTS.
-
- Return the option character from OPTS just read. Return -1 when
- there are no more options. For unrecognized options, or options
- missing arguments, `optopt' is set to the option letter, and '?' is
- returned.
-
- The OPTS string is a list of characters which are recognized option
- letters, optionally followed by colons, specifying that that letter
- takes an argument, to be placed in `optarg'.
-
- If a letter in OPTS is followed by two colons, its argument is
- optional. This behavior is specific to the GNU `getopt'.
-
- The argument `--' causes premature termination of argument
- scanning, explicitly telling `getopt' that there are no more
- options.
-
- If OPTS begins with `--', then non-option arguments are treated as
- arguments to the option '\0'. This behavior is specific to the GNU
- `getopt'. */
-
-#if defined __STDC__ && __STDC__
-# ifdef __GNU_LIBRARY__
-/* Many other libraries have conflicting prototypes for getopt, with
- differences in the consts, in stdlib.h. To avoid compilation
- errors, only prototype getopt for the GNU C library. */
-extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
-# else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-# endif /* __GNU_LIBRARY__ */
-
-# ifndef __need_getopt
-extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
- const struct option *__longopts, int *__longind);
-extern int getopt_long_only (int __argc, char *const *__argv,
- const char *__shortopts,
- const struct option *__longopts, int *__longind);
-
-/* Internal only. Users should not call this directly. */
-extern int _getopt_internal (int __argc, char *const *__argv,
- const char *__shortopts,
- const struct option *__longopts, int *__longind,
- int __long_only);
-# endif
-#else /* not __STDC__ */
-extern int getopt ();
-# ifndef __need_getopt
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-# endif
-#endif /* __STDC__ */
-
-#ifdef __cplusplus
-}
-#endif
-
-/* Make sure we later can get all the definitions and declarations. */
-#undef __need_getopt
-
-#endif /* getopt.h */
+/* Declarations for getopt.
+ Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _GETOPT_H
+
+#ifndef __need_getopt
+# define _GETOPT_H 1
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+ When `getopt' finds an option that takes an argument,
+ the argument value is returned here.
+ Also, when `ordering' is RETURN_IN_ORDER,
+ each non-option ARGV-element is returned here. */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+ This is used for communication to and from the caller
+ and for communication between successive calls to `getopt'.
+
+ On entry to `getopt', zero means this is the first call; initialize.
+
+ When `getopt' returns -1, this is the index of the first of the
+ non-option elements that the caller should itself scan.
+
+ Otherwise, `optind' communicates from one call to the next
+ how much of ARGV has been scanned so far. */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+ for unrecognized options. */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized. */
+
+extern int optopt;
+
+#ifndef __need_getopt
+/* Describe the long-named options requested by the application.
+ The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+ of `struct option' terminated by an element containing a name which is
+ zero.
+
+ The field `has_arg' is:
+ no_argument (or 0) if the option does not take an argument,
+ required_argument (or 1) if the option requires an argument,
+ optional_argument (or 2) if the option takes an optional argument.
+
+ If the field `flag' is not NULL, it points to a variable that is set
+ to the value given in the field `val' when the option is found, but
+ left unchanged if the option is not found.
+
+ To have a long-named option do something other than set an `int' to
+ a compiled-in constant, such as set a value from `optarg', set the
+ option's `flag' field to zero and its `val' field to a nonzero
+ value (the equivalent single-letter option character, if there is
+ one). For long options that have a zero `flag' field, `getopt'
+ returns the contents of the `val' field. */
+
+struct option
+{
+# if defined __STDC__ && __STDC__
+ const char *name;
+# else
+ char *name;
+# endif
+ /* has_arg can't be an enum because some compilers complain about
+ type mismatches in all the code that assumes it is an int. */
+ int has_arg;
+ int *flag;
+ int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'. */
+
+# define no_argument 0
+# define required_argument 1
+# define optional_argument 2
+#endif /* need getopt */
+
+
+/* Get definitions and prototypes for functions to process the
+ arguments in ARGV (ARGC of them, minus the program name) for
+ options given in OPTS.
+
+ Return the option character from OPTS just read. Return -1 when
+ there are no more options. For unrecognized options, or options
+ missing arguments, `optopt' is set to the option letter, and '?' is
+ returned.
+
+ The OPTS string is a list of characters which are recognized option
+ letters, optionally followed by colons, specifying that that letter
+ takes an argument, to be placed in `optarg'.
+
+ If a letter in OPTS is followed by two colons, its argument is
+ optional. This behavior is specific to the GNU `getopt'.
+
+ The argument `--' causes premature termination of argument
+ scanning, explicitly telling `getopt' that there are no more
+ options.
+
+ If OPTS begins with `--', then non-option arguments are treated as
+ arguments to the option '\0'. This behavior is specific to the GNU
+ `getopt'. */
+
+#if defined __STDC__ && __STDC__
+# ifdef __GNU_LIBRARY__
+/* Many other libraries have conflicting prototypes for getopt, with
+ differences in the consts, in stdlib.h. To avoid compilation
+ errors, only prototype getopt for the GNU C library. */
+extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
+# else /* not __GNU_LIBRARY__ */
+extern int getopt ();
+# endif /* __GNU_LIBRARY__ */
+
+# ifndef __need_getopt
+extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
+ const struct option *__longopts, int *__longind);
+extern int getopt_long_only (int __argc, char *const *__argv,
+ const char *__shortopts,
+ const struct option *__longopts, int *__longind);
+
+/* Internal only. Users should not call this directly. */
+extern int _getopt_internal (int __argc, char *const *__argv,
+ const char *__shortopts,
+ const struct option *__longopts, int *__longind,
+ int __long_only);
+# endif
+#else /* not __STDC__ */
+extern int getopt ();
+# ifndef __need_getopt
+extern int getopt_long ();
+extern int getopt_long_only ();
+
+extern int _getopt_internal ();
+# endif
+#endif /* __STDC__ */
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Make sure we later can get all the definitions and declarations. */
+#undef __need_getopt
+
+#endif /* getopt.h */
Property changes on: trunk/theora/win32/getopt_win.h
___________________________________________________________________
Name: svn:eol-style
+ native
More information about the commits
mailing list