1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
--- lib/tpm_utils.c.orig 2010-09-30 17:28:09 UTC
+++ lib/tpm_utils.c
@@ -55,6 +55,7 @@ genericOptHandler( int a_iNumArgs, char
CmdHelpFunction tCmdHelp = ( a_tCmdHelpFunction ) ? a_tCmdHelpFunction
: logCmdHelp;
+#ifdef __GCC
char szShortOpts[strlen( pszGenShortOpts )
+ ( ( a_pszShortOpts == NULL ) ? 0 : strlen( a_pszShortOpts ) )
+ 1];
@@ -64,12 +65,36 @@ genericOptHandler( int a_iNumArgs, char
int iOpt;
int rc;
+#else
+ int iOpt;
+ int rc;
+
+ char *szShortOpts;
+ int iNumShortOpts, iNumGenLongOpts;
+ struct option *sLongOpts;
+
+ iNumShortOpts = strlen( pszGenShortOpts ) +
+ ( ( a_pszShortOpts == NULL ) ? 0 : strlen( a_pszShortOpts ) );
+ iNumGenLongOpts = sizeof( sGenLongOpts ) / sizeof( struct option );
+
+ szShortOpts = malloc(iNumShortOpts + 1);
+ sLongOpts = malloc((iNumGenLongOpts + a_iNumOpts + 1)
+ * sizeof(struct option));
+ if( (szShortOpts == NULL) || (sLongOpts == NULL) ) {
+ perror("malloc");
+ return -1;
+ }
+#endif
strcpy( szShortOpts, pszGenShortOpts);
if ( a_pszShortOpts )
strcat( szShortOpts, a_pszShortOpts );
+#ifdef __GCC
memset( sLongOpts, 0, sizeof( sLongOpts ) );
+#else
+ memset( sLongOpts, 0, (iNumGenLongOpts + a_iNumOpts + 1) * sizeof(struct option));
+#endif
memcpy( sLongOpts, sGenLongOpts, sizeof( sGenLongOpts ) );
if ( a_sLongOpts ) {
memcpy( sLongOpts + iNumGenLongOpts,
|
